update news model

apps/news/migrations/0008_auto_20190828_1522.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.2.4 on 2019-08-28 15:22
+
+from django.db import migrations
+import utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0007_news_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='news',
+            name='description',
+            field=utils.models.TJSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='description'),
+        ),
+        migrations.AlterField(
+            model_name='news',
+            name='subtitle',
+            field=utils.models.TJSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='subtitle'),
+        ),
+        migrations.AlterField(
+            model_name='news',
+            name='title',
+            field=utils.models.TJSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='title'),
+        ),
+    ]

apps/news/models.py

@@ -1,10 +1,7 @@
-from django.contrib.postgres.fields import JSONField
+"""News app models."""
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import get_language
+from utils.models import BaseAttributes, TJSONField, TraslatedFieldsMixin
-
-from utils.models import (ProjectBaseMixin, BaseAttributes,
-                          LocaleManagerMixin, ImageMixin)
 
 
 class NewsType(models.Model):
@@ -19,10 +16,6 @@ class NewsType(models.Model):
         return self.name
 
 
-class NewsManager(LocaleManagerMixin):
-    """Manager for model News"""
-
-
 class NewsQuerySet(models.QuerySet):
     """QuerySet for model News"""
     def by_type(self, news_type):
@@ -38,22 +31,23 @@ class NewsQuerySet(models.QuerySet):
         return self.filter(is_publish=True)
 
 
-class News(BaseAttributes):
+class News(BaseAttributes, TraslatedFieldsMixin):
     """News model."""
+
     image = models.ForeignKey(
         'gallery.Image', null=True, blank=True, default=None,
         verbose_name=_('News image'), on_delete=models.CASCADE)
     news_type = models.ForeignKey(
         NewsType, verbose_name=_('news type'), on_delete=models.CASCADE)
 
-    title = JSONField(
+    title = TJSONField(
         _('title'), null=True, blank=True,
         default=None, help_text='{"en":"some text"}')
-    subtitle = JSONField(
+    subtitle = TJSONField(
         _('subtitle'), null=True, blank=True,
         default=None, help_text='{"en":"some text"}'
     )
-    description = JSONField(
+    description = TJSONField(
         _('description'), null=True, blank=True,
         default=None, help_text='{"en":"some text"}'
     )
@@ -73,7 +67,7 @@ class News(BaseAttributes):
     # TODO: metadata_keys - описание ключей для динамического построения полей метаданных
     # TODO: metadata_values - Описание значений для динамических полей из MetadataKeys
 
-    objects = NewsManager.from_queryset(NewsQuerySet)()
+    objects = NewsQuerySet.as_manager()
 
     class Meta:
         verbose_name = _('news')
@@ -82,7 +76,3 @@ class News(BaseAttributes):
     def __str__(self):
         return f'news: {self.id}'
 
-    @property
-    def test_trans(self):
-        language = get_language()
-        return self.title.get(language)

apps/news/serializers/common.py

@@ -16,17 +16,13 @@ class NewsTypeSerializer(serializers.ModelSerializer):
         ]
 
 
-class NewsLocalizationMixinSerializer(serializers.ModelSerializer):
+class NewsSerializer(serializers.ModelSerializer):
-    """Serializer for localized fields"""
-    # Localized fields
-    title_trans = serializers.CharField(read_only=True)
-    subtitle_trans = serializers.CharField(read_only=True)
-    description_trans = serializers.CharField(read_only=True)
-
-
-class NewsSerializer(NewsLocalizationMixinSerializer):
     """News serializer."""
+
     address = AddressSerializer()
+    title_translated = serializers.CharField(read_only=True, allow_null=True)
+    subtitle_translated = serializers.CharField(read_only=True, allow_null=True)
+    description_translated = serializers.CharField(read_only=True, allow_null=True)
     image_url = serializers.SerializerMethodField()
 
     class Meta:
@@ -41,14 +37,16 @@ class NewsSerializer(NewsLocalizationMixinSerializer):
             'is_highlighted',
             'image_url',
             # Localized fields
-            'title_trans',
+            'title_translated',
-            'subtitle_trans',
+            'subtitle_translated',
-            'description_trans',
+            'description_translated',
         ]
 
     def get_image_url(self, obj):
         """Return absolute image URL"""
-        return obj.image.get_full_image_url(request=self.context.get('request'))
+        if obj.image:
+            return obj.image.get_full_image_url(request=self.context.get('request'))
+        return None
 
 
 class NewsCreateUpdateSerializer(NewsSerializer):

apps/news/views/common.py

@@ -24,8 +24,7 @@ class NewsListView(NewsViewMixin, JWTListAPIView):
 
     def get_queryset(self, *args, **kwargs):
         """Override get_queryset method"""
-        return News.objects.annotate_localized_fields(locale=self.request.locale)\
+        return News.objects.published()\
-                           .published()\
                            .by_country_code(code=self.request.country_code)\
                            .order_by('-is_highlighted', '-created')