From b52ad41dadf8edb76719ede28e4429bd6f647cfc Mon Sep 17 00:00:00 2001 From: Russell Dodd Date: Tue, 17 Sep 2024 15:01:16 +0100 Subject: [PATCH] Rename 'Roles' object to 'BusinessUnitUserPermissions' --- ...AuthenticationInternalUserControllerTest.java | 4 ++-- .../TestingSupportControllerTest.java | 4 ++-- .../aspect/AuthorizationAspect.java | 5 ++--- .../aspect/AuthorizationAspectService.java | 8 ++++---- .../aspect/PermissionNotAllowedException.java | 6 +++--- ...ole.java => BusinessUnitUserPermissions.java} | 10 +++++----- .../opal/authorisation/model/UserState.java | 16 ++++++++-------- .../controllers/DefendantAccountController.java | 4 ++-- .../opal/controllers/develop/NoteController.java | 4 ++-- .../service/opal/BusinessUnitUserService.java | 10 +++++----- .../service/opal/UserEntitlementService.java | 4 ++-- .../uk/gov/hmcts/opal/util/PermissionUtil.java | 6 +++--- .../aspect/LogAuditDetailsAspectTest.java | 5 ++--- .../aspect/UserStateAspectServiceTest.java | 4 ++-- .../aspect/AuthorizationAspectServiceTest.java | 10 +++++----- .../aspect/AuthorizationAspectTest.java | 4 ++-- .../hmcts/opal/controllers/UserStateBuilder.java | 8 ++++---- .../opal/BusinessUnitUserServiceTest.java | 6 +++--- .../gov/hmcts/opal/util/PermissionUtilTest.java | 8 ++++---- 19 files changed, 62 insertions(+), 64 deletions(-) rename src/main/java/uk/gov/hmcts/opal/authorisation/model/{Role.java => BusinessUnitUserPermissions.java} (77%) diff --git a/src/integrationTest/java/uk/gov/hmcts/opal/authentication/controller/AuthenticationInternalUserControllerTest.java b/src/integrationTest/java/uk/gov/hmcts/opal/authentication/controller/AuthenticationInternalUserControllerTest.java index cbb2f961..95fe6dfc 100644 --- a/src/integrationTest/java/uk/gov/hmcts/opal/authentication/controller/AuthenticationInternalUserControllerTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/opal/authentication/controller/AuthenticationInternalUserControllerTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.opal.authentication.service.AccessTokenService; import uk.gov.hmcts.opal.authentication.service.AuthenticationService; import uk.gov.hmcts.opal.authorisation.model.Permission; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.authorisation.service.AuthorisationService; @@ -67,7 +67,7 @@ void testHandleOauthCode() throws Exception { UserState userState = UserState.builder() .userName("name") .userId(123L) - .roles(Set.of(Role.builder() + .roles(Set.of(BusinessUnitUserPermissions.builder() .businessUnitId((short) 123) .businessUserId("BU123") .permissions(Set.of( diff --git a/src/integrationTest/java/uk/gov/hmcts/opal/controllers/TestingSupportControllerTest.java b/src/integrationTest/java/uk/gov/hmcts/opal/controllers/TestingSupportControllerTest.java index b7f1b5fc..bd63aa4e 100644 --- a/src/integrationTest/java/uk/gov/hmcts/opal/controllers/TestingSupportControllerTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/opal/controllers/TestingSupportControllerTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.opal.authentication.model.SecurityToken; import uk.gov.hmcts.opal.authentication.service.AccessTokenService; import uk.gov.hmcts.opal.authorisation.model.Permission; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.authorisation.service.AuthorisationService; import uk.gov.hmcts.opal.dto.AppMode; @@ -40,7 +40,7 @@ class TestingSupportControllerTest { private static final UserState USER_STATE = UserState.builder() .userName("name") .userId(123L) - .roles(Set.of(Role.builder() + .roles(Set.of(BusinessUnitUserPermissions.builder() .businessUnitId((short) 123) .businessUserId("BU123") .permissions(Set.of( diff --git a/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspect.java b/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspect.java index 665a3567..2b3c0eaf 100644 --- a/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspect.java +++ b/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspect.java @@ -6,7 +6,7 @@ import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; import uk.gov.hmcts.opal.authentication.aspect.UserStateAspectService; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import static uk.gov.hmcts.opal.util.PermissionUtil.checkAnyRoleHasPermission; @@ -40,11 +40,10 @@ public Object checkAuthorization(ProceedingJoinPoint joinPoint, Object[] args = joinPoint.getArgs(); UserState userState = userStateAspectService.getUserState(joinPoint); - Role role = authorizationAspectService.getRole(args, userState); + BusinessUnitUserPermissions role = authorizationAspectService.getRole(args, userState); if (checkRoleHasPermission(role, authorizedRoleHasPermission.value())) { return joinPoint.proceed(); } throw new PermissionNotAllowedException(authorizedRoleHasPermission.value(), role); } } - diff --git a/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectService.java b/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectService.java index 16f2043b..86210099 100644 --- a/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectService.java +++ b/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectService.java @@ -7,7 +7,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import uk.gov.hmcts.opal.authentication.aspect.AccessTokenParam; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.dto.AddNoteDto; import uk.gov.hmcts.opal.dto.NoteDto; @@ -55,10 +55,10 @@ public Optional getAuthorization(String authHeaderValue) { return Optional.empty(); } - public Role getRole(Object[] args, UserState userState) { + public BusinessUnitUserPermissions getRole(Object[] args, UserState userState) { for (Object arg : args) { - if (arg instanceof Role) { - return (Role) arg; + if (arg instanceof BusinessUnitUserPermissions) { + return (BusinessUnitUserPermissions) arg; } else if (arg instanceof AddNoteDto addNoteDto) { return getRequiredRole(userState, addNoteDto.getBusinessUnitId()); } else if (arg instanceof NoteDto noteDto) { diff --git a/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/PermissionNotAllowedException.java b/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/PermissionNotAllowedException.java index d7dd1430..42535558 100644 --- a/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/PermissionNotAllowedException.java +++ b/src/main/java/uk/gov/hmcts/opal/authorisation/aspect/PermissionNotAllowedException.java @@ -2,13 +2,13 @@ import lombok.Getter; import uk.gov.hmcts.opal.authorisation.model.Permissions; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; @Getter public class PermissionNotAllowedException extends RuntimeException { private final Permissions permission; - private final Role role; + private final BusinessUnitUserPermissions role; public PermissionNotAllowedException(Permissions value) { super(value + " permission is not allowed for the user"); @@ -16,7 +16,7 @@ public PermissionNotAllowedException(Permissions value) { this.role = null; } - public PermissionNotAllowedException(Permissions permission, Role role) { + public PermissionNotAllowedException(Permissions permission, BusinessUnitUserPermissions role) { super(permission + " permission is not allowed for the role " + role); this.permission = permission; this.role = role; diff --git a/src/main/java/uk/gov/hmcts/opal/authorisation/model/Role.java b/src/main/java/uk/gov/hmcts/opal/authorisation/model/BusinessUnitUserPermissions.java similarity index 77% rename from src/main/java/uk/gov/hmcts/opal/authorisation/model/Role.java rename to src/main/java/uk/gov/hmcts/opal/authorisation/model/BusinessUnitUserPermissions.java index ae8f8227..abed1d80 100644 --- a/src/main/java/uk/gov/hmcts/opal/authorisation/model/Role.java +++ b/src/main/java/uk/gov/hmcts/opal/authorisation/model/BusinessUnitUserPermissions.java @@ -12,7 +12,7 @@ @Builder @Data -public class Role { +public class BusinessUnitUserPermissions { @NonNull String businessUserId; @@ -25,9 +25,9 @@ public class Role { Set permissions; @JsonCreator - public Role(@JsonProperty("business_user_id") String businessUserId, - @JsonProperty("business_unit_id") Short businessUnitId, - @JsonProperty("permissions") Set permissions) { + public BusinessUnitUserPermissions(@JsonProperty("business_user_id") String businessUserId, + @JsonProperty("business_unit_id") Short businessUnitId, + @JsonProperty("permissions") Set permissions) { this.businessUserId = businessUserId; this.businessUnitId = businessUnitId; @@ -46,7 +46,7 @@ public boolean matchesBusinessUnitId(Short roleBusinessUnitId) { return businessUnitId.equals(roleBusinessUnitId); } - public static class DeveloperRole extends Role { + public static class DeveloperRole extends BusinessUnitUserPermissions { DeveloperRole() { super("", Short.MAX_VALUE, Collections.emptySet()); } diff --git a/src/main/java/uk/gov/hmcts/opal/authorisation/model/UserState.java b/src/main/java/uk/gov/hmcts/opal/authorisation/model/UserState.java index 85254ad2..e938e685 100644 --- a/src/main/java/uk/gov/hmcts/opal/authorisation/model/UserState.java +++ b/src/main/java/uk/gov/hmcts/opal/authorisation/model/UserState.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; -import uk.gov.hmcts.opal.authorisation.model.Role.DeveloperRole; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions.DeveloperRole; import java.util.Collections; import java.util.Optional; @@ -24,13 +24,13 @@ public class UserState { String userName; @EqualsAndHashCode.Exclude - Set roles; + Set roles; @JsonCreator public UserState( @JsonProperty("user_id") Long userId, @JsonProperty("user_name") String userName, - @JsonProperty("roles") Set roles + @JsonProperty("roles") Set roles ) { this.userId = userId; this.userName = userName; @@ -58,7 +58,7 @@ public boolean hasRoleWithPermission(short roleBusinessUnitId, Permissions permi .anyMatch(r -> r.hasPermission(permission)); } - public Optional getRoleForBusinessUnit(Short businessUnitId) { + public Optional getRoleForBusinessUnit(Short businessUnitId) { return roles.stream() .filter(r -> r.matchesBusinessUnitId(businessUnitId)) .findFirst(); @@ -69,10 +69,10 @@ public static interface UserRoles { } public static class UserRolesImpl implements UserRoles { - private final Set roles; + private final Set roles; private final Set businessUnits; - public UserRolesImpl(Set roles) { + public UserRolesImpl(Set roles) { this.roles = roles; businessUnits = roles.stream().map(r -> r.getBusinessUnitId()).collect(Collectors.toSet()); } @@ -83,7 +83,7 @@ public boolean containsBusinessUnit(Short businessUnitId) { } public static class DeveloperUserState extends UserState { - private static final Optional DEV_ROLE = Optional.of(new DeveloperRole()); + private static final Optional DEV_ROLE = Optional.of(new DeveloperRole()); public DeveloperUserState() { super(0L, "Developer_User", Collections.emptySet()); @@ -95,7 +95,7 @@ public boolean anyRoleHasPermission(Permissions permission) { } @Override - public Optional getRoleForBusinessUnit(Short businessUnitId) { + public Optional getRoleForBusinessUnit(Short businessUnitId) { return DEV_ROLE; } diff --git a/src/main/java/uk/gov/hmcts/opal/controllers/DefendantAccountController.java b/src/main/java/uk/gov/hmcts/opal/controllers/DefendantAccountController.java index e4bda4cb..8053ac4a 100644 --- a/src/main/java/uk/gov/hmcts/opal/controllers/DefendantAccountController.java +++ b/src/main/java/uk/gov/hmcts/opal/controllers/DefendantAccountController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.dto.AccountDetailsDto; import uk.gov.hmcts.opal.dto.AccountEnquiryDto; @@ -117,7 +117,7 @@ public ResponseEntity addNote( log.info(":POST:addNote: {}", addNote.toPrettyJson()); UserState userState = userStateService.getUserStateUsingAuthToken(authHeaderValue); - Role role = getRequiredRole(userState, addNote.getBusinessUnitId()); + BusinessUnitUserPermissions role = getRequiredRole(userState, addNote.getBusinessUnitId()); NoteDto noteDto = NoteDto.builder() .associatedRecordId(addNote.getAssociatedRecordId()) diff --git a/src/main/java/uk/gov/hmcts/opal/controllers/develop/NoteController.java b/src/main/java/uk/gov/hmcts/opal/controllers/develop/NoteController.java index 276ef3c0..e94a8719 100644 --- a/src/main/java/uk/gov/hmcts/opal/controllers/develop/NoteController.java +++ b/src/main/java/uk/gov/hmcts/opal/controllers/develop/NoteController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.dto.NoteDto; import uk.gov.hmcts.opal.dto.search.NoteSearchDto; @@ -51,7 +51,7 @@ public ResponseEntity createNote( log.info(":POST:createNote: {}", noteDto.toPrettyJson()); UserState userState = userStateService.getUserStateUsingAuthToken(authHeaderValue); - Role role = getRequiredRole(userState, noteDto.getBusinessUnitId()); + BusinessUnitUserPermissions role = getRequiredRole(userState, noteDto.getBusinessUnitId()); noteDto.setPostedBy(role.getBusinessUserId()); noteDto.setPostedByUserId(userState.getUserId()); diff --git a/src/main/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserService.java b/src/main/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserService.java index 5c2a611a..90df4bc3 100644 --- a/src/main/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserService.java +++ b/src/main/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserService.java @@ -6,7 +6,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.dto.search.BusinessUnitUserSearchDto; import uk.gov.hmcts.opal.entity.BusinessUnitUserEntity; import uk.gov.hmcts.opal.repository.BusinessUnitUserRepository; @@ -46,10 +46,10 @@ public List searchBusinessUnitUsers(BusinessUnitUserSear /** * Return a Set of Authorisation Roles mapped from BusinessUnitUsers keyed on the user id from the Users table. */ - public Set getAuthorisationRolesByUserId(Long userId) { + public Set getAuthorisationRolesByUserId(Long userId) { List buuList = businessUnitUserRepository.findAllByUser_UserId(userId); - return buuList.stream().map(buu -> Role.builder() + return buuList.stream().map(buu -> BusinessUnitUserPermissions.builder() .businessUserId(buu.getBusinessUnitUserId()) .businessUnitId(buu.getBusinessUnit().getBusinessUnitId()) .permissions(userEntitlementService.getPermissionsByBusinessUnitUserId(buu.getBusinessUnitUserId())) @@ -62,10 +62,10 @@ public Set getAuthorisationRolesByUserId(Long userId) { * This method is assuming that there are no Permissions for the Roles and so skips performing the additional * repository queries that do get performed in the method above. */ - public Set getLimitedRolesByUserId(Long userId) { + public Set getLimitedRolesByUserId(Long userId) { List buuList = businessUnitUserRepository.findAllByUser_UserId(userId); - return buuList.stream().map(buu -> Role.builder() + return buuList.stream().map(buu -> BusinessUnitUserPermissions.builder() .businessUserId(buu.getBusinessUnitUserId()) .businessUnitId(buu.getBusinessUnit().getBusinessUnitId()) .permissions(Collections.emptySet()) // We are assuming that Permissions exist for this Role. diff --git a/src/main/java/uk/gov/hmcts/opal/service/opal/UserEntitlementService.java b/src/main/java/uk/gov/hmcts/opal/service/opal/UserEntitlementService.java index 0487c088..796f719b 100644 --- a/src/main/java/uk/gov/hmcts/opal/service/opal/UserEntitlementService.java +++ b/src/main/java/uk/gov/hmcts/opal/service/opal/UserEntitlementService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import uk.gov.hmcts.opal.authentication.exception.AuthenticationException; import uk.gov.hmcts.opal.authorisation.model.Permission; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.dto.search.UserEntitlementSearchDto; import uk.gov.hmcts.opal.entity.BusinessUnitUserEntity; @@ -82,7 +82,7 @@ public Optional getUserStateByUsername(String username) { return users.stream().findFirst().map(u -> UserState.builder() .userId(u.getUserId()) .userName(u.getUsername()) - .roles(businessUnitUsers.stream().map(buu -> Role.builder() + .roles(businessUnitUsers.stream().map(buu -> BusinessUnitUserPermissions.builder() .businessUserId(buu.getBusinessUnitUserId()) .businessUnitId(buu.getBusinessUnit().getBusinessUnitId()) .permissions(toPermissions(entitlementsMap.get(buu.getBusinessUnitUserId()))) diff --git a/src/main/java/uk/gov/hmcts/opal/util/PermissionUtil.java b/src/main/java/uk/gov/hmcts/opal/util/PermissionUtil.java index ff54bbb1..c4fe1754 100644 --- a/src/main/java/uk/gov/hmcts/opal/util/PermissionUtil.java +++ b/src/main/java/uk/gov/hmcts/opal/util/PermissionUtil.java @@ -2,7 +2,7 @@ import org.springframework.security.access.AccessDeniedException; import uk.gov.hmcts.opal.authorisation.model.Permissions; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.entity.BusinessUnitRef; import uk.gov.hmcts.opal.service.opal.UserStateService; @@ -12,12 +12,12 @@ public class PermissionUtil { - public static Role getRequiredRole(UserState userState, Short businessUnitId) { + public static BusinessUnitUserPermissions getRequiredRole(UserState userState, Short businessUnitId) { return userState.getRoleForBusinessUnit(businessUnitId).orElseThrow(() -> new AccessDeniedException("User does not have an assigned role in business unit: " + businessUnitId)); } - public static boolean checkRoleHasPermission(Role role, Permissions permission) { + public static boolean checkRoleHasPermission(BusinessUnitUserPermissions role, Permissions permission) { if (role.doesNotHavePermission(permission)) { throw new AccessDeniedException("User does not have the required permission: " + permission.description); } diff --git a/src/test/java/uk/gov/hmcts/opal/authentication/aspect/LogAuditDetailsAspectTest.java b/src/test/java/uk/gov/hmcts/opal/authentication/aspect/LogAuditDetailsAspectTest.java index 39600356..92d56f9b 100644 --- a/src/test/java/uk/gov/hmcts/opal/authentication/aspect/LogAuditDetailsAspectTest.java +++ b/src/test/java/uk/gov/hmcts/opal/authentication/aspect/LogAuditDetailsAspectTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.opal.authentication.exception.MissingRequestHeaderException; import uk.gov.hmcts.opal.authorisation.model.LogActions; import uk.gov.hmcts.opal.authorisation.model.Permission; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.dto.AddLogAuditDetailDto; import uk.gov.hmcts.opal.service.opal.LogAuditDetailService; @@ -32,7 +32,7 @@ class LogAuditDetailsAspectTest { private static final UserState USER_STATE = UserState.builder() .userName("name") .userId(123L) - .roles(Set.of(Role.builder() + .roles(Set.of(BusinessUnitUserPermissions.builder() .businessUnitId((short) 123) .businessUserId("BU123") .permissions(Set.of( @@ -162,4 +162,3 @@ void writeAuditLog_shouldHandleGeneralExceptionGracefully() { } } } - diff --git a/src/test/java/uk/gov/hmcts/opal/authentication/aspect/UserStateAspectServiceTest.java b/src/test/java/uk/gov/hmcts/opal/authentication/aspect/UserStateAspectServiceTest.java index 781beb18..57aa5e9a 100644 --- a/src/test/java/uk/gov/hmcts/opal/authentication/aspect/UserStateAspectServiceTest.java +++ b/src/test/java/uk/gov/hmcts/opal/authentication/aspect/UserStateAspectServiceTest.java @@ -11,7 +11,7 @@ import uk.gov.hmcts.opal.authentication.exception.MissingRequestHeaderException; import uk.gov.hmcts.opal.authorisation.aspect.AuthorizationAspectService; import uk.gov.hmcts.opal.authorisation.model.Permission; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.service.opal.UserStateService; @@ -47,7 +47,7 @@ class UserStateAspectServiceTest { private static final UserState USER_STATE = UserState.builder() .userName("name") .userId(123L) - .roles(Set.of(Role.builder() + .roles(Set.of(BusinessUnitUserPermissions.builder() .businessUnitId((short) 123) .businessUserId("BU123") .permissions(Set.of( diff --git a/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectServiceTest.java b/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectServiceTest.java index 822484ca..5c90a2b9 100644 --- a/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectServiceTest.java +++ b/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectServiceTest.java @@ -15,7 +15,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import uk.gov.hmcts.opal.authentication.aspect.AccessTokenParam; import uk.gov.hmcts.opal.authorisation.model.Permission; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.dto.AddNoteDto; @@ -33,7 +33,7 @@ @ExtendWith(MockitoExtension.class) class AuthorizationAspectServiceTest { - static final Role ROLE = Role.builder() + static final BusinessUnitUserPermissions ROLE = BusinessUnitUserPermissions.builder() .businessUnitId((short) 12) .businessUserId("BU123") .permissions(Set.of( @@ -171,17 +171,17 @@ void getRole_WhenAddNoteDtoArgument() { AddNoteDto addNoteDto = AddNoteDto.builder().businessUnitId((short) 12).build(); Object[] args = {addNoteDto}; - Role actualRole = authorizationAspectService.getRole(args, USER_STATE); + BusinessUnitUserPermissions actualRole = authorizationAspectService.getRole(args, USER_STATE); assertEquals(ROLE, actualRole); } @Test void getRole_WhenRoleArgument() { - Role expectedRole = ROLE; + BusinessUnitUserPermissions expectedRole = ROLE; Object[] args = {expectedRole}; - Role actualRole = authorizationAspectService.getRole(args, USER_STATE); + BusinessUnitUserPermissions actualRole = authorizationAspectService.getRole(args, USER_STATE); assertEquals(expectedRole, actualRole); } diff --git a/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectTest.java b/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectTest.java index 987bb571..fb80b137 100644 --- a/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectTest.java +++ b/src/test/java/uk/gov/hmcts/opal/authorisation/aspect/AuthorizationAspectTest.java @@ -15,7 +15,7 @@ import uk.gov.hmcts.opal.authentication.exception.MissingRequestHeaderException; import uk.gov.hmcts.opal.authorisation.model.Permission; import uk.gov.hmcts.opal.authorisation.model.Permissions; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import uk.gov.hmcts.opal.service.opal.UserStateService; @@ -34,7 +34,7 @@ @ExtendWith(MockitoExtension.class) class AuthorizationAspectTest { - static final Role ROLE = Role.builder() + static final BusinessUnitUserPermissions ROLE = BusinessUnitUserPermissions.builder() .businessUnitId((short) 123) .businessUserId("BU123") .permissions(Set.of( diff --git a/src/test/java/uk/gov/hmcts/opal/controllers/UserStateBuilder.java b/src/test/java/uk/gov/hmcts/opal/controllers/UserStateBuilder.java index 2966648e..2c425dd1 100644 --- a/src/test/java/uk/gov/hmcts/opal/controllers/UserStateBuilder.java +++ b/src/test/java/uk/gov/hmcts/opal/controllers/UserStateBuilder.java @@ -2,7 +2,7 @@ import uk.gov.hmcts.opal.authorisation.model.Permission; import uk.gov.hmcts.opal.authorisation.model.Permissions; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import java.util.Set; @@ -23,7 +23,7 @@ public static UserState createUserState() { )))); } - public static UserState createUserState(Set roles) { + public static UserState createUserState(Set roles) { return UserState.builder() .userId(345L) .userName("John Smith") @@ -31,8 +31,8 @@ public static UserState createUserState(Set roles) { .build(); } - public static Role createRole(Set permissions) { - return Role.builder() + public static BusinessUnitUserPermissions createRole(Set permissions) { + return BusinessUnitUserPermissions.builder() .businessUserId("JK0320") .businessUnitId((short)50) .permissions(permissions) diff --git a/src/test/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserServiceTest.java b/src/test/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserServiceTest.java index efa96ef3..1fc9333f 100644 --- a/src/test/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserServiceTest.java +++ b/src/test/java/uk/gov/hmcts/opal/service/opal/BusinessUnitUserServiceTest.java @@ -11,7 +11,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.repository.query.FluentQuery; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.dto.search.BusinessUnitUserSearchDto; import uk.gov.hmcts.opal.entity.BusinessUnitEntity; import uk.gov.hmcts.opal.entity.BusinessUnitUserEntity; @@ -88,7 +88,7 @@ void testGetAuthorisationRolesByUserId() { when(userEntitlementService.getPermissionsByBusinessUnitUserId(any())).thenReturn(Collections.emptySet()); // Act - Set result = businessUnitUserService.getAuthorisationRolesByUserId(0L); + Set result = businessUnitUserService.getAuthorisationRolesByUserId(0L); // Assert assertNotNull(result); @@ -106,7 +106,7 @@ void testGetLimitedRolesByUserId() { when(businessUnitUserRepository.findAllByUser_UserId(any())).thenReturn(list); // Act - Set result = businessUnitUserService.getLimitedRolesByUserId(0L); + Set result = businessUnitUserService.getLimitedRolesByUserId(0L); // Assert assertNotNull(result); diff --git a/src/test/java/uk/gov/hmcts/opal/util/PermissionUtilTest.java b/src/test/java/uk/gov/hmcts/opal/util/PermissionUtilTest.java index c445b132..045dcf09 100644 --- a/src/test/java/uk/gov/hmcts/opal/util/PermissionUtilTest.java +++ b/src/test/java/uk/gov/hmcts/opal/util/PermissionUtilTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.security.access.AccessDeniedException; import uk.gov.hmcts.opal.authorisation.model.Permissions; -import uk.gov.hmcts.opal.authorisation.model.Role; +import uk.gov.hmcts.opal.authorisation.model.BusinessUnitUserPermissions; import uk.gov.hmcts.opal.authorisation.model.UserState; import java.util.Collections; @@ -20,14 +20,14 @@ class PermissionUtilTest { @Test void testCheckRoleHasPermission_success() { - Role role = createRole(createSinglePermissions(41L)); + BusinessUnitUserPermissions role = createRole(createSinglePermissions(41L)); Permissions permission = Permissions.ACCOUNT_ENQUIRY_NOTES; assertTrue(PermissionUtil.checkRoleHasPermission(role, permission)); } @Test void testCheckRoleHasPermission_fail1() { - Role role = createRole(Collections.emptySet()); + BusinessUnitUserPermissions role = createRole(Collections.emptySet()); Permissions permission = Permissions.ACCOUNT_ENQUIRY; AccessDeniedException ade = assertThrows( AccessDeniedException.class, @@ -37,7 +37,7 @@ void testCheckRoleHasPermission_fail1() { @Test void testCheckRoleHasPermission_fail2() { - Role role = createRole(createSinglePermissions(41L)); + BusinessUnitUserPermissions role = createRole(createSinglePermissions(41L)); Permissions permission = Permissions.ACCOUNT_ENQUIRY; AccessDeniedException ade = assertThrows( AccessDeniedException.class,