Get role count for a filter in a given tenant.

wso2-extensions · Dec 10, 2024 · 9cb325e · 9cb325e
1 parent af6e5f2
commit 9cb325e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...m2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMRoleManagerV2.java b/...m2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMRoleManagerV2.java
@@ -472,16 +472,22 @@ private RolesV2GetResponse filterRolesByAttributes(Node node, Integer count, Int
             LOG.debug(String.format("Filtering roles from search filter: %s", searchFilter));
         }
         List<Role> roles;
+        int roleCount;
+        List<RoleV2> scimRoles;
         try {
             roles = roleManagementService.getRoles(searchFilter, count, startIndex, sortBy, sortOrder, tenantDomain,
                     requiredAttributes);
+            scimRoles = getScimRolesList(roles, requiredAttributes);
+            roleCount = roleManagementService.getRolesCount(searchFilter, tenantDomain);
+            if (roleCount == 0) {
+                roleCount = scimRoles.size();
+            }
         } catch (IdentityRoleManagementException e) {
             throw new CharonException(
                     String.format("Error occurred while listing roles based on the search filter: %s", searchFilter),
                     e);
         }
-        List<RoleV2> scimRoles = getScimRolesList(roles, requiredAttributes);
-        return new RolesV2GetResponse(scimRoles.size(), scimRoles);
+        return new RolesV2GetResponse(roleCount, scimRoles);
     }
 
     private String buildSearchFilter(Node node) throws BadRequestException {