Merge pull request #96 from hmcts/direction-on-issue-resubmit

Change the Gatekeeping Resubmitted task name to Directions on Issue R…
hmcts · Jan 13, 2024 · 9a7933a · 9a7933a
2 parents 969c458 + 82e9166
commit 9a7933a
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 28 deletions.
diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn
@@ -273,6 +273,28 @@
           <text>"Auto"</text>
         </outputEntry>
       </rule>
+      <rule id="DecisionRule_0rv95b2">
+        <inputEntry id="UnaryTests_1ih7ttg">
+          <text>"manageOrders"</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_1dd06pb">
+          <text>"directionOnIssueResubmitted"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0efragp">
+          <text>"Auto"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_1p3stm6">
+        <inputEntry id="UnaryTests_1oy0t8b">
+          <text>"returnApplication"</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_13oz1bj">
+          <text>"directionOnIssueResubmitted"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0stum1v">
+          <text>"Auto"</text>
+        </outputEntry>
+      </rule>
       <rule id="DecisionRule_19m181l">
         <inputEntry id="UnaryTests_1fa5tqp">
           <text>"manageOrders"</text>

diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn
@@ -310,7 +310,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_0tvsteh">
-          <text>"directionOnIssue","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided"</text>
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0ixfp2h">
           <text>"dueDateIntervalDays"</text>
@@ -378,7 +378,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1tb79v4">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided", "replyToMessageForJudiciary"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided", "replyToMessageForJudiciary"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0tucp7d">
           <text>"calculatedDates"</text>
@@ -395,7 +395,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_0iktol6">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1ijqt0h">
           <text>"nextHearingDatePreDateOriginRef"</text>
@@ -412,7 +412,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_0g9qqrs">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0uhqm5x">
           <text>"nextHearingDatePreDateIntervalDays"</text>
@@ -429,7 +429,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_0vgvmxc">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_06l1dup">
           <text>"nextHearingDatePreDateNonWorkingCalendar"</text>
@@ -446,7 +446,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_0yds9g8">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_18wcq2b">
           <text>"nextHearingDatePreDateNonWorkingDaysOfWeek"</text>
@@ -463,7 +463,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1i9hse8">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0gykh0v">
           <text>"nextHearingDatePreDateSkipNonWorkingDays"</text>
@@ -480,7 +480,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_19i7035">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0z0xy3x">
           <text>"nextHearingDatePreDateMustBeWorkingDay"</text>
@@ -497,7 +497,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_06p8hre">
-          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
+          <text>"reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_07bc3mo">
           <text>"priorityDateOriginEarliest"</text>
@@ -548,7 +548,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_05latny">
-          <text>"directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided","confidentialCheckSOA", "replyToMessageForJudiciary"</text>
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided","confidentialCheckSOA", "replyToMessageForJudiciary"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_121l57m">
           <text>"majorPriority"</text>
@@ -652,7 +652,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000</text>
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1gm06lg">
-          <text>"directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided"</text>
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0omxasv">
           <text>"workType"</text>
@@ -737,7 +737,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000</text>
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_10f3uas">
-          <text>"directionOnIssue","gateKeeping", "gateKeepingResubmitted", "reviewSpecificAccessRequestLegalOps","replyToMessageForLAC100","replyToMessageForLA"</text>
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping", "gateKeepingResubmitted", "reviewSpecificAccessRequestLegalOps","replyToMessageForLAC100","replyToMessageForLA"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_05l5bvs">
           <text>"roleCategory"</text>
@@ -999,7 +999,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000</text>
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1wgrovz">
-          <text>"directionOnIssue"</text>
+          <text>"directionOnIssue","directionOnIssueResubmitted"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1i5mia9">
           <text>"description"</text>
@@ -1022,7 +1022,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000</text>
           <text>"description"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1o6t7rz">
-          <text>"[Gatekeeping]"</text>
+          <text>"[Directions on Issues Resubmitted]"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0xk4f3f">
           <text></text>

diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:camunda="http://camunda.org/schema/1.0/dmn" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="wa-initiation-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.15.1">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:camunda="http://camunda.org/schema/1.0/dmn" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="wa-initiation-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.1.0">
   <decision id="wa-task-initiation-privatelaw-prlapps" name="Private Law Task initiation DMN">
     <decisionTable id="DecisionTable_0jtevuc" hitPolicy="COLLECT" biodi:annotationsWidth="400">
       <input id="Input_1" label="Event Id" biodi:width="216" camunda:inputVariable="eventId">
@@ -675,7 +675,7 @@
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0c8l5at">
-          <text>"gateKeeping"</text>
+          <text>"directionOnIssue"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_1efhgf7">
@@ -716,16 +716,16 @@
           <text></text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1eycm99">
-          <text>"gateKeepingResubmitted"</text>
+          <text>"directionOnIssueResubmitted"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1arrliz">
-          <text>"Gatekeeping Resubmitted"</text>
+          <text>"Directions on Issue Resubmitted"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1rfbno8">
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_08yrseb">
-          <text>"gateKeepingResubmitted"</text>
+          <text>"directionOnIssue"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_0awsb0p">

diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn
@@ -55,7 +55,7 @@
       <rule id="DecisionRule_0ivpl63">
         <description>Judicial task permissions</description>
         <inputEntry id="UnaryTests_155q736">
-          <text>"directionOnIssue","gateKeeping",
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping",
 "gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided", "replyToMessageForJudiciary"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0buofva">
@@ -86,7 +86,7 @@
       <rule id="DecisionRule_1ydh51r">
         <description>Judicial task permissions</description>
         <inputEntry id="UnaryTests_0ngofzz">
-          <text>"directionOnIssue","gateKeeping",
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping",
 "gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided", "replyToMessageForJudiciary"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0i05m2b">
@@ -147,7 +147,7 @@
       <rule id="DecisionRule_1x1oenn">
         <description>Tribunal caseworker task permissions</description>
         <inputEntry id="UnaryTests_183egaw">
-          <text>"directionOnIssue","gateKeeping",
+          <text>"directionOnIssue","directionOnIssueResubmitted","gateKeeping",
 "gateKeepingResubmitted","replyToMessageForLA"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_18tqbn3">

diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn
@@ -141,6 +141,18 @@
           <text>"Directions on Issue"</text>
         </outputEntry>
       </rule>
+      <rule id="DecisionRule_1002mwy">
+        <description>DOI</description>
+        <inputEntry id="UnaryTests_1f9fslf">
+          <text></text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_17lu7wa">
+          <text>"directionOnIssueResubmitted"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1wmhtm3">
+          <text>"Directions on Issue Resubmitted"</text>
+        </outputEntry>
+      </rule>
       <rule id="DecisionRule_09isqs0">
         <description>GK</description>
         <inputEntry id="UnaryTests_030i0zo">

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
@@ -88,6 +88,10 @@ static Stream<Arguments> scenarioProvider() {
                         "taskType", "directionOnIssue",
                         "completionMode", "Auto"
                     ),
+                    Map.of(
+                        "taskType", "directionOnIssueResubmitted",
+                        "completionMode", "Auto"
+                    ),
                     Map.of(
                         "taskType", "gateKeeping",
                         "completionMode", "Auto"
@@ -122,6 +126,10 @@ static Stream<Arguments> scenarioProvider() {
                         "taskType", "directionOnIssue",
                         "completionMode", "Auto"
                     ),
+                    Map.of(
+                        "taskType", "directionOnIssueResubmitted",
+                        "completionMode", "Auto"
+                    ),
                     Map.of(
                         "taskType", "gateKeeping",
                         "completionMode", "Auto"
@@ -296,7 +304,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(51));
+        assertThat(logic.getRules().size(), is(53));
     }
 
 

diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java
@@ -219,7 +219,7 @@ static Stream<Arguments> scenarioProvider() {
                     Map.of(
                         "taskId", "directionOnIssue",
                         "name", "Directions on Issue",
-                        "processCategories", "gateKeeping"
+                        "processCategories", "directionOnIssue"
                     )
                 )
             ),
@@ -233,9 +233,9 @@ static Stream<Arguments> scenarioProvider() {
                                       + "}"),
                 singletonList(
                     Map.of(
-                        "taskId", "gateKeepingResubmitted",
-                        "name", "Gatekeeping Resubmitted",
-                        "processCategories", "gateKeepingResubmitted"
+                        "taskId", "directionOnIssueResubmitted",
+                        "name", "Directions on Issue Resubmitted",
+                        "processCategories", "directionOnIssue"
                     )
                 )
             ),

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
@@ -203,6 +203,7 @@ void given_null_or_empty_inputs_when_evaluate_dmn_it_returns_expected_rules(Stri
     @ParameterizedTest
     @CsvSource(value = {
         "directionOnIssue",
+        "directionOnIssueResubmitted",
         "gateKeeping",
         "gateKeepingResubmitted"
     })

diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java
@@ -22,6 +22,6 @@ 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(37));
+        assertThat(logic.getRules().size(), is(38));
     }
 }