Merge pull request #109 from hmcts/prl-swansea-changes

Swansea Testing HOT Fixes
hmcts · Feb 21, 2024 · 5641b8b · 5641b8b
2 parents bb3358a + 3b4fef2
commit 5641b8b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 22 deletions.
diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn
@@ -108,6 +108,17 @@
           <text>"Auto"</text>
         </outputEntry>
       </rule>
+      <rule id="DecisionRule_0tirx14">
+        <inputEntry id="UnaryTests_1b60snt">
+          <text>"caseNumber"</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_190p0iw">
+          <text>"addCaseNumberResubmitted"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_00j054y">
+          <text>"Auto"</text>
+        </outputEntry>
+      </rule>
       <rule id="DecisionRule_1v9cegc">
         <inputEntry id="UnaryTests_1ckmgqx">
           <text>"returnApplication"</text>

diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn
@@ -773,7 +773,9 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000</text>
         <inputEntry id="UnaryTests_1glizm3">
           <text>"checkApplicationFL401", "checkApplicationResubmittedFL401",
 "sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401",
-"produceHearingBundleFL401", "serviceOfApplicationFL401","adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "reviewSpecificAccessRequestAdmin", "removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewAdminOrderByManager","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","reviewRaRequestsFL401","reviewInactiveRaRequestsFL401","recreateApplicationPack","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","confidentialCheckSOA","completefl416AndServe"</text>
+"produceHearingBundleFL401",  "produceHearingBundleC100", "serviceOfApplicationFL401","adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "serviceOfApplicationC100","adminServeOrderC100",
+"updateHearingActualsC100", "requestSolicitorOrderC100",
+"reviewCorrespondenceC100", "reviewSpecificAccessRequestAdmin", "removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewDocumentsForSolAndCafcassC100","reviewAdminOrderByManager","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","reviewRaRequestsFL401","reviewInactiveRaRequestsFL401","recreateApplicationPack","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","confidentialCheckSOA","completefl416AndServe"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1131kat">
           <text>"roleCategory"</text>
@@ -793,9 +795,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000</text>
           <text>"checkApplicationC100", "checkApplicationResubmittedC100",
 "addCaseNumber", "addCaseNumberResubmitted",
 "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100",
- "produceHearingBundleC100", "serviceOfApplicationC100","adminServeOrderC100",
-"updateHearingActualsC100", "requestSolicitorOrderC100",
-"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC","removeLegalRepresentativeC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100"</text>
+"reviewSpecificAccessRequestCTSC","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_18u6y8m">
           <text>"roleCategory"</text>

diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn
@@ -610,13 +610,13 @@
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_19obhmm">
-          <text>"ctsc"</text>
+          <text>"hearing-centre-admin"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_09ijhe4">
           <text>"Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1wy8ulv">
-          <text>"CTSC"</text>
+          <text>"ADMIN"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0kj034r">
           <text>"SKILL:ABA5:HEARINGMANAGEMENTC100"</text>
@@ -640,13 +640,13 @@
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1535ski">
-          <text>"ctsc"</text>
+          <text>"hearing-centre-admin"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1shehdx">
           <text>"Read,Own,CompleteOwn,UnclaimAssign,Claim,Unclaim,UnassignClaim"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_16qbdgi">
-          <text>"CTSC"</text>
+          <text>"ADMIN"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0qdcdmu">
           <text>
@@ -672,13 +672,13 @@
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1da4luj">
-          <text>"ctsc"</text>
+          <text>"hearing-centre-admin"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1htvolh">
           <text>"Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0ls2v9q">
-          <text>"CTSC"</text>
+          <text>"ADMIN"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0fsxebg">
           <text>"SKILL:ABA5:ORDERMANAGEMENTC100"</text>
@@ -702,13 +702,13 @@
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0g7141c">
-          <text>"ctsc"</text>
+          <text>"hearing-centre-admin"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0wy7hbb">
           <text>"Read,Own,CompleteOwn,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1t4uyg3">
-          <text>"CTSC"</text>
+          <text>"ADMIN"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1kx6utj">
           <text>"SKILL:ABA5:REVIEWCORRESPONDENCEC100"</text>

diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java
@@ -156,10 +156,14 @@ static Stream<Arguments> scenarioProvider() {
             ),
             Arguments.of(
                 "caseNumber",
-                singletonList(
+                asList(
                     Map.of(
                         "taskType", "addCaseNumber",
                         "completionMode", "Auto"
+                    ),
+                    Map.of(
+                        "taskType", "addCaseNumberResubmitted",
+                        "completionMode", "Auto"
                     )
                 )
             ),
@@ -366,7 +370,7 @@ void if_this_test_fails_needs_updating_with_your_changes() {
         DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic();
         assertThat(logic.getInputs().size(), is(1));
         assertThat(logic.getOutputs().size(), is(2));
-        assertThat(logic.getRules().size(), is(61));
+        assertThat(logic.getRules().size(), is(62));
     }
 
 

diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java
@@ -444,8 +444,8 @@ void evaluate_task_ctsc_hearingManagementc100(String taskType) {
                 "autoAssignable", false
             ), Map.of(
                 "autoAssignable", false,
-                "name", "ctsc",
-                "roleCategory", "CTSC",
+                "name", "hearing-centre-admin",
+                "roleCategory", "ADMIN",
                 "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn",
                 "authorisations", "SKILL:ABA5:HEARINGMANAGEMENTC100"
             )
@@ -470,8 +470,8 @@ void evaluate_task_ctsc_orderManagementc100(String taskType) {
                 "autoAssignable", false
             ), Map.of(
                 "autoAssignable", false,
-                "name", "ctsc",
-                "roleCategory", "CTSC",
+                "name", "hearing-centre-admin",
+                "roleCategory", "ADMIN",
                 "value", "Read,Own,CompleteOwn,UnclaimAssign,Claim,Unclaim,UnassignClaim",
                 "authorisations","SKILL:ABA5:ORDERMANAGEMENTC100"
             )
@@ -496,8 +496,8 @@ void evaluate_task_ctsc_orderManagementc100_2(String taskType) {
                 "autoAssignable", false
             ), Map.of(
                 "autoAssignable", false,
-                "name", "ctsc",
-                "roleCategory", "CTSC",
+                "name", "hearing-centre-admin",
+                "roleCategory", "ADMIN",
                 "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn",
                 "authorisations","SKILL:ABA5:ORDERMANAGEMENTC100"
             )
@@ -522,8 +522,8 @@ void evaluate_task_ctsc_reviewCorrespondencec100(String taskType) {
                 "autoAssignable", false
             ), Map.of(
                 "autoAssignable", false,
-                "name", "ctsc",
-                "roleCategory", "CTSC",
+                "name", "hearing-centre-admin",
+                "roleCategory", "ADMIN",
                 "value", "Read,Own,CompleteOwn,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn",
                 "authorisations", "SKILL:ABA5:REVIEWCORRESPONDENCEC100"
             )