Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"

This reverts commit 07333234

apps/collection/migrations/0006_auto_20190827_1205.py

@@ -1,20 +0,0 @@
-# Generated by Django 2.2.4 on 2019-08-27 12:05
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('gallery', '0001_initial'),
-        ('collection', '0005_auto_20190823_1401'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='collection',
-            name='image',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='gallery.Image', verbose_name='Collection image'),
-        ),
-    ]

apps/collection/models.py

@@ -1,6 +1,5 @@
 from django.contrib.postgres.fields import JSONField
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from utils.models import ProjectBaseMixin, ImageMixin
@@ -38,17 +37,10 @@ class CollectionQuerySet(models.QuerySet):
         """Returned only published collection"""
         return self.filter(is_publish=True)
 
-    def valid(self):
-        """Returns valid offers"""
-        now = timezone.now()
-        return self.filter(start__lte=now, end__gte=now)
 
-
+class Collection(ProjectBaseMixin, CollectionNameMixin,
-class Collection(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin):
+                 ImageMixin, CollectionDateMixin):
     """Collection model."""
-    image = models.ForeignKey(
-        'gallery.Image', blank=True, default=None, null=True,
-        verbose_name=_('Collection image'), on_delete=models.CASCADE)
     is_publish = models.BooleanField(
         default=False, verbose_name=_('Publish status'))
     on_top = models.BooleanField(

apps/collection/serializers/common.py

@@ -1,12 +1,10 @@
 from rest_framework import serializers
 
 from collection import models
-from utils.serializers import ImageSerializerMixin
 
 
-class CollectionSerializer(ImageSerializerMixin, serializers.ModelSerializer):
+class CollectionSerializer(serializers.ModelSerializer):
     """Collection serializer"""
-
     class Meta:
         model = models.Collection
         fields = [

apps/collection/views/common.py

@@ -34,7 +34,6 @@ class CollectionListView(CollectionViewMixin, generics.ListAPIView):
     def get_queryset(self):
         """Override get_queryset method"""
         return models.Collection.objects.published()\
-                                        .valid()\
                                         .by_country_code(code=self.request.country_code)\
                                         .order_by('-on_top', '-created')
 

apps/gallery/admin.py

@@ -1,8 +1,8 @@
 from django.contrib import admin
 
-from gallery.models import Image
+from gallery.models import Gallery
 
 
-@admin.register(Image)
+@admin.register(Gallery)
-class ImageModelAdmin(admin.ModelAdmin):
+class GalleryModelAdmin(admin.ModelAdmin):
-    """Image model admin"""
+    """Gallery model admin"""

apps/gallery/migrations/0001_initial.py

@@ -1,30 +0,0 @@
-# Generated by Django 2.2.4 on 2019-08-27 12:04
-
-from django.db import migrations, models
-import django.utils.timezone
-import easy_thumbnails.fields
-import utils.methods
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Image',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')),
-                ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
-                ('image', easy_thumbnails.fields.ThumbnailerImageField(upload_to=utils.methods.image_path, verbose_name='Image')),
-            ],
-            options={
-                'verbose_name': 'Image',
-                'verbose_name_plural': 'Images',
-            },
-        ),
-    ]

apps/gallery/models.py

@@ -1,21 +1,16 @@
 from django.utils.translation import gettext_lazy as _
-from easy_thumbnails.fields import ThumbnailerImageField
 
-from utils.methods import image_path
 from utils.models import ProjectBaseMixin, ImageMixin
 
 
-class Image(ProjectBaseMixin, ImageMixin):
+class Gallery(ProjectBaseMixin, ImageMixin):
-    """Image model."""
+    """Gallery model."""
-
-    image = ThumbnailerImageField(upload_to=image_path,
-                                  verbose_name=_('Image'))
 
     class Meta:
         """Meta class."""
-        verbose_name = _('Image')
+        verbose_name = _('Gallery')
-        verbose_name_plural = _('Images')
+        verbose_name_plural = _('Galleries')
 
     def __str__(self):
-        """String representation of image instance"""
+        """String representation"""
-        return str(self.id)
+        return str(self.get_image_url)

apps/gallery/serializers.py

@@ -1,24 +1,19 @@
-"""Serializers for model Image"""
 from rest_framework import serializers
 
 from . import models
 
 
-class ImageSerializer(serializers.ModelSerializer):
+class GallerySerializer(serializers.ModelSerializer):
-    """Serializer for model Image."""
+    """Serializer for model Gallery."""
-    # REQUEST
-    image = serializers.ImageField(write_only=True)
     # RESPONSE
-    url = serializers.URLField(source='get_image_url',
+    url = serializers.URLField(source='get_image_url')
-                               required=False)
 
     class Meta:
         """Meta class"""
-        model = models.Image
+        model = models.Gallery
         fields = (
-            'id',
             'image',
-            'url',
+            'url'
         )
         read_only_fields = (
             'url',

apps/gallery/urls.py

@@ -5,7 +5,7 @@ from . import views
 
 app_name = 'gallery'
 
-urlpatterns = [
+url_patterns = [
     path('upload/', views.GalleryUploadImage.as_view(),
          name='upload_image')
 ]

apps/gallery/views.py

@@ -5,6 +5,6 @@ from . import models, serializers
 
 class GalleryUploadImage(generics.CreateAPIView):
     """Upload image to gallery"""
-    model = models.Image
+    model = models.Gallery
-    queryset = models.Image.objects.all()
+    queryset = models.Gallery.objects.all()
-    serializer_class = serializers.ImageSerializer
+    serializer_class = serializers.GallerySerializer

apps/news/migrations/0006_auto_20190827_1205.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.4 on 2019-08-27 12:05
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('news', '0005_auto_20190823_1149'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='news',
-            name='image',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='gallery.Image', verbose_name='News image'),
-        ),
-    ]

apps/news/models.py

@@ -1,6 +1,5 @@
 from django.contrib.postgres.fields import JSONField
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from utils.models import (ProjectBaseMixin, BaseAttributes,
@@ -37,13 +36,8 @@ class NewsQuerySet(models.QuerySet):
         """Return only published news"""
         return self.filter(is_publish=True)
 
-    def valid(self):
-        """Returns valid offers"""
-        now = timezone.now()
-        return self.filter(start__lte=now, end__gte=now)
 
-
+class News(ImageMixin, BaseAttributes):
-class News(BaseAttributes):
     """News model."""
     news_type = models.ForeignKey(
         NewsType, verbose_name=_('news type'), on_delete=models.CASCADE)
@@ -70,9 +64,6 @@ class News(BaseAttributes):
     country = models.ForeignKey(
         'location.Country', blank=True, null=True,
         verbose_name=_('country'), on_delete=models.CASCADE)
-    image = models.ForeignKey(
-        'gallery.Image', blank=True, default=None, null=True,
-        verbose_name=_('News image'), on_delete=models.CASCADE)
     is_highlighted = models.BooleanField(
         default=False, verbose_name=_('Is highlighted'))
     # TODO: metadata_keys - описание ключей для динамического построения полей метаданных

apps/news/serializers/common.py

@@ -3,7 +3,6 @@ from rest_framework import serializers
 from location.models import Address
 from location.serializers import AddressSerializer
 from news import models
-from utils.serializers import ImageSerializerMixin
 
 
 class NewsTypeSerializer(serializers.ModelSerializer):
@@ -24,7 +23,7 @@ class NewsLocalizationMixinSerializer(serializers.ModelSerializer):
     description_trans = serializers.CharField(read_only=True)
 
 
-class NewsSerializer(NewsLocalizationMixinSerializer, ImageSerializerMixin):
+class NewsSerializer(NewsLocalizationMixinSerializer):
     """News serializer."""
     address = AddressSerializer()
 
@@ -51,6 +50,7 @@ class NewsCreateUpdateSerializer(NewsSerializer):
     title = serializers.JSONField()
     subtitle = serializers.JSONField()
     description = serializers.JSONField()
+    image = serializers.ImageField(required=True)
     news_type = serializers.PrimaryKeyRelatedField(
         queryset=models.NewsType.objects.all(), write_only=True)
     address = serializers.PrimaryKeyRelatedField(

apps/news/views/common.py

@@ -26,7 +26,6 @@ class NewsList(NewsViewMixin, JWTListAPIView):
         """Override get_queryset method"""
         return News.objects.annotate_localized_fields(locale=self.request.locale)\
                            .published()\
-                           .valid()\
                            .by_country_code(code=self.request.country_code)\
                            .order_by('-is_highlighted', '-created')
 

apps/utils/models.py

@@ -1,7 +1,5 @@
 """Utils app models."""
 
-from os.path import exists
-
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.contrib.gis.db import models
 from django.contrib.postgres.fields import JSONField
@@ -76,14 +74,7 @@ class ImageMixin(models.Model):
 
     def get_image_url(self, key=None):
         """Get image thumbnail url."""
-        return self.get_image(key).url if self.image and exists(self.image.path) else None
+        return self.get_image(key).url if self.image else None
-
-    def get_full_image_url(self, request, thumbnail_key=None):
-        """Get full image url"""
-        if self.image and exists(self.image.path):
-            return request.build_absolute_uri(self.get_image(thumbnail_key).url)
-        else:
-            return None
 
     def image_tag(self):
         """Admin preview tag."""

apps/utils/serializers.py

@@ -1,15 +0,0 @@
-"""Serializer mixins"""
-from rest_framework import serializers
-
-
-class ImageSerializerMixin(serializers.Serializer):
-    """
-    Image serializer mixin.
-    Need to return an absolute path of cropped image instead of relative path
-    """
-    # RESPONSE
-    image = serializers.SerializerMethodField()
-
-    def get_image(self, obj):
-        """Get full image URL"""
-        return obj.image.get_full_image_url(self.context.get('request'))

project/settings/base.py

@@ -57,7 +57,6 @@ PROJECT_APPS = [
     'authorization.apps.AuthorizationConfig',
     'collection.apps.CollectionConfig',
     'establishment.apps.EstablishmentConfig',
-    'gallery.apps.GalleryConfig',
     'location.apps.LocationConfig',
     'main.apps.MainConfig',
     'news.apps.NewsConfig',

project/urls/__init__.py

@@ -54,8 +54,6 @@ urlpatterns_auth = [
 ]
 
 api_urlpatterns = [
-    path('gallery/', include(('gallery.urls', 'gallery'),
-                             namespace='gallery')),
     path('location/', include(('location.urls', 'location'),
                               namespace='location')),
     path('main/', include(('main.urls', 'main'),