From 7cf34f0741738ac03c16980e001c46adc38f1668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= <v.gladkikh@spider.ru>
Date: Tue, 3 Dec 2019 18:30:33 +0300
Subject: [PATCH] fix

---
 apps/main/serializers.py | 69 ++++++++++++----------------------------
 apps/main/views/back.py  |  4 +--
 2 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/apps/main/serializers.py b/apps/main/serializers.py
index b93382d5..a41a643f 100644
--- a/apps/main/serializers.py
+++ b/apps/main/serializers.py
@@ -17,10 +17,11 @@ class FeatureSerializer(serializers.ModelSerializer):
         fields = (
             'id',
             'slug',
-            'priority'
+            'priority',
+            'route',
+            'site_settings',
         )
 
-
 class CurrencySerializer(ProjectModelSerializer):
     """Currency serializer."""
 
@@ -36,20 +37,24 @@ class CurrencySerializer(ProjectModelSerializer):
 
 
 class SiteFeatureSerializer(serializers.ModelSerializer):
-    """Site feature serializer."""
+    id = serializers.IntegerField(source='feature.id')
+    slug = serializers.CharField(source='feature.slug')
+    priority = serializers.IntegerField(source='feature.priority')
+    route = serializers.CharField(source='feature.route.name')
+    source = serializers.IntegerField(source='feature.source')
+    nested = RecursiveFieldSerializer(many=True, allow_null=True)
 
     class Meta:
         """Meta class."""
-
         model = models.SiteFeature
-        fields = (
-            'id',
-            'site_settings',
-            'feature',
-            'published',
-            'main',
-            'nested'
-        )
+        fields = ('main',
+                  'id',
+                  'slug',
+                  'priority',
+                  'route',
+                  'source',
+                  'nested',
+                  )
 
 
 class SiteSettingsSerializer(serializers.ModelSerializer):
@@ -95,23 +100,15 @@ class SiteSettingsBackOfficeSerializer(SiteSettingsSerializer):
         ]
 
 
-class SiteSerializer(serializers.ModelSerializer):
+class SiteSerializer(SiteSettingsSerializer):
     country = CountrySerializer()
 
     class Meta:
         """Meta class."""
         model = models.SiteSettings
-        fields = [
-            'subdomain',
-            'site_url',
-            'country',
-            'default_site',
-            'pinterest_page_url',
-            'twitter_page_url',
-            'facebook_page_url',
-            'instagram_page_url',
-            'contact_email',
-            'currency'
+        fields = SiteSettingsSerializer.Meta.fields + [
+            'id',
+            'country'
         ]
 
 
@@ -125,30 +122,6 @@ class SiteShortSerializer(serializers.ModelSerializer):
         ]
 
 
-class SiteBackOfficeSerializer(SiteSerializer):
-    """Serializer for back office."""
-
-    class Meta(SiteSerializer.Meta):
-        """Meta class."""
-        fields = SiteSerializer.Meta.fields + [
-            'id',
-        ]
-
-
-class FeatureSerializer(serializers.ModelSerializer):
-    """Feature serializer."""
-
-    class Meta:
-        """Meta class."""
-
-        model = models.Feature
-        fields = (
-            'id',
-            'slug',
-            'priority',
-            'route',
-            'site_settings',
-        )
 
 
 class AwardBaseSerializer(serializers.ModelSerializer):
diff --git a/apps/main/views/back.py b/apps/main/views/back.py
index adc0196a..1faf79a0 100644
--- a/apps/main/views/back.py
+++ b/apps/main/views/back.py
@@ -61,9 +61,9 @@ class SiteFeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView):
 
 class SiteSettingsBackOfficeView(SiteSettingsView):
     """Site settings View."""
-    serializer_class = serializers.SiteSettingsBackOfficeSerializer
+    serializer_class = serializers.SiteSerializer
 
 
 class SiteListBackOfficeView(SiteListView):
     """Site settings View."""
-    serializer_class = serializers.SiteBackOfficeSerializer
+    serializer_class = serializers.SiteSerializer