Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

apps/account/models.py

@@ -287,7 +287,9 @@ class User(AbstractUser):
 
 class UserRole(ProjectBaseMixin):
     """UserRole model."""
-    user = models.ForeignKey(User, verbose_name=_('User'), on_delete=models.CASCADE)
+    user = models.ForeignKey('account.User',
+                             verbose_name=_('User'),
+                             on_delete=models.CASCADE)
     role = models.ForeignKey(Role, verbose_name=_('Role'), on_delete=models.SET_NULL, null=True)
     establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'),
                                       on_delete=models.SET_NULL, null=True, blank=True)

apps/account/serializers/back.py

@@ -13,15 +13,6 @@ class RoleSerializer(serializers.ModelSerializer):
         ]
 
 
-class UserRoleSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = models.UserRole
-        fields = [
-            'user',
-            'role'
-        ]
-
-
 class BackUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
@@ -49,3 +40,13 @@ class BackDetailUserSerializer(BackUserSerializer):
         user.set_password(validated_data['password'])
         user.save()
         return user
+
+
+class UserRoleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.UserRole
+        fields = [
+            'role',
+            'user',
+            'establishment'
+        ]

apps/account/views/back.py

@@ -13,7 +13,7 @@ class RoleLstView(generics.ListCreateAPIView):
 
 class UserRoleLstView(generics.ListCreateAPIView):
     serializer_class = serializers.UserRoleSerializer
-    queryset = models.Role.objects.all()
+    queryset = models.UserRole.objects.all()
 
 
 class UserLstView(generics.ListCreateAPIView):

apps/main/serializers.py

@@ -21,27 +21,6 @@ class FeatureSerializer(serializers.ModelSerializer):
         )
 
 
-class SiteFeatureSerializer(serializers.ModelSerializer):
-    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 = ('main',
-                  'id',
-                  'slug',
-                  'priority',
-                  'route',
-                  'source',
-                  'nested',
-                  )
-
-
 class CurrencySerializer(ProjectModelSerializer):
     """Currency serializer."""
 
@@ -56,6 +35,23 @@ class CurrencySerializer(ProjectModelSerializer):
         ]
 
 
+class SiteFeatureSerializer(serializers.ModelSerializer):
+    """Site feature serializer."""
+
+    class Meta:
+        """Meta class."""
+
+        model = models.SiteFeature
+        fields = (
+            'id',
+            'site_settings',
+            'feature',
+            'published',
+            'main',
+            'nested'
+        )
+
+
 class SiteSettingsSerializer(serializers.ModelSerializer):
     """Site settings serializer."""
 
@@ -140,7 +136,7 @@ class SiteBackOfficeSerializer(SiteSerializer):
 
 
 class FeatureSerializer(serializers.ModelSerializer):
-    """Site feature serializer."""
+    """Feature serializer."""
 
     class Meta:
         """Meta class."""
@@ -155,21 +151,6 @@ class FeatureSerializer(serializers.ModelSerializer):
         )
 
 
-# class SiteFeatureSerializer(serializers.ModelSerializer):
-#     """Site feature serializer."""
-#
-#     class Meta:
-#         """Meta class."""
-#
-#         model = models.SiteFeature
-#         fields = (
-#             'id',
-#             'published',
-#             'site_settings',
-#             'feature',
-#         )
-
-
 class AwardBaseSerializer(serializers.ModelSerializer):
     """Award base serializer."""
 

apps/main/urls/back.py

@@ -13,5 +13,11 @@ urlpatterns = [
     path('site-settings/<subdomain>/', views.SiteSettingsBackOfficeView.as_view(),
          name='site-settings'),
     path('feature/', views.FeatureBackView.as_view(), name='feature-list-create'),
-    path('feature/<int:id>/', views.FeatureRUDBackView.as_view(), name='feature-rud')
+    path('feature/<int:id>/', views.FeatureRUDBackView.as_view(), name='feature-rud'),
+    path('site-feature/', views.SiteFeatureBackView.as_view(),
+         name='site-feature-list-create'),
+    path('site-feature/<int:id>/', views.SiteFeatureRUDBackView.as_view(),
+         name='site-feature-rud'),
 ]
+
+

apps/main/views/back.py

@@ -44,11 +44,21 @@ class FeatureBackView(generics.ListCreateAPIView):
     serializer_class = serializers.FeatureSerializer
 
 
+class SiteFeatureBackView(generics.ListCreateAPIView):
+    """Feature list or create View."""
+    serializer_class = serializers.SiteFeatureSerializer
+
+
 class FeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView):
     """Feature RUD View."""
     serializer_class = serializers.FeatureSerializer
 
 
+class SiteFeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView):
+    """Feature RUD View."""
+    serializer_class = serializers.SiteFeatureSerializer
+
+
 class SiteSettingsBackOfficeView(SiteSettingsView):
     """Site settings View."""
     serializer_class = serializers.SiteSettingsBackOfficeSerializer