diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/service/casedataaccesscontrol/RoleAssignmentCategoryService.java b/src/main/java/uk/gov/hmcts/ccd/domain/service/casedataaccesscontrol/RoleAssignmentCategoryService.java index 4c0a6bcabb..5a0317856d 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/service/casedataaccesscontrol/RoleAssignmentCategoryService.java +++ b/src/main/java/uk/gov/hmcts/ccd/domain/service/casedataaccesscontrol/RoleAssignmentCategoryService.java @@ -16,7 +16,8 @@ public class RoleAssignmentCategoryService { private static final Pattern PROFESSIONAL_ROLE = - Pattern.compile(".+-solicitor$|^caseworker-.+-localAuthority$", Pattern.CASE_INSENSITIVE); + Pattern.compile(".+-solicitor$|^solicitor$|^caseworker-.+-localAuthority$|^pui-case-manager$", + Pattern.CASE_INSENSITIVE); private static final Pattern CITIZEN_ROLE = Pattern.compile("^citizen(-.*)?$|^letter-holder$", Pattern.CASE_INSENSITIVE); private static final Pattern JUDICIAL_ROLE = Pattern.compile(".+-panelmember$", diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/CaseAccessService.java b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/CaseAccessService.java index 7977f7e707..f150832bf8 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/CaseAccessService.java +++ b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/CaseAccessService.java @@ -51,7 +51,7 @@ public class CaseAccessService { private static final Pattern RESTRICT_GRANTED_ROLES_PATTERN = Pattern.compile(".+-solicitor$|.+-panelmember$|^citizen(-.*)?$|^letter-holder$|^caseworker-." - + "+-localAuthority$"); + + "+-localAuthority|^solicitor$|^pui-case-manager$"); public CaseAccessService(@Qualifier(CachedUserRepository.QUALIFIER) UserRepository userRepository, @Qualifier(CachedCaseUserRepository.QUALIFIER) CaseUserRepository caseUserRepository,