From b5c50ff730b58f34e1b2633d768c589374d8a6d0 Mon Sep 17 00:00:00 2001
From: Anatoly <a.feteleu@spider.ru>
Date: Wed, 28 Aug 2019 09:55:45 +0300
Subject: [PATCH] fixed serializers

---
 apps/collection/serializers/common.py | 21 ++++++++++++++++++---
 apps/collection/urls/common.py        |  4 ++--
 apps/gallery/serializers.py           |  1 +
 apps/news/serializers/common.py       |  4 +++-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/apps/collection/serializers/common.py b/apps/collection/serializers/common.py
index 26c66f0c..a4ffc70a 100644
--- a/apps/collection/serializers/common.py
+++ b/apps/collection/serializers/common.py
@@ -1,20 +1,35 @@
 from rest_framework import serializers
 
 from collection import models
+from gallery import models as gallery_models
 
 
 class CollectionSerializer(serializers.ModelSerializer):
     """Collection serializer"""
-    image = serializers.URLField(source='image.get_image_url')
+    filters = serializers.JSONField(required=True)
+    selectors = serializers.JSONField(required=True)
+    targets = serializers.JSONField(required=True)
+    block_size = serializers.JSONField(required=True)
+    image = serializers.PrimaryKeyRelatedField(
+        queryset=gallery_models.Image.objects.all(), required=True)
+    is_publish = serializers.BooleanField(required=True)
+    on_top = serializers.BooleanField(required=True)
 
     class Meta:
         model = models.Collection
         fields = [
             'id',
             'name',
-            'block_size',
+            'start',
+            'end',
             'image',
-            'on_top'
+            'is_publish',
+            'on_top',
+            'filters',
+            'selectors',
+            'targets',
+            'country',
+            'block_size',
         ]
 
 
diff --git a/apps/collection/urls/common.py b/apps/collection/urls/common.py
index a1d98efc..eab4a277 100644
--- a/apps/collection/urls/common.py
+++ b/apps/collection/urls/common.py
@@ -8,8 +8,8 @@ app_name = 'collection'
 urlpatterns = [
     path('list/', views.CollectionListView.as_view(),
          name='collections_list'),
-    # path('create/', views.CollectionCreateView.as_view(),
-    #      name='collection_create'),
+    path('create/', views.CollectionCreateView.as_view(),
+         name='collection_create'),
     # path('<int:pk>/', views.CollectionRetrieveView.as_view(),
     #      name='collection_retrieve'),
     # path('<int:pk>/delete/', views.CollectionDestroyView.as_view(),
diff --git a/apps/gallery/serializers.py b/apps/gallery/serializers.py
index da4f03f8..a3176b79 100644
--- a/apps/gallery/serializers.py
+++ b/apps/gallery/serializers.py
@@ -10,5 +10,6 @@ class ImageSerializer(serializers.ModelSerializer):
         """Meta class"""
         model = models.Image
         fields = (
+            'id',
             'image',
         )
diff --git a/apps/news/serializers/common.py b/apps/news/serializers/common.py
index de99cc81..45ba5945 100644
--- a/apps/news/serializers/common.py
+++ b/apps/news/serializers/common.py
@@ -1,5 +1,6 @@
 from rest_framework import serializers
 
+from gallery import models as gallery_models
 from location.models import Address
 from location.serializers import AddressSerializer
 from news import models
@@ -51,7 +52,8 @@ class NewsCreateUpdateSerializer(NewsSerializer):
     title = serializers.JSONField()
     subtitle = serializers.JSONField()
     description = serializers.JSONField()
-    image = serializers.ImageField(required=True)
+    image = serializers.PrimaryKeyRelatedField(
+        queryset=gallery_models.Image.objects.all(), required=True,)
     news_type = serializers.PrimaryKeyRelatedField(
         queryset=models.NewsType.objects.all(), write_only=True)
     address = serializers.PrimaryKeyRelatedField(