[RHCLOUD-36102] - Slow loading of data from roles endpoint perfo…

rbac/management/role/serializer.py

@@ -92,6 +92,8 @@ class RoleSerializer(serializers.ModelSerializer):
     access = AccessSerializer(many=True)
     policyCount = serializers.IntegerField(read_only=True)
     accessCount = serializers.IntegerField(read_only=True)
+    groups_in_count = serializers.IntegerField(read_only=True)
+    groups_in = serializers.ListField(read_only=True)
     applications = serializers.SerializerMethodField()
     system = serializers.BooleanField(read_only=True)
     platform_default = serializers.BooleanField(read_only=True)
@@ -100,8 +102,6 @@ class RoleSerializer(serializers.ModelSerializer):
     modified = serializers.DateTimeField(read_only=True)
     external_role_id = serializers.SerializerMethodField()
     external_tenant = serializers.SerializerMethodField()
-    groups_in_count = serializers.SerializerMethodField()
-    groups_in = serializers.SerializerMethodField()
 
     class Meta:
         """Metadata for the serializer."""
@@ -115,6 +115,8 @@ class Meta:
             "access",
             "policyCount",
             "accessCount",
+            "groups_in_count",
+            "groups_in",
             "applications",
             "system",
             "platform_default",
@@ -123,8 +125,6 @@ class Meta:
             "modified",
             "external_role_id",
             "external_tenant",
-            "groups_in_count",
-            "groups_in",
         )
 
     def get_applications(self, obj):
@@ -165,17 +165,6 @@ def get_external_tenant(self, obj):
         """Get the external tenant name if it's from an external tenant."""
         return obj.external_tenant_name()
 
-    def get_groups_in_count(self, obj):
-        """Get the total count of groups where the role is in."""
-        request = self.context.get("request")
-        groups_in = obtain_groups_in(obj, request)
-        return groups_in.count()  # Make sure this returns an integer count
-
-    def get_groups_in(self, obj):
-        """Get the groups where the role is in."""
-        request = self.context.get("request")
-        return obtain_groups_in(obj, request).values("name", "uuid", "description")
-
 
 class RoleMinimumSerializer(SerializerCreateOverrideMixin, serializers.ModelSerializer):
     """Serializer for the Role model that doesn't return access info."""

rbac/management/role/view.py

@@ -329,12 +329,6 @@ def list(self, request, *args, **kwargs):
 
         """
         public_tenant = Tenant.objects.get(tenant_name="public")
-        base_queryset = (
-            Role.objects.prefetch_related("access", "ext_relation")
-            .filter(tenant__in=[request.tenant, public_tenant])
-            .annotate(policyCount=Count("policies", distinct=True), accessCount=Count("access", distinct=True))
-        )
-
         # Filtering
         query_params = {
             "external_tenant": request.query_params.get("external_tenant", None),
@@ -349,8 +343,27 @@ def list(self, request, *args, **kwargs):
             "username": request.query_params.get("username", None),
             "limit": request.query_params.get("limit", 10),
             "offset": request.query_params.get("offset", 0),
-            "add_fields": request.query_params.get("add_fields", None),
+            "add_fields": request.query_params.get("add_fields", ""),
         }
+        add_fields = query_params["add_fields"]
+        add_fields_split = add_fields.split(",")
+
+        base_queryset = (
+            Role.objects.prefetch_related("access", "ext_relation")
+            .filter(tenant__in=[request.tenant, public_tenant])
+            .annotate(
+                policyCount=Count("policies", distinct=True),
+                accessCount=Count("access", distinct=True),
+            )
+        )
+
+        # Dynamic annotations
+        if "groups_in_count" in add_fields_split:
+            base_queryset = base_queryset.annotate(groups_in_count=Count("policies__group"))
+        elif "groups_in" in add_fields_split:
+            base_queryset = base_queryset.annotate(groups_in=F("policies__group__name"))
+        else:
+            base_queryset = base_queryset
 
         filters = []
         limit = query_params["limit"]

tests/management/role/test_view.py

@@ -151,16 +151,14 @@ def setUp(self):
             "display_name",
             "system",
             "created",
+            "access",
             "policyCount",
             "accessCount",
             "modified",
             "platform_default",
             "admin_default",
             "external_role_id",
             "external_tenant",
-            "groups_in_count",
-            "groups_in",
-            "access",
         }
 
         self.principal = Principal(username=self.user_data["username"], tenant=self.tenant)
@@ -914,7 +912,7 @@ def test_list_role_with_groups_in_fields_with_username_param_for_non_org_admin(s
         # make sure all roles are from:
         #       * custom group 'NewGroupForJohn' or
         #       * 'Default access' group
-        groups = [default_access_group_name, custom_group_name, default_admin_access_group_name]
+        groups = [default_access_group_name, custom_group_name]
         for role in response_data:
             for group in role[groups_in]:
                 self.assertIn(group["name"], groups)
@@ -1118,6 +1116,7 @@ def test_list_role_with_groups_in_fields_for_admin_scope_success(self):
 
         response_data = response.data.get("data")
         for iterRole in response_data:
+            print(iterRole.get("groups_in"))
             # fields displayed are same as defined, groupsInCount is added
             self.assertEqual(new_display_fields, set(iterRole.keys()))
             self.assertIsNotNone(iterRole.get("groups_in")[0]["name"])
@@ -1210,7 +1209,7 @@ def test_list_role_with_additional_fields_principal_success(self):
         self.assertEqual(len(response.data.get("data")), 5)
 
         role = response.data.get("data")[0]
-
+        print(role)
         self.assertEqual(new_display_fields, set(role.keys()))
         self.assertEqual(role["groups_in_count"], 1)