Merge branch 'core-dev-red-develop' into 'core-dev'

Core dev red develop

See merge request rms/Backend/api-main-service!935

app/applicationlayer/management/account/serializer.py

@@ -60,21 +60,39 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
 
     def get_cms_privilege(self, user):
 
-        test = AllowedCompany.objects.extra(
-            select={
-                'create_form': "create_change_request=True",
-                'create_template': "create_change_request_template=True",
-            }
-        ).filter(id_number=user.code).values('create_form', "create_template")
-        # print(test.count())
-
-        if test.count() >= 1:
-            return {**test.values("create_form","create_template")[0]}
-        else:
-            return {
-                "create_form": False,
-                "create_template": False
-            }
+        # test = AllowedCompany.objects.extra(
+        #     select={
+        #         'create_form': "create_change_request=True",
+        #         'create_template': "create_change_request_template=True",
+        #     }
+        # ).filter(id_number=user.code).values('create_form', "create_template")
+
+        create_form = AllowedCompany.objects.filter(
+            Q(id_number=user.code) &
+            Q(create_change_request=True)
+        ).count()
+
+        create_template = AllowedCompany.objects.filter(
+            Q(id_number=user.code) &
+            Q(create_change_request_template=True)
+        ).count()
+
+        if create_form >= 1:
+            create_form = 1
+        # else:
+        #     create_form = 0
+
+
+        if create_template >= 1:
+            create_template = 1
+        # else:
+        #     create_template = 0
+
+
+        return {
+            "create_form": create_form,
+            "create_template": create_template
+        }
 
 
     def get_image(self, user):