Merge branch 'core-dev-gladys' into 'core-dev'

{dev bugfix} get_cms_privilege update

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

app/applicationlayer/management/account/serializer.py

@@ -60,22 +60,10 @@ 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")
-
-        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()
+        create_form = user.allowed_company_id_number.filter(
+            create_change_request=True).count()
+        create_template = user.allowed_company_id_number.filter(
+            create_change_request_template=True).count()
 
         if create_form >= 1:
             create_form = 1
@@ -83,13 +71,11 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         if create_template >= 1:
             create_template = 1
 
-
         return {
             "create_form": create_form,
             "create_template": create_template
         }
 
-
     def get_image(self, user):
         request = self.context.get('request')