[SELC-6286] feat: using enums PartyRole and OnboardedProductState. added enum validation in new users count api

gaetano-miglionico · gaetano-miglionico · commit fcc5fbe70d32 · 2025-01-31T17:23:56.000+01:00
diff --git a/apps/user-ms/src/main/docs/openapi.json b/apps/user-ms/src/main/docs/openapi.json
@@ -1575,6 +1575,10 @@
           }
         }
       },
+      "PartyRole" : {
+        "enum" : [ "MANAGER", "DELEGATE", "SUB_DELEGATE", "OPERATOR", "ADMIN_EA" ],
+        "type" : "string"
+      },
       "PermissionTypeEnum" : {
         "enum" : [ "ADMIN", "ANY" ],
         "type" : "string"
@@ -2012,13 +2016,13 @@
           "roles" : {
             "type" : "array",
             "items" : {
-              "type" : "string"
+              "$ref" : "#/components/schemas/PartyRole"
             }
           },
           "status" : {
             "type" : "array",
             "items" : {
-              "type" : "string"
+              "$ref" : "#/components/schemas/OnboardedProductState"
             }
           },
           "count" : {
diff --git a/apps/user-ms/src/main/docs/openapi.yaml b/apps/user-ms/src/main/docs/openapi.yaml
@@ -1140,6 +1140,14 @@ components:
           type: array
           items:
             type: string
+    PartyRole:
+      enum:
+      - MANAGER
+      - DELEGATE
+      - SUB_DELEGATE
+      - OPERATOR
+      - ADMIN_EA
+      type: string
     PermissionTypeEnum:
       enum:
       - ADMIN
@@ -1456,11 +1464,11 @@ components:
         roles:
           type: array
           items:
-            type: string
+            $ref: "#/components/schemas/PartyRole"
         status:
           type: array
           items:
-            type: string
+            $ref: "#/components/schemas/OnboardedProductState"
         count:
           format: int64
           type: integer
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/InstitutionController.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/InstitutionController.java
@@ -3,11 +3,14 @@
 import io.quarkus.security.Authenticated;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import it.pagopa.selfcare.onboarding.common.PartyRole;
 import it.pagopa.selfcare.user.controller.request.UpdateDescriptionDto;
 import it.pagopa.selfcare.user.controller.response.UserInstitutionResponse;
 import it.pagopa.selfcare.user.controller.response.UserProductResponse;
 import it.pagopa.selfcare.user.controller.response.UsersCountResponse;
+import it.pagopa.selfcare.user.model.constants.OnboardedProductState;
 import it.pagopa.selfcare.user.service.UserService;
+import it.pagopa.selfcare.user.util.GeneralUtils;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
@@ -84,7 +87,9 @@ public Uni<UsersCountResponse> getUsersCount(@PathParam(value = "institutionId")
                                                  @PathParam(value = "productId") String productId,
                                                  @QueryParam(value = "roles") List<String> roles,
                                                  @QueryParam(value = "status") List<String> status) {
-        return userService.getUsersCount(institutionId, productId, roles, status);
+        final List<PartyRole> roleList = GeneralUtils.parseEnumList(roles, PartyRole.class);
+        final List<OnboardedProductState> statusList = GeneralUtils.parseEnumList(status, OnboardedProductState.class);
+        return userService.getUsersCount(institutionId, productId, roleList, statusList);
     }
 
     @Operation(
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/UsersCountResponse.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/UsersCountResponse.java
@@ -1,5 +1,7 @@
 package it.pagopa.selfcare.user.controller.response;
 
+import it.pagopa.selfcare.onboarding.common.PartyRole;
+import it.pagopa.selfcare.user.model.constants.OnboardedProductState;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,8 +15,8 @@ public class UsersCountResponse {
 
     private String institutionId;
     private String productId;
-    private List<String> roles;
-    private List<String> status;
+    private List<PartyRole> roles;
+    private List<OnboardedProductState> status;
     private Long count;
 
 }
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserInstitutionService.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserInstitutionService.java
@@ -49,6 +49,6 @@ public interface UserInstitutionService {
 
     Uni<Long> updateInstitutionDescription(String institutionId, UpdateDescriptionDto updateDescriptionDto);
 
-    Uni<Long> countUsers(String institutionId, String productId, List<String> roles, List<String> status);
+    Uni<Long> countUsers(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status);
 
 }
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserInstitutionServiceDefault.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserInstitutionServiceDefault.java
@@ -263,7 +263,7 @@ public Uni<Boolean> runUserInstitutionCountQuery(Document query) {
     }
 
     @Override
-    public Uni<Long> countUsers(String institutionId, String productId, List<String> roles, List<String> status) {
+    public Uni<Long> countUsers(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status) {
         final Map<String, Object> userFilter = UserInstitutionFilter.builder()
                 .institutionId(institutionId)
                 .build().constructMap();
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserService.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserService.java
@@ -60,5 +60,5 @@ public interface UserService {
 
     Uni<UserInstitutionWithActions> getUserInstitutionWithPermission(String userId, String institutionId, String productId);
 
-    Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<String> roles, List<String> status);
+    Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status);
 }
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserServiceImpl.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserServiceImpl.java
@@ -814,9 +814,9 @@ private List<OnboardedProductWithActions> filterProductAndAddActions(UserInstitu
     }
 
     @Override
-    public Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<String> roles, List<String> status) {
-        final List<String> roleList = Optional.ofNullable(roles).filter(l -> !l.isEmpty()).orElse(null);
-        final List<String> statusList = Optional.ofNullable(status).filter(l -> !l.isEmpty()).orElse(List.of(ACTIVE.name()));
+    public Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status) {
+        final List<PartyRole> roleList = Optional.ofNullable(roles).filter(l -> !l.isEmpty()).orElse(List.of(PartyRole.values()));
+        final List<OnboardedProductState> statusList = Optional.ofNullable(status).filter(l -> !l.isEmpty()).orElse(List.of(OnboardedProductState.ACTIVE));
         return userInstitutionService.countUsers(institutionId, productId, roleList, statusList)
                 .onItem().transform(count -> new UsersCountResponse(institutionId, productId, roleList, statusList, count));
     }
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/util/GeneralUtils.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/util/GeneralUtils.java
@@ -1,17 +1,42 @@
 package it.pagopa.selfcare.user.util;
 
+import it.pagopa.selfcare.user.exception.InvalidRequestException;
+
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
 public class GeneralUtils {
 
     private static final String DELIMITER = ",";
 
+    private GeneralUtils() {}
+
     public static List<String> formatQueryParameterList(List<String> list) {
         if(Objects.nonNull(list) && list.size() == 1 && list.get(0).contains(DELIMITER)) {
             return Arrays.asList(list.get(0).split(DELIMITER));
         }
         return list;
     }
+
+    /**
+     * Convert a list of string in a list of values of an enum.
+     * Throw an InvalidRequestException when a string doesn't match a value inside the enum.
+     *
+     * @param values a list of strings
+     * @param enumClass the enum class
+     * @return a list of enum values
+     * @param <T> the enum type
+     */
+    public static <T extends Enum<T>> List<T> parseEnumList(List<String> values, Class<T> enumClass) {
+        return values != null ? values.stream().map(v -> {
+            try {
+                return Enum.valueOf(enumClass, v);
+            } catch (IllegalArgumentException ex) {
+                throw new InvalidRequestException(String.format("Invalid value %s for %s", v, enumClass.getSimpleName()));
+            }
+        }).toList() : Collections.emptyList();
+    }
+
 }
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/controller/InstitutionControllerTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/controller/InstitutionControllerTest.java
@@ -7,11 +7,13 @@
 import io.restassured.http.ContentType;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import it.pagopa.selfcare.onboarding.common.PartyRole;
 import it.pagopa.selfcare.user.controller.request.UpdateDescriptionDto;
 import it.pagopa.selfcare.user.controller.response.UserInstitutionResponse;
 import it.pagopa.selfcare.user.controller.response.UserProductResponse;
 import it.pagopa.selfcare.user.controller.response.UsersCountResponse;
 import it.pagopa.selfcare.user.exception.ResourceNotFoundException;
+import it.pagopa.selfcare.user.model.constants.OnboardedProductState;
 import it.pagopa.selfcare.user.service.UserService;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -212,8 +214,8 @@ void updateInstitutionDescription_NotAuthorized() {
     void getUsersCount() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = List.of("role1", "role2");
-        final List<String> status = List.of("status1", "status2");
+        final List<PartyRole> roles = List.of(PartyRole.MANAGER, PartyRole.DELEGATE);
+        final List<OnboardedProductState> status = List.of(OnboardedProductState.ACTIVE, OnboardedProductState.PENDING);
 
         Mockito.when(userService.getUsersCount(institutionId, productId, roles, status))
                 .thenReturn(Uni.createFrom().item(new UsersCountResponse(institutionId, productId, roles, status, 2L)));
@@ -223,8 +225,8 @@ void getUsersCount() {
                 .contentType(ContentType.JSON)
                 .pathParam("institutionId", institutionId)
                 .pathParam("productId", productId)
-                .queryParam("roles", roles)
-                .queryParam("status", status)
+                .queryParam("roles", List.of("MANAGER", "DELEGATE"))
+                .queryParam("status", List.of("ACTIVE", "PENDING"))
                 .get("/{institutionId}/products/{productId}/users/count")
                 .then()
                 .statusCode(200);
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserInstitutionServiceTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserInstitutionServiceTest.java
@@ -651,8 +651,8 @@ void updateInstitutionDescription_noInstitutionRootName() {
     void countUsers() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = List.of("role1", "role2");
-        final List<String> status = List.of("status1", "status2");
+        final List<PartyRole> roles = List.of(PartyRole.MANAGER, PartyRole.DELEGATE);
+        final List<OnboardedProductState> status = List.of(OnboardedProductState.ACTIVE, OnboardedProductState.PENDING);
 
         PanacheMock.mock(UserInstitution.class);
         ArgumentCaptor<Document> embeddedCaptor = ArgumentCaptor.forClass(Document.class);
@@ -667,11 +667,11 @@ void countUsers() {
         Assertions.assertTrue(docString.contains("institutionId"));
         Assertions.assertTrue(docString.contains("productId"));
         Assertions.assertTrue(docString.contains("role"));
-        Assertions.assertTrue(docString.contains("role1"));
-        Assertions.assertTrue(docString.contains("role2"));
+        Assertions.assertTrue(docString.contains("MANAGER"));
+        Assertions.assertTrue(docString.contains("DELEGATE"));
         Assertions.assertTrue(docString.contains("status"));
-        Assertions.assertTrue(docString.contains("status1"));
-        Assertions.assertTrue(docString.contains("status2"));
+        Assertions.assertTrue(docString.contains("ACTIVE"));
+        Assertions.assertTrue(docString.contains("PENDING"));
         subscriber.assertCompleted().assertItem(2L);
     }
 
@@ -701,8 +701,8 @@ void countUsersWithoutRolesAndStatus() {
     void countUsersWithRolesAndNoStatus() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = List.of("role1", "role2");
-        final List<String> status = new ArrayList<>();
+        final List<PartyRole> roles = List.of(PartyRole.MANAGER, PartyRole.DELEGATE);
+        final List<OnboardedProductState> status = new ArrayList<>();
 
         PanacheMock.mock(UserInstitution.class);
         ArgumentCaptor<Document> embeddedCaptor = ArgumentCaptor.forClass(Document.class);
@@ -717,8 +717,8 @@ void countUsersWithRolesAndNoStatus() {
         Assertions.assertTrue(docString.contains("institutionId"));
         Assertions.assertTrue(docString.contains("productId"));
         Assertions.assertTrue(docString.contains("role"));
-        Assertions.assertTrue(docString.contains("role1"));
-        Assertions.assertTrue(docString.contains("role2"));
+        Assertions.assertTrue(docString.contains("MANAGER"));
+        Assertions.assertTrue(docString.contains("DELEGATE"));
         Assertions.assertFalse(docString.contains("status"));
         subscriber.assertCompleted().assertItem(8L);
     }
@@ -727,8 +727,8 @@ void countUsersWithRolesAndNoStatus() {
     void countUsersWithStatusAndNoRoles() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = new ArrayList<>();
-        final List<String> status = List.of("status1", "status2");
+        final List<PartyRole> roles = new ArrayList<>();
+        final List<OnboardedProductState> status = List.of(OnboardedProductState.ACTIVE, OnboardedProductState.PENDING);
 
         PanacheMock.mock(UserInstitution.class);
         ArgumentCaptor<Document> embeddedCaptor = ArgumentCaptor.forClass(Document.class);
@@ -743,8 +743,8 @@ void countUsersWithStatusAndNoRoles() {
         Assertions.assertTrue(docString.contains("institutionId"));
         Assertions.assertTrue(docString.contains("productId"));
         Assertions.assertTrue(docString.contains("status"));
-        Assertions.assertTrue(docString.contains("status1"));
-        Assertions.assertTrue(docString.contains("status2"));
+        Assertions.assertTrue(docString.contains("ACTIVE"));
+        Assertions.assertTrue(docString.contains("PENDING"));
         Assertions.assertFalse(docString.contains("role"));
         subscriber.assertCompleted().assertItem(16L);
     }
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java
@@ -1852,8 +1852,8 @@ void testGetUserInstitutionWithPermissionQueryWithProductId() {
     void testGetUsersCount() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = List.of("role1", "role2");
-        final List<String> status = List.of("status1", "status2");
+        final List<PartyRole> roles = List.of(PartyRole.MANAGER, PartyRole.DELEGATE);
+        final List<OnboardedProductState> status = List.of(OnboardedProductState.ACTIVE, OnboardedProductState.PENDING);
 
         when(userInstitutionService.countUsers(institutionId, productId, roles, status))
                 .thenReturn(Uni.createFrom().item(2L));
@@ -1870,70 +1870,73 @@ void testGetUsersCount() {
     void testGetUsersCountWithoutRolesAndStatus() {
         final String institutionId = "institutionId";
         final String productId = "productId";
+        final List<PartyRole> fullListOfRoles = List.of(PartyRole.values());
 
-        when(userInstitutionService.countUsers(institutionId, productId, null, List.of(ACTIVE.name())))
+        when(userInstitutionService.countUsers(institutionId, productId, fullListOfRoles, List.of(ACTIVE)))
                 .thenReturn(Uni.createFrom().item(2L));
 
         userService.getUsersCount(institutionId, productId, null, null).subscribe()
                 .withSubscriber(UniAssertSubscriber.create())
-                .assertItem(new UsersCountResponse(institutionId, productId, null, List.of(ACTIVE.name()), 2L))
+                .assertItem(new UsersCountResponse(institutionId, productId, fullListOfRoles, List.of(ACTIVE), 2L))
                 .assertCompleted();
 
-        verify(userInstitutionService).countUsers(institutionId, productId, null, List.of(ACTIVE.name()));
+        verify(userInstitutionService).countUsers(institutionId, productId, fullListOfRoles, List.of(ACTIVE));
     }
 
     @Test
     void testGetUsersCountWithEmptyRolesAndStatus() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = new ArrayList<>();
-        final List<String> status = new ArrayList<>();
+        final List<PartyRole> roles = new ArrayList<>();
+        final List<OnboardedProductState> status = new ArrayList<>();
+        final List<PartyRole> fullListOfRoles = List.of(PartyRole.values());
 
-        when(userInstitutionService.countUsers(institutionId, productId, null, List.of(ACTIVE.name())))
+        when(userInstitutionService.countUsers(institutionId, productId, fullListOfRoles, List.of(ACTIVE)))
                 .thenReturn(Uni.createFrom().item(2L));
 
         userService.getUsersCount(institutionId, productId, roles, status).subscribe()
                 .withSubscriber(UniAssertSubscriber.create())
-                .assertItem(new UsersCountResponse(institutionId, productId, null, List.of(ACTIVE.name()), 2L))
+                .assertItem(new UsersCountResponse(institutionId, productId, fullListOfRoles, List.of(ACTIVE), 2L))
                 .assertCompleted();
 
-        verify(userInstitutionService).countUsers(institutionId, productId, null, List.of(ACTIVE.name()));
+        verify(userInstitutionService).countUsers(institutionId, productId, fullListOfRoles, List.of(ACTIVE));
     }
 
     @Test
     void testGetUsersCountWithRolesAndNoStatus() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = List.of("role1", "role2");
-        final List<String> status = new ArrayList<>();
+        final List<PartyRole> roles = List.of(PartyRole.MANAGER, PartyRole.DELEGATE);
+        final List<OnboardedProductState> status = new ArrayList<>();
 
-        when(userInstitutionService.countUsers(institutionId, productId, roles, List.of(ACTIVE.name())))
+        when(userInstitutionService.countUsers(institutionId, productId, roles, List.of(ACTIVE)))
                 .thenReturn(Uni.createFrom().item(2L));
 
         userService.getUsersCount(institutionId, productId, roles, status).subscribe()
                 .withSubscriber(UniAssertSubscriber.create())
-                .assertItem(new UsersCountResponse(institutionId, productId, roles, List.of(ACTIVE.name()), 2L))
+                .assertItem(new UsersCountResponse(institutionId, productId, roles, List.of(ACTIVE), 2L))
                 .assertCompleted();
 
-        verify(userInstitutionService).countUsers(institutionId, productId, roles, List.of(ACTIVE.name()));
+        verify(userInstitutionService).countUsers(institutionId, productId, roles, List.of(ACTIVE));
     }
 
     @Test
     void testGetUsersCountWithStatusAndNoRoles() {
         final String institutionId = "institutionId";
         final String productId = "productId";
-        final List<String> roles = new ArrayList<>();
-        final List<String> status = List.of("status1", "status2");
+        final List<PartyRole> roles = new ArrayList<>();
+        final List<OnboardedProductState> status = List.of(OnboardedProductState.ACTIVE, OnboardedProductState.PENDING);
+        final List<PartyRole> fullListOfRoles = List.of(PartyRole.values());
 
-        when(userInstitutionService.countUsers(institutionId, productId, null, status))
+        when(userInstitutionService.countUsers(institutionId, productId, fullListOfRoles, status))
                 .thenReturn(Uni.createFrom().item(2L));
 
         userService.getUsersCount(institutionId, productId, roles, status).subscribe()
                 .withSubscriber(UniAssertSubscriber.create())
-                .assertItem(new UsersCountResponse(institutionId, productId, null, status, 2L))
+                .assertItem(new UsersCountResponse(institutionId, productId, fullListOfRoles, status, 2L))
                 .assertCompleted();
 
-        verify(userInstitutionService).countUsers(institutionId, productId, null, status);
+        verify(userInstitutionService).countUsers(institutionId, productId, fullListOfRoles, status);
     }
 
 }
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/util/GeneralUtilsTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/util/GeneralUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ public interface UserInstitutionService {`
`49`	`49`
`50`	`50`	`Uni<Long> updateInstitutionDescription(String institutionId, UpdateDescriptionDto updateDescriptionDto);`
`51`	`51`
`52`		`- Uni<Long> countUsers(String institutionId, String productId, List<String> roles, List<String> status);`
	`52`	`+ Uni<Long> countUsers(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status);`
`53`	`53`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public Uni<Boolean> runUserInstitutionCountQuery(Document query) {`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`@Override`
`266`		`- public Uni<Long> countUsers(String institutionId, String productId, List<String> roles, List<String> status) {`
	`266`	`+ public Uni<Long> countUsers(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status) {`
`267`	`267`	`final Map<String, Object> userFilter = UserInstitutionFilter.builder()`
`268`	`268`	`.institutionId(institutionId)`
`269`	`269`	`.build().constructMap();`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ public interface UserService {`
`60`	`60`
`61`	`61`	`Uni<UserInstitutionWithActions> getUserInstitutionWithPermission(String userId, String institutionId, String productId);`
`62`	`62`
`63`		`- Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<String> roles, List<String> status);`
	`63`	`+ Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -814,9 +814,9 @@ private List<OnboardedProductWithActions> filterProductAndAddActions(UserInstitu`
`814`	`814`	`}`
`815`	`815`
`816`	`816`	`@Override`
`817`		`- public Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<String> roles, List<String> status) {`
`818`		`- final List<String> roleList = Optional.ofNullable(roles).filter(l -> !l.isEmpty()).orElse(null);`
`819`		`- final List<String> statusList = Optional.ofNullable(status).filter(l -> !l.isEmpty()).orElse(List.of(ACTIVE.name()));`
	`817`	`+ public Uni<UsersCountResponse> getUsersCount(String institutionId, String productId, List<PartyRole> roles, List<OnboardedProductState> status) {`
	`818`	`+ final List<PartyRole> roleList = Optional.ofNullable(roles).filter(l -> !l.isEmpty()).orElse(List.of(PartyRole.values()));`
	`819`	`+ final List<OnboardedProductState> statusList = Optional.ofNullable(status).filter(l -> !l.isEmpty()).orElse(List.of(OnboardedProductState.ACTIVE));`
`820`	`820`	`return userInstitutionService.countUsers(institutionId, productId, roleList, statusList)`
`821`	`821`	`.onItem().transform(count -> new UsersCountResponse(institutionId, productId, roleList, statusList, count));`
`822`	`822`	`}`