Merge pull request #1922 from hmcts/AM-2820_HMC_IAC_Org_Roles

Am 2820 hmc iac org roles
hmcts · Aug 21, 2023 · 890c4fd · 890c4fd
2 parents b77a0ca + 33699f0
commit 890c4fd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/main/resources/roleconfig/role_common.json b/src/main/resources/roleconfig/role_common.json
@@ -1750,7 +1750,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT"]
+            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT","IA"]
           }
         }
       }
@@ -1780,7 +1780,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT"]
+            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT","IA"]
           }
         }
       }
@@ -1789,8 +1789,8 @@
   {
     "name": "hearing-manager",
     "label": "Hearing Manager",
-    "description": "Hearing Manager for admin users",
-      "category": "CTSC",
+    "description": "Hearing Manager for ctsc users",
+    "category": "CTSC",
     "substantive": false,
     "type": "ORGANISATION",
     "patterns": [
@@ -1810,7 +1810,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["PUBLICLAW","PRIVATELAW","EMPLOYMENT"]
+            "values": ["PUBLICLAW","PRIVATELAW","EMPLOYMENT","IA"]
           }
         }
       }
@@ -1908,7 +1908,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["SSCS", "PRIVATELAW", "PUBLICLAW","CIVIL","EMPLOYMENT"]
+            "values": ["SSCS", "PRIVATELAW", "PUBLICLAW","CIVIL","EMPLOYMENT","IA"]
           }
         }
       }
@@ -1938,7 +1938,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT"]
+            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT","IA"]
           }
         }
       }
@@ -1968,7 +1968,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT"]
+            "values": ["SSCS","PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT","IA"]
           }
         }
       }
@@ -1977,7 +1977,7 @@
   {
     "name": "hearing-viewer",
     "label": "Hearing Viewer",
-    "description": "Hearing Viewer for admin users",
+    "description": "Hearing Viewer for ctsc users",
     "category": "CTSC",
     "substantive": false,
     "type": "ORGANISATION",
@@ -1998,7 +1998,7 @@
         "attributes": {
           "jurisdiction": {
             "mandatory": true,
-            "values": ["PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT"]
+            "values": ["PRIVATELAW","PUBLICLAW","CIVIL","EMPLOYMENT","IA"]
           }
         }
       }

diff --git a/...java/uk/gov/hmcts/reform/roleassignment/domain/service/drools/AllServicesOrgRoleTest.java b/...java/uk/gov/hmcts/reform/roleassignment/domain/service/drools/AllServicesOrgRoleTest.java
@@ -410,10 +410,17 @@ void shouldRejectOrgValidation_MissingAttributeJurisdiction() {
     @ParameterizedTest
     @CsvSource({
         "hearing-manager,LEGAL_OPERATIONS,STANDARD,north-east,SSCS,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-manager,LEGAL_OPERATIONS,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
         "hearing-manager,ADMIN,STANDARD,north-east,SSCS,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-manager,ADMIN,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-manager,CTSC,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
         "hearing-viewer,JUDICIAL,STANDARD,north-east,SSCS,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-viewer,JUDICIAL,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-viewer,LEGAL_OPERATIONS,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
         "hearing-viewer,LEGAL_OPERATIONS,STANDARD,north-east,SSCS,UK,ORGANISATION,N,Null,PUBLIC",
         "hearing-viewer,ADMIN,STANDARD,north-east,SSCS,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-viewer,ADMIN,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
+        "hearing-viewer,CTSC,STANDARD,north-east,IA,UK,ORGANISATION,N,Null,PUBLIC",
         "hearing-centre-admin,ADMIN,STANDARD,north-east,SSCS,UK,ORGANISATION,Y,Null,PUBLIC",
         "hearing-centre-team-leader,ADMIN,STANDARD,north-east,SSCS,UK,ORGANISATION,Y,Null,PUBLIC",
         "regional-centre-admin,ADMIN,STANDARD,north-east,SSCS,UK,ORGANISATION,Y,Null,PUBLIC",
@@ -538,7 +545,6 @@ void shouldApproveRequestedRoleForOrgHavingNoAttributes(String roleName, String
         "manager,LEGAL_OPERATIONS,STANDARD,north-east,SSCS,ORGANISATION",
         "hearing-manager,JUDICIAL,STANDARD,north-east,SSCS,ORGANISATION",
         "hearing-viewer,JUDICIAL,SPECIFIC,north-east,SSCS,ORGANISATION",
-        "hearing-viewer,LEGAL_OPERATIONS,STANDARD,north-east,IA,ORGANISATION",
         "listed-hearing-viewer,OTHER_GOV_DEPT,STANDARD,north-east,SSCS,CASE",
         "judge,JUDICIAL,BASIC,north-east,SSCS,ORGANISATION",
         "fee-paid-judge,JUDICIAL,STANDARD,north-east,CIVIL1,ORGANISATION",