From 8f95015a4285b9c68cb60897cc1ba595feae9a63 Mon Sep 17 00:00:00 2001 From: padmapriyanalam Date: Tue, 7 Jul 2026 09:27:24 +0100 Subject: [PATCH 1/5] POFCC-259-removal of dependency on IDAM roles in NoC --- .../gov/hmcts/ccd/domain/service/common/CaseAccessService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..35ceeb441d 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, From 787eec2bb058006857c4e3a99761c72bfcd7483b Mon Sep 17 00:00:00 2001 From: padmapriyanalam Date: Thu, 9 Jul 2026 11:52:12 +0100 Subject: [PATCH 2/5] POFCC-259-removal of dependency on IDAM roles in NoC --- .../hmcts/ccd/domain/service/common/CaseAccessService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 35ceeb441d..4040d49831 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 @@ -49,9 +49,14 @@ public class CaseAccessService { private final CaseDetailsRepository caseDetailsRepository; private final CaseDataAccessControl caseDataAccessControl; + /* TO DO Uncomment after testing + private static final Pattern RESTRICT_GRANTED_ROLES_PATTERN + = Pattern.compile(".+-solicitor$|.+-panelmember$|^citizen(-.*)?$|^letter-holder$|^caseworker-." + + "+-localAuthority");*/ + private static final Pattern RESTRICT_GRANTED_ROLES_PATTERN = Pattern.compile(".+-solicitor$|.+-panelmember$|^citizen(-.*)?$|^letter-holder$|^caseworker-." - + "+-localAuthority$|^solicitor$|^pui-case-manager$"); + + "+-localAuthority|^solicitor$|^pui-case-manager$"); public CaseAccessService(@Qualifier(CachedUserRepository.QUALIFIER) UserRepository userRepository, @Qualifier(CachedCaseUserRepository.QUALIFIER) CaseUserRepository caseUserRepository, From 709c980729ae084489c0b4a5ac26d605bb05f52a Mon Sep 17 00:00:00 2001 From: padmapriyanalam Date: Thu, 9 Jul 2026 12:05:46 +0100 Subject: [PATCH 3/5] POFCC-259-removal of dependency on IDAM roles in NoC --- .../hmcts/ccd/domain/service/common/CaseAccessService.java | 5 ----- 1 file changed, 5 deletions(-) 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 4040d49831..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 @@ -49,11 +49,6 @@ public class CaseAccessService { private final CaseDetailsRepository caseDetailsRepository; private final CaseDataAccessControl caseDataAccessControl; - /* TO DO Uncomment after testing - private static final Pattern RESTRICT_GRANTED_ROLES_PATTERN - = Pattern.compile(".+-solicitor$|.+-panelmember$|^citizen(-.*)?$|^letter-holder$|^caseworker-." - + "+-localAuthority");*/ - private static final Pattern RESTRICT_GRANTED_ROLES_PATTERN = Pattern.compile(".+-solicitor$|.+-panelmember$|^citizen(-.*)?$|^letter-holder$|^caseworker-." + "+-localAuthority|^solicitor$|^pui-case-manager$"); From 10a62c5b39d9d11a994b09cda73204c46817ed13 Mon Sep 17 00:00:00 2001 From: padmapriyanalam Date: Thu, 9 Jul 2026 12:54:06 +0100 Subject: [PATCH 4/5] POFCC-259-removal of dependency on IDAM roles in NoC --- .../casedataaccesscontrol/RoleAssignmentCategoryService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..721128a063 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,7 @@ 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$", From af9a35568bb3b855cd269c47f75db088e8ad446c Mon Sep 17 00:00:00 2001 From: padmapriyanalam Date: Thu, 9 Jul 2026 12:57:46 +0100 Subject: [PATCH 5/5] POFCC-259-removal of dependency on IDAM roles in NoC --- .../casedataaccesscontrol/RoleAssignmentCategoryService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 721128a063..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$|^solicitor$|^caseworker-.+-localAuthority$|^pui-case-manager$", 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$",