Skip to content

Commit

Permalink
[SELC-4588] Fix: refactor userRole value according to ADMIN and LIMIT…
Browse files Browse the repository at this point in the history
…ED (#386)
  • Loading branch information
flaminiaScarciofolo committed Mar 25, 2024
1 parent 68656b2 commit 0070e13
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package it.pagopa.selfcare.dashboard.web.model.mapper;

import it.pagopa.selfcare.commons.base.security.PartyRole;
import it.pagopa.selfcare.commons.base.security.SelfCareAuthority;
import it.pagopa.selfcare.commons.base.security.SelfCareGrantedAuthority;
import it.pagopa.selfcare.dashboard.connector.model.institution.*;
Expand All @@ -12,6 +13,7 @@
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.List;
import java.util.Optional;
Expand All @@ -26,6 +28,7 @@ public interface InstitutionResourceMapper {
@Mapping(target = "userRole", expression = "java(toUserRole(model.getId(), model.getStatus()))")
InstitutionBaseResource toResource(InstitutionInfo model);

@Mapping(target = "userRole", expression = "java(toUserRole(model.getUserRole()))")
InstitutionBaseResource toResource(InstitutionBase model);

@Mapping(target = "name", source = "description")
Expand Down Expand Up @@ -71,4 +74,12 @@ default String toUserRole(String institutionId, RelationshipState status) {
return userRole;
}

@Named("toUserRole")
default String toUserRole(String userRole) {
if(StringUtils.hasText(userRole)){
return PartyRole.valueOf(userRole).getSelfCareAuthority().toString();
}
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ void getInstitutions_institutionInfoNotNull() throws Exception {
when(authentication.getPrincipal()).thenReturn(SelfCareUser.builder(userId).build());

InstitutionBase expectedInstitution = mockInstance(new InstitutionBase());
expectedInstitution.setUserRole("MANAGER");
List<InstitutionBase> expectedInstitutionInfos = new ArrayList<>();
expectedInstitutionInfos.add(expectedInstitution);
when(userServiceMock.getInstitutions(userId)).thenReturn(expectedInstitutionInfos);
Expand Down

0 comments on commit 0070e13

Please sign in to comment.