[SELC-4846] Fix: refactor retrieveFilteredUserInstitution to remove l…

…oggedUserId as filter parameter (#450)
pagopa · May 31, 2024 · b105fc5 · b105fc5
1 parent 06816a3
commit b105fc5
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 72 deletions.
diff --git a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/api/UserApiConnector.java b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/api/UserApiConnector.java
@@ -33,7 +33,7 @@ public interface UserApiConnector {
 
     Collection<UserInfo> getUsers(String institutionId, UserInfo.UserInfoFilter userInfoFilter, String loggedUserId);
 
-    List<String> retrieveFilteredUserInstitution(String institutionId, UserInfo.UserInfoFilter userInfoFilter, String loggedUserId);
+    List<String> retrieveFilteredUserInstitution(String institutionId, UserInfo.UserInfoFilter userInfoFilter);
 
     List<UserInstitution> retrieveFilteredUser(String userId, String institutionId, String productId);
 

diff --git a/...tor/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/UserConnectorImpl.java b/...tor/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/UserConnectorImpl.java
@@ -180,7 +180,7 @@ public Collection<UserInfo> getUsers(String institutionId, UserInfo.UserInfoFilt
     }
 
     @Override
-    public List<String> retrieveFilteredUserInstitution(String institutionId, UserInfo.UserInfoFilter userInfoFilter, String loggedUserId) {
+    public List<String> retrieveFilteredUserInstitution(String institutionId, UserInfo.UserInfoFilter userInfoFilter) {
 
         return Optional.ofNullable(userInstitutionApiRestClient._institutionsInstitutionIdUserInstitutionsGet(institutionId,
                                 null,
@@ -189,7 +189,7 @@ public List<String> retrieveFilteredUserInstitution(String institutionId, UserIn
                                 Optional.ofNullable(userInfoFilter.getAllowedStates())
                                         .map(relationshipStates -> relationshipStates.stream().map(Enum::name).toList())
                                         .orElse(null),
-                                loggedUserId)
+                                null)
                         .getBody()).map(userInstitutionResponses -> userInstitutionResponses.stream()
                         .map(UserInstitutionResponse::getUserId).toList())
                 .orElse(Collections.emptyList());

diff --git a/...rest/src/test/java/it/pagopa/selfcare/dashboard/connector/rest/UserConnectorImplTest.java b/...rest/src/test/java/it/pagopa/selfcare/dashboard/connector/rest/UserConnectorImplTest.java
@@ -426,14 +426,13 @@ public void retrieveFilteredUserInstitutionReturnsUserInstitutions() {
         UserInfo.UserInfoFilter userInfoFilter = new UserInfo.UserInfoFilter();
         userInfoFilter.setAllowedStates(List.of(ACTIVE, SUSPENDED));
         userInfoFilter.setProductId("productId");
-        String loggedUserId = "loggedUserId";
         List<UserInstitutionResponse> userInstitutionResponses = List.of(new UserInstitutionResponse(), new UserInstitutionResponse());
         when(userInstitutionApiRestClient._institutionsInstitutionIdUserInstitutionsGet(institutionId, null, List.of(userInfoFilter.getProductId()), null,
-                userInfoFilter.getAllowedStates().stream().map(Enum::name).toList(), loggedUserId))
+                userInfoFilter.getAllowedStates().stream().map(Enum::name).toList(), null))
                 .thenReturn(ResponseEntity.ok(userInstitutionResponses));
 
         // When
-        List<String> result = userConnector.retrieveFilteredUserInstitution(institutionId, userInfoFilter, loggedUserId);
+        List<String> result = userConnector.retrieveFilteredUserInstitution(institutionId, userInfoFilter);
 
         // Then
         assertEquals(userInstitutionResponses.size(), result.size());
@@ -446,13 +445,12 @@ public void retrieveFilteredUserInstitutionReturnsEmptyListWhenNoUserInstitution
         UserInfo.UserInfoFilter userInfoFilter = new UserInfo.UserInfoFilter();
         userInfoFilter.setProductId("productId");
         userInfoFilter.setAllowedStates(List.of(ACTIVE, SUSPENDED));
-        String loggedUserId = "loggedUserId";
         when(userInstitutionApiRestClient._institutionsInstitutionIdUserInstitutionsGet(institutionId, null, List.of(userInfoFilter.getProductId()), null,
-                userInfoFilter.getAllowedStates().stream().map(Enum::name).toList(), loggedUserId))
+                userInfoFilter.getAllowedStates().stream().map(Enum::name).toList(), null))
                 .thenReturn(ResponseEntity.ok(List.of()));
 
         // When
-        List<String> result = userConnector.retrieveFilteredUserInstitution(institutionId, userInfoFilter, loggedUserId);
+        List<String> result = userConnector.retrieveFilteredUserInstitution(institutionId, userInfoFilter);
 
         // Then
         assertEquals(0, result.size());

diff --git a/core/src/main/java/it/pagopa/selfcare/dashboard/core/UserGroupV2ServiceImpl.java b/core/src/main/java/it/pagopa/selfcare/dashboard/core/UserGroupV2ServiceImpl.java
@@ -51,7 +51,7 @@ public String createUserGroup(CreateUserGroup group) {
         userInfoFilter.setProductId(group.getProductId());
         userInfoFilter.setAllowedStates(List.of(ACTIVE, SUSPENDED));
 
-        List<String> retrievedId = retrievedIds(group.getInstitutionId(), userInfoFilter);
+        List<String> retrievedId = retrieveIds(group.getInstitutionId(), userInfoFilter);
 
         if (group.getMembers().stream()
                 .filter(uuid -> Collections.binarySearch(retrievedId, uuid) >= 0)
@@ -82,12 +82,10 @@ public void activate(String groupId) {
         log.trace("activate end");
     }
 
-    private List<String> retrievedIds(String institutionId, UserInfo.UserInfoFilter userInfoFilter) {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        String loggedUserId = ((SelfCareUser) authentication.getPrincipal()).getId();
+    private List<String> retrieveIds(String institutionId, UserInfo.UserInfoFilter userInfoFilter) {
         List<String> retrievedUsers = userApiConnector.retrieveFilteredUserInstitution(
                 institutionId,
-                userInfoFilter, loggedUserId);
+                userInfoFilter);
         return retrievedUsers.stream()
                 .sorted()
                 .toList();
@@ -112,7 +110,7 @@ public void updateUserGroup(String groupId, UpdateUserGroup group) {
         userInfoFilter.setProductId(userGroupInfo.getProductId());
         userInfoFilter.setAllowedStates(List.of(ACTIVE, SUSPENDED));
 
-        List<String> retrievedId = retrievedIds(userGroupInfo.getInstitutionId(), userInfoFilter);
+        List<String> retrievedId = retrieveIds(userGroupInfo.getInstitutionId(), userInfoFilter);
 
         if (group.getMembers().stream()
                 .filter(uuid -> Collections.binarySearch(retrievedId, uuid) >= 0)
@@ -133,7 +131,7 @@ public void addMemberToUserGroup(String groupId, UUID userId) {
         UserInfo.UserInfoFilter userInfoFilter = new UserInfo.UserInfoFilter();
         userInfoFilter.setProductId(retrievedGroup.getProductId());
         userInfoFilter.setAllowedStates(List.of(ACTIVE, SUSPENDED));
-        List<String> retrievedIds = retrievedIds(retrievedGroup.getInstitutionId(), userInfoFilter);
+        List<String> retrievedIds = retrieveIds(retrievedGroup.getInstitutionId(), userInfoFilter);
         if (!retrievedIds.contains(userId.toString())) {
             throw new InvalidMemberListException("This user is not allowed for this group");
         }
@@ -166,7 +164,7 @@ public UserGroupInfo getUserGroupById(String groupId, String institutionId) {
         UserInfo.UserInfoFilter userInfoFilter = new UserInfo.UserInfoFilter();
         userInfoFilter.setProductId(userGroupInfo.getProductId());
         userInfoFilter.setAllowedStates(List.of(ACTIVE, SUSPENDED));
-        List<UserInfo> userInfos = retrievedIds(userGroupInfo.getInstitutionId(), userInfoFilter).stream()
+        List<UserInfo> userInfos = retrieveIds(userGroupInfo.getInstitutionId(), userInfoFilter).stream()
                 .map(id -> {
                     UserInfo userInfo = new UserInfo();
                     userInfo.setId(id);