Merge pull request #1595 from hmcts/COT-550_update_sscs_work_types

COT-550 rename work type to pre_hearing post_hearing
hmcts · Oct 12, 2023 · be72b0e · be72b0e
2 parents 9b43183 + a7dff1d
commit be72b0e
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 39 deletions.
diff --git a/src/functionalTest/resources/features/F-004/S-031.td.json b/src/functionalTest/resources/features/F-004/S-031.td.json
@@ -65,7 +65,7 @@
             "primaryLocation" : "[[ANYTHING_PRESENT]]",
             "jurisdiction" : "SSCS",
             "region" : "[[ANYTHING_PRESENT]]",
-            "workTypes" : "pre_hearing_work,hearing_work,post_hearing_work,decision_making_work,routine_work,priority"
+            "workTypes" : "pre_hearing,hearing_work,post_hearing,decision_making_work,routine_work,priority"
           },
           "authorisations" : "[[ANYTHING_PRESENT]]"
         }

diff --git a/src/functionalTest/resources/features/F-004/S-032.td.json b/src/functionalTest/resources/features/F-004/S-032.td.json
@@ -43,7 +43,7 @@
           "primaryLocation" : "[[ANYTHING_PRESENT]]",
           "jurisdiction" : "SSCS",
           "region" : "[[ANYTHING_PRESENT]]",
-          "workTypes" : "pre_hearing_work,hearing_work,post_hearing_work,decision_making_work,routine_work,priority"
+          "workTypes" : "pre_hearing,hearing_work,post_hearing,decision_making_work,routine_work,priority"
         },
         "authorisations" : "[[ANYTHING_PRESENT]]"
       },
@@ -66,7 +66,7 @@
           "primaryLocation" : "[[ANYTHING_PRESENT]]",
           "jurisdiction" : "SSCS",
           "region" : "[[ANYTHING_PRESENT]]",
-          "workTypes" : "pre_hearing_work,hearing_work,post_hearing_work,decision_making_work,routine_work,priority"
+          "workTypes" : "pre_hearing,hearing_work,post_hearing,decision_making_work,routine_work,priority"
         },
         "authorisations" : "[[ANYTHING_PRESENT]]"
       },

diff --git a/src/functionalTest/resources/features/F-005/S-041.td.json b/src/functionalTest/resources/features/F-005/S-041.td.json
@@ -36,7 +36,7 @@
             "primaryLocation": "21153",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "applications,hearing_work,routine_work,priority"
+            "workTypes": "applications,hearing_work,routine_work,priority,pre_hearing"
           }
         },
         {

diff --git a/src/functionalTest/resources/features/F-005/S-042.td.json b/src/functionalTest/resources/features/F-005/S-042.td.json
@@ -36,7 +36,7 @@
             "primaryLocation": "21153",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority"
+            "workTypes": "pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority"
           }
         },
         {

diff --git a/src/functionalTest/resources/features/F-005/S-043.td.json b/src/functionalTest/resources/features/F-005/S-043.td.json
@@ -172,7 +172,7 @@
             "primaryLocation": "271588",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority"
+            "workTypes": "pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority"
           }
         },
         {
@@ -209,7 +209,7 @@
             "primaryLocation": "271588",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work"
+            "workTypes": "pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work"
           }
         },
         {

diff --git a/src/functionalTest/resources/features/F-005/S-044.td.json b/src/functionalTest/resources/features/F-005/S-044.td.json
@@ -119,7 +119,7 @@
           "primaryLocation" : "[[ANYTHING_PRESENT]]",
           "jurisdiction" : "SSCS",
           "region" : "[[ANYTHING_PRESENT]]",
-          "workTypes" : "pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work"
+          "workTypes" : "pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work"
         }
       }, {
         "id" : "[[ANYTHING_PRESENT]]",
@@ -137,7 +137,7 @@
           "primaryLocation" : "[[ANYTHING_PRESENT]]",
           "jurisdiction" : "SSCS",
           "region" :"[[ANYTHING_PRESENT]]",
-          "workTypes" : "pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work"
+          "workTypes" : "pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work"
         }
       } ]
     }

diff --git a/src/functionalTest/resources/features/F-006/S-051.td.json b/src/functionalTest/resources/features/F-006/S-051.td.json
@@ -33,7 +33,7 @@
             "primaryLocation": "[[ANYTHING_PRESENT]]",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work",
+            "workTypes": "pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work",
             "substantive" : "Y"
           }
         },
@@ -52,7 +52,7 @@
             "primaryLocation": "[[ANYTHING_PRESENT]]",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work",
+            "workTypes": "pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work",
             "substantive" : "Y"
           }
         }

diff --git a/src/functionalTest/resources/features/F-006/S-052.td.json b/src/functionalTest/resources/features/F-006/S-052.td.json
@@ -33,7 +33,7 @@
             "primaryLocation": "[[ANYTHING_PRESENT]]",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority",
+            "workTypes": "pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority",
             "substantive" : "Y"
           }
         }

diff --git a/src/functionalTest/resources/features/F-006/S-053.td.json b/src/functionalTest/resources/features/F-006/S-053.td.json
@@ -33,7 +33,7 @@
             "primaryLocation": "[[ANYTHING_PRESENT]]",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "applications,hearing_work,routine_work,priority",
+            "workTypes": "applications,hearing_work,routine_work,priority,pre_hearing",
             "substantive" : "Y"
           }
         },
@@ -52,7 +52,7 @@
             "primaryLocation": "[[ANYTHING_PRESENT]]",
             "jurisdiction": "SSCS",
             "region" : "2",
-            "workTypes": "applications,hearing_work,routine_work,priority",
+            "workTypes": "applications,hearing_work,routine_work,priority,pre_hearing",
             "substantive" : "Y"
           }
         }

diff --git a/src/main/resources/validationrules/sscs/sscs-admin-mapping.drl b/src/main/resources/validationrules/sscs/sscs-admin-mapping.drl
@@ -82,7 +82,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(
@@ -112,7 +112,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(
@@ -230,7 +230,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(
@@ -289,7 +289,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("applications,hearing_work,routine_work,priority"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("applications,hearing_work,routine_work,priority,pre_hearing"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(
@@ -319,7 +319,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("applications,hearing_work,routine_work,priority"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("applications,hearing_work,routine_work,priority,pre_hearing"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(

diff --git a/src/main/resources/validationrules/sscs/sscs-caseworker-mapping.drl b/src/main/resources/validationrules/sscs/sscs-caseworker-mapping.drl
@@ -57,7 +57,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(
@@ -89,7 +89,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,post_hearing_work,applications,hearing_work,routine_work,priority,decision_making_work"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,post_hearing,applications,hearing_work,routine_work,priority,decision_making_work"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($cap.getRegionId()));
 
   insert(

diff --git a/src/main/resources/validationrules/sscs/sscs-ctsc-mapping.drl b/src/main/resources/validationrules/sscs/sscs-ctsc-mapping.drl
@@ -52,7 +52,7 @@ then
    Map<String,JsonNode> attribute = new HashMap<>();
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($cap.getPrimaryLocationId()));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,post_hearing_work,decision_making_work,applications,hearing_work,routine_work,priority"));
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,post_hearing,decision_making_work,applications,hearing_work,routine_work,priority"));
 
   insert(
       RoleAssignment.builder()

diff --git a/src/main/resources/validationrules/sscs/sscs-judicial-org-role-mapping.drl b/src/main/resources/validationrules/sscs/sscs-judicial-org-role-mapping.drl
@@ -65,7 +65,7 @@ then
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($joh.getPrimaryLocation()));
    attribute.put("contractType", JacksonUtils.convertObjectIntoJsonNode("Salaried"));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,hearing_work,post_hearing_work,"
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,hearing_work,post_hearing,"
                                                                      + "decision_making_work,routine_work,priority"));
    if (!$joh.getOffice().equalsIgnoreCase("SSCS President of Tribunal-Salaried")) {
     attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($joh.getRegionId()));
@@ -105,7 +105,7 @@ then
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($bk.getLocationId() != null ?
          $bk.getLocationId():$joh.getPrimaryLocation()));
    attribute.put("contractType", JacksonUtils.convertObjectIntoJsonNode("Fee-Paid"));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,hearing_work,post_hearing_work,"
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,hearing_work,post_hearing,"
                                                                      + "decision_making_work,routine_work,priority"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($joh.getRegionId()));
   insert(
@@ -278,7 +278,7 @@ then
    attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode("SSCS"));
    attribute.put("primaryLocation", JacksonUtils.convertObjectIntoJsonNode($joh.getPrimaryLocation()));
    attribute.put("contractType", JacksonUtils.convertObjectIntoJsonNode("Fee-Paid"));
-   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing_work,hearing_work,post_hearing_work,"
+   attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,hearing_work,post_hearing,"
                                                                         + "decision_making_work,routine_work,priority"));
    attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($joh.getRegionId()));
    if ($joh.getTicketCodes() != null && $joh.getTicketCodes().contains("368")) {

diff --git a/...a/uk/gov/hmcts/reform/orgrolemapping/domain/service/DroolSscsJudicialRoleMappingTest.java b/...a/uk/gov/hmcts/reform/orgrolemapping/domain/service/DroolSscsJudicialRoleMappingTest.java
@@ -35,13 +35,13 @@ class DroolSscsJudicialRoleMappingTest extends DroolBase {
 
     {
         expectedRoleNameWorkTypesMap.put("leadership-judge", null);
-        expectedRoleNameWorkTypesMap.put("judge", "pre_hearing_work,hearing_work,post_hearing_work,"
+        expectedRoleNameWorkTypesMap.put("judge", "pre_hearing,hearing_work,post_hearing,"
                 + "decision_making_work,routine_work,priority");
         expectedRoleNameWorkTypesMap.put("case-allocator", null);
         expectedRoleNameWorkTypesMap.put("task-supervisor", null);
         expectedRoleNameWorkTypesMap.put("hmcts-judiciary", null);
         expectedRoleNameWorkTypesMap.put("specific-access-approver-judiciary", "access_requests");
-        expectedRoleNameWorkTypesMap.put("fee-paid-judge", "pre_hearing_work,hearing_work,post_hearing_work,"
+        expectedRoleNameWorkTypesMap.put("fee-paid-judge", "pre_hearing,hearing_work,post_hearing,"
                 + "decision_making_work,routine_work,priority");
         expectedRoleNameWorkTypesMap.put("fee-paid-tribunal-member", "hearing_work,priority");
         expectedRoleNameWorkTypesMap.put("medical", "hearing_work,priority");