refactored

apps/gallery/models.py

@@ -11,7 +11,7 @@ from utils.models import ProjectBaseMixin, SORLImageMixin, PlatformMixin
 class ImageQuerySet(models.QuerySet):
     """QuerySet for model Image."""
 
-    def originals(self):
+    def original_images(self):
         """Return QuerySet with original images."""
         return self.filter(parent__isnull=True)
 
@@ -57,5 +57,5 @@ class Image(ProjectBaseMixin, SORLImageMixin, PlatformMixin):
             tasks.delete_image_from_remote_storage(self.id, delete_original)
 
     @property
-    def childs(self):
+    def children(self):
         return self.parent_image.filter(parent=self)

apps/news/migrations/0021_merge_20191002_1300.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-02 13:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0020_remove_news_author'),
+        ('news', '0020_merge_20190930_1251'),
+    ]
+
+    operations = [
+    ]

apps/news/models.py

@@ -119,10 +119,6 @@ class News(BaseAttributes, TranslatedFieldsMixin):
                                          verbose_name=_('Is highlighted'))
     # TODO: metadata_keys - описание ключей для динамического построения полей метаданных
     # TODO: metadata_values - Описание значений для динамических полей из MetadataKeys
-    image_url = models.URLField(blank=True, null=True, default=None,
-                                verbose_name=_('Image URL path'))
-    preview_image_url = models.URLField(blank=True, null=True, default=None,
-                                        verbose_name=_('Preview image URL path'))
     template = models.PositiveIntegerField(choices=TEMPLATE_CHOICES, default=NEWSPAPER)
     address = models.ForeignKey('location.Address', blank=True, null=True,
                                 default=None, verbose_name=_('address'),
@@ -132,6 +128,8 @@ class News(BaseAttributes, TranslatedFieldsMixin):
                                 verbose_name=_('country'))
     tags = generic.GenericRelation(to='main.MetaDataContent')
 
+    gallery = models.ManyToManyField('gallery.Image', through='news.NewsGallery')
+
     objects = NewsQuerySet.as_manager()
 
     class Meta:
@@ -152,10 +150,28 @@ class News(BaseAttributes, TranslatedFieldsMixin):
         return reverse('web:news:rud', kwargs={'slug': self.slug})
 
     @property
-    def should_read(self):
-        return self.__class__.objects.should_read(self)[:3]
+    def original_images(self):
+        return self.gallery.original_images()
 
-    @property
-    def same_theme(self):
-        return self.__class__.objects.same_theme(self)[:3]
 
+class NewsGalleryQuerySet(models.QuerySet):
+    """QuerySet for model News"""
+
+
+class NewsGallery(models.Model):
+
+    news = models.ForeignKey(News, null=True,
+                             related_name='news_gallery',
+                             on_delete=models.SET_NULL,
+                             verbose_name=_('news'))
+    image = models.ForeignKey('gallery.Image', null=True,
+                              related_name='news_gallery',
+                              on_delete=models.SET_NULL,
+                              verbose_name=_('gallery'))
+
+    objects = NewsGalleryQuerySet.as_manager()
+
+    class Meta:
+        """NewsGallery meta class."""
+        verbose_name = _('news gallery')
+        verbose_name_plural = _('news galleries')

apps/news/serializers.py

@@ -1,6 +1,10 @@
 """News app common serializers."""
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
+
 from account.serializers.common import UserBaseSerializer
+from gallery.models import Image
+from gallery.serializers import ImageSerializer
 from location import models as location_models
 from location.serializers import CountrySimpleSerializer
 from main.serializers import MetaDataContentSerializer
@@ -8,6 +12,53 @@ from news import models
 from utils.serializers import TranslatedField, ProjectModelSerializer
 
 
+class NewsCropImageSerializer(ImageSerializer):
+    """Serializer for returning crop images of news image."""
+    orientation_display = serializers.CharField(source='get_orientation_display',
+                                                read_only=True)
+    web_url = serializers.SerializerMethodField()
+    mobile_url = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Image
+        fields = [
+            'id',
+            'title',
+            'orientation_display',
+            'web_url',
+            'mobile_url',
+        ]
+        extra_kwargs = {
+            'orientation': {'write_only': True}
+        }
+
+    def get_web_url(self, obj):
+        """Return URL of cropped image by thumbnail."""
+        return obj.get_image_url('news_promo_horizontal_web')
+
+    def get_mobile_url(self, obj):
+        """Return URL of cropped image by thumbnail."""
+        return obj.get_image_url('news_promo_horizontal_mobile')
+
+
+class NewsImageSerializer(ImageSerializer):
+    """News images"""
+    url = serializers.URLField(source='image.url', read_only=True)
+    crops = NewsCropImageSerializer(source='children', allow_null=True, many=True)
+
+    class Meta:
+        model = Image
+        fields = [
+            'id',
+            'title',
+            'url',
+            'crops',
+        ]
+        extra_kwargs = {
+            'orientation': {'write_only': True}
+        }
+
+
 class NewsTypeSerializer(serializers.ModelSerializer):
     """News type serializer."""
 
@@ -28,6 +79,7 @@ class NewsBaseSerializer(ProjectModelSerializer):
     # related fields
     news_type = NewsTypeSerializer(read_only=True)
     tags = MetaDataContentSerializer(read_only=True, many=True)
+    gallery = NewsImageSerializer(source='original_images', read_only=True, many=True)
 
     class Meta:
         """Meta class."""
@@ -38,11 +90,10 @@ class NewsBaseSerializer(ProjectModelSerializer):
             'title_translated',
             'subtitle_translated',
             'is_highlighted',
-            'image_url',
-            'preview_image_url',
             'news_type',
             'tags',
             'slug',
+            'gallery',
         )
 
 
@@ -123,3 +174,40 @@ class NewsBackOfficeDetailSerializer(NewsBackOfficeBaseSerializer,
                     'template_display',
                  )
 
+
+class NewsBackOfficeGallerySerializer(serializers.ModelSerializer):
+    """Serializer class for model NewsGallery."""
+    class Meta:
+        """Meta class"""
+        model = models.NewsGallery
+        fields = [
+            'id',
+        ]
+
+    def get_request_kwargs(self):
+        """Get url kwargs from request."""
+        return self.context.get('request').parser_context.get('kwargs')
+
+    def validate(self, attrs):
+        """Override validate method."""
+        news_pk = self.get_request_kwargs().get('pk')
+        image_id = self.get_request_kwargs().get('image_id')
+
+        news_qs = models.News.objects.filter(pk=news_pk)
+        image_qs = Image.objects.filter(id=image_id)
+
+        if not news_qs.exists():
+            raise serializers.ValidationError({'detail': _('News not found')})
+        if not image_qs.exists():
+            raise serializers.ValidationError({'detail': _('Image not found')})
+
+        news = news_qs.first()
+        image = image_qs.first()
+
+        if news.news_gallery.filter(image=image).exists():
+            raise serializers.ValidationError({'detail': _('Image is already added')})
+
+        attrs['news'] = news
+        attrs['image'] = image
+
+        return attrs

apps/news/views.py

@@ -114,7 +114,7 @@ class NewsBackOfficeGalleryCreateDestroyView(NewsBackOfficeMixinView,
 
 class NewsBackOfficeGalleryListView(NewsBackOfficeMixinView, generics.ListAPIView):
     """Resource for returning gallery for news for back-office users."""
-    serializer_class = ImageSerializer
+    serializer_class = serializers.NewsImageSerializer
 
     def get_object(self):
         """Override get_object method."""
@@ -128,7 +128,7 @@ class NewsBackOfficeGalleryListView(NewsBackOfficeMixinView, generics.ListAPIVie
 
     def get_queryset(self):
         """Override get_queryset method."""
-        return self.get_object().gallery.all()
+        return self.get_object().gallery.original_images()
 
 
 class NewsBackOfficeRUDView(NewsBackOfficeMixinView,