Merge remote-tracking branch 'origin/master' into twitter_api

backend/app_be/models.py

@@ -6,14 +6,10 @@ class User(models.Model):
     pass
 
 
-class Icon(models.Model):
-    image = models.ImageField(upload_to='feed_icons')
-
-
 class Feed(models.Model):
     url = models.TextField(blank=False, null=False, validators=[URLValidator(['http', 'https'])])
     active = models.BooleanField()
-    icon = models.FileField(upload_to='feed-icons', blank=True, null=True,
+    icon = models.FileField(upload_to='feed-icons', blank=True, null=False, default='default-icon.svg',
                             validators=[FileExtensionValidator(['png', 'svg'])])
     keywords = models.TextField(blank=False, null=False)
     match_all_keywords = models.BooleanField(blank=True, default=False)
@@ -25,7 +21,7 @@ class FeedEntry(models.Model):
 
 
 class Tweet(models.Model):
-    icon = models.ForeignKey(Icon, on_delete=models.CASCADE, null=True)
+    feed = models.ForeignKey(Feed, null=True, on_delete=models.SET_NULL)
     text = models.CharField(max_length=137)
     date_time = models.DateTimeField()
     url = models.CharField(max_length=100)