Merge branch 'feature/news_author_GM-149' into 'develop'

Author

See merge request gm/gm-backend!35

apps/news/migrations/0016_remove_news_author.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.4 on 2019-09-27 13:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0015_auto_20190927_0853'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='news',
+            name='author',
+        ),
+    ]

apps/news/migrations/0018_merge_20190927_1432.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-09-27 14:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0017_auto_20190927_1403'),
+        ('news', '0016_remove_news_author'),
+    ]
+
+    operations = [
+    ]

apps/news/models.py

@@ -94,10 +94,15 @@ class News(BaseAttributes, TranslatedFieldsMixin):
     slug = models.SlugField(unique=True, max_length=50,
                             verbose_name=_('News slug'))
     playlist = models.IntegerField(_('playlist'))
+
+    # author = models.CharField(max_length=255, blank=True, null=True,
+    #                           default=None,verbose_name=_('Author'))
+
     state = models.PositiveSmallIntegerField(default=WAITING, choices=STATE_CHOICES,
                                              verbose_name=_('State'))
     author = models.CharField(max_length=255, blank=True, null=True,
                               default=None,verbose_name=_('Author'))
+
     is_highlighted = models.BooleanField(default=False,
                                          verbose_name=_('Is highlighted'))
     # TODO: metadata_keys - описание ключей для динамического построения полей метаданных

apps/news/serializers.py

@@ -5,7 +5,7 @@ from location.serializers import CountrySimpleSerializer
 from main.serializers import MetaDataContentSerializer
 from news import models
 from utils.serializers import TranslatedField
-
+from account.serializers.common import UserSerializer
 
 class NewsTypeSerializer(serializers.ModelSerializer):
     """News type serializer."""
@@ -50,6 +50,7 @@ class NewsDetailSerializer(NewsBaseSerializer):
 
     description_translated = TranslatedField()
     country = CountrySimpleSerializer(read_only=True)
+    author = UserSerializer(source='created_by')
     state_display = serializers.CharField(source='get_state_display',
                                           read_only=True)