diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn
index c53142c4..6d085f53 100644
--- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn
+++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn
@@ -273,6 +273,28 @@
"Auto"
+
+
+ "manageOrders"
+
+
+ "directionOnIssueResubmitted"
+
+
+ "Auto"
+
+
+
+
+ "returnApplication"
+
+
+ "directionOnIssueResubmitted"
+
+
+ "Auto"
+
+
"manageOrders"
diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn
index 4bde1af5..d0a89df6 100644
--- 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
- "directionOnIssue","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided"
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided"
"dueDateIntervalDays"
@@ -378,7 +378,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided", "replyToMessageForJudiciary"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided", "replyToMessageForJudiciary"
"calculatedDates"
@@ -395,7 +395,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"nextHearingDatePreDateOriginRef"
@@ -412,7 +412,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"nextHearingDatePreDateIntervalDays"
@@ -429,7 +429,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"nextHearingDatePreDateNonWorkingCalendar"
@@ -446,7 +446,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"nextHearingDatePreDateNonWorkingDaysOfWeek"
@@ -463,7 +463,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"nextHearingDatePreDateSkipNonWorkingDays"
@@ -480,7 +480,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"nextHearingDatePreDateMustBeWorkingDay"
@@ -497,7 +497,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
+ "reviewCorrespondenceFL401","produceHearingBundleFL401","reviewCorrespondenceC100","produceHearingBundleC100","directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided"
"priorityDateOriginEarliest"
@@ -548,7 +548,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null
- "directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided","confidentialCheckSOA", "replyToMessageForJudiciary"
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided","confidentialCheckSOA", "replyToMessageForJudiciary"
"majorPriority"
@@ -652,7 +652,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000
- "directionOnIssue","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided"
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided"
"workType"
@@ -737,7 +737,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000
- "directionOnIssue","gateKeeping", "gateKeepingResubmitted", "reviewSpecificAccessRequestLegalOps","replyToMessageForLAC100","replyToMessageForLA"
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping", "gateKeepingResubmitted", "reviewSpecificAccessRequestLegalOps","replyToMessageForLAC100","replyToMessageForLA"
"roleCategory"
@@ -999,7 +999,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000
- "directionOnIssue"
+ "directionOnIssue","directionOnIssueResubmitted"
"description"
@@ -1022,7 +1022,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000
"description"
- "[Gatekeeping]"
+ "[Directions on Issues Resubmitted]"
diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn
index 58af8173..c31ba1ce 100644
--- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn
+++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn
@@ -1,5 +1,5 @@
-
+
@@ -675,7 +675,7 @@
- "gateKeeping"
+ "directionOnIssue"
@@ -716,16 +716,16 @@
- "gateKeepingResubmitted"
+ "directionOnIssueResubmitted"
- "Gatekeeping Resubmitted"
+ "Directions on Issue Resubmitted"
- "gateKeepingResubmitted"
+ "directionOnIssue"
diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn
index a9f0f09e..41b05379 100644
--- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn
+++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn
@@ -55,7 +55,7 @@
Judicial task permissions
- "directionOnIssue","gateKeeping",
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping",
"gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided", "replyToMessageForJudiciary"
@@ -86,7 +86,7 @@
Judicial task permissions
- "directionOnIssue","gateKeeping",
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping",
"gateKeepingResubmitted","reviewSolicitorOrderProvided","reviewAdminOrderProvided", "replyToMessageForJudiciary"
@@ -147,7 +147,7 @@
Tribunal caseworker task permissions
- "directionOnIssue","gateKeeping",
+ "directionOnIssue","directionOnIssueResubmitted","gateKeeping",
"gateKeepingResubmitted","replyToMessageForLA"
diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn
index fff6d3a7..1a4a265c 100644
--- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn
+++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn
@@ -141,6 +141,18 @@
"Directions on Issue"
+
+ DOI
+
+
+
+
+ "directionOnIssueResubmitted"
+
+
+ "Directions on Issue Resubmitted"
+
+
GK
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
index 1b7cf7e5..59591ea3 100644
--- 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 scenarioProvider() {
"taskType", "directionOnIssue",
"completionMode", "Auto"
),
+ Map.of(
+ "taskType", "directionOnIssueResubmitted",
+ "completionMode", "Auto"
+ ),
Map.of(
"taskType", "gateKeeping",
"completionMode", "Auto"
@@ -122,6 +126,10 @@ static Stream 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
index e54c4d91..5dc1c10a 100644
--- 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 scenarioProvider() {
Map.of(
"taskId", "directionOnIssue",
"name", "Directions on Issue",
- "processCategories", "gateKeeping"
+ "processCategories", "directionOnIssue"
)
)
),
@@ -233,9 +233,9 @@ static Stream 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
index 1a903194..baf282dc 100644
--- 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
index 41cbaa1e..e2e11042 100644
--- 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));
}
}