Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RET-2432-CompleteInitialConsideration #37

Merged
merged 1 commit into from
Jun 6, 2023
Merged

RET-2432-CompleteInitialConsideration #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/resources/wa-task-completion-employment-et_englandwales.dmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,17 @@
<text>"Auto"</text>
</outputEntry>
</rule>
<rule id="DecisionRule_17wj6dr">
<inputEntry id="UnaryTests_1d95t1o">
<text>"et3Vetting"</text>
</inputEntry>
<outputEntry id="LiteralExpression_16ob96j">
<text>"CompleteInitialConsideration"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0at1lsz">
<text>"Auto"</text>
</outputEntry>
</rule>
</decisionTable>
</decision>
<dmndi:DMNDI>
Expand Down
6 changes: 4 additions & 2 deletions src/main/resources/wa-task-configuration-employment-et_englandwales.dmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,8 @@ else caseData.claimantIndType.claimant_first_names + " " + caseData.claimantIndT
"SendEt1Notification",
"ListServeClaim",
"ReviewRule21Referral",
"IssueJudgment"</text>
"IssueJudgment",
"CompleteInitialConsideration"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0ep1vyf">
<text>"majorPriority"</text>
Expand Down Expand Up @@ -687,7 +688,8 @@ else caseData.claimantIndType.claimant_first_names + " " + caseData.claimantIndT
"SendEt1Notification",
"ListServeClaim",
"ReviewRule21Referral",
"IssueJudgment"</text>
"IssueJudgment",
"CompleteInitialConsideration"</text>
</inputEntry>
<outputEntry id="LiteralExpression_1liv7yr">
<text>"minorPriority"</text>
Expand Down
92 changes: 91 additions & 1 deletion src/main/resources/wa-task-initiation-employment-et_englandwales.dmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@
else null</text>
</inputExpression>
</input>
<output id="Output_1" label="Task Id" name="taskId" typeRef="string" />
<input id="InputClause_0gqbing" label="ET3 Rule26" camunda:inputVariable="et3Rule26">
<inputExpression id="LiteralExpression_1iv0wje" typeRef="string">
<text> if(additionalData != null and additionalData.Data != null and additionalData.Data.et3Rule26 != null)
then additionalData.Data.et3Rule26
else null</text>
</inputExpression>
</input>
<output id="Output_1" label="Task Id" name="taskId" typeRef="string" biodi:width="217" />
<output id="OutputClause_0p5fhhd" label="Name" name="name" typeRef="string" biodi:width="247" />
<output id="OutputClause_165p3r3" label="Delay Duration" name="delayDuration" typeRef="integer" />
<output id="OutputClause_0i6c6c2" label="Working Days Allowed" name="workingDaysAllowed" typeRef="integer" biodi:width="374" />
Expand All @@ -46,6 +53,9 @@
<inputEntry id="UnaryTests_0ihcbgh">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1hs9sif">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0tbxmk0">
<text>"draftCaseCreated"</text>
</outputEntry>
Expand Down Expand Up @@ -75,6 +85,9 @@
<inputEntry id="UnaryTests_1ns71cw">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_05hhzvk">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1inzx22">
<text>"Et1Vetting"</text>
</outputEntry>
Expand Down Expand Up @@ -104,6 +117,9 @@
<inputEntry id="UnaryTests_1frkc1e">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1i6d0qb">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1p21nx8">
<text>"ReviewReferralAdmin"</text>
</outputEntry>
Expand Down Expand Up @@ -138,6 +154,9 @@ else 2</text>
<inputEntry id="UnaryTests_01db6ha">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0gi5cux">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_02gq0cv">
<text>"ReviewReferralJudiciary"</text>
</outputEntry>
Expand Down Expand Up @@ -172,6 +191,9 @@ else 2</text>
<inputEntry id="UnaryTests_18oj3hc">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0rwn59q">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0xmtp1n">
<text>"ReviewReferralLegalOps"</text>
</outputEntry>
Expand Down Expand Up @@ -206,6 +228,9 @@ else 2</text>
<inputEntry id="UnaryTests_0e7g68a">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_16x4b6z">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0z6s9xl">
<text>"ET3Processing"</text>
</outputEntry>
Expand Down Expand Up @@ -235,6 +260,9 @@ else 2</text>
<inputEntry id="UnaryTests_1jx29oc">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1myv8bd">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_06w4eix">
<text>"IssueInitialConsiderationDirections"</text>
</outputEntry>
Expand Down Expand Up @@ -264,6 +292,9 @@ else 2</text>
<inputEntry id="UnaryTests_14nteit">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_05c6m5l">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1gzs9ju">
<text>"ListServeClaim"</text>
</outputEntry>
Expand Down Expand Up @@ -293,6 +324,9 @@ else 2</text>
<inputEntry id="UnaryTests_0rq7isq">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1d1vj84">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0ubx349">
<text>"SendEt1Notification"</text>
</outputEntry>
Expand Down Expand Up @@ -322,6 +356,9 @@ else 2</text>
<inputEntry id="UnaryTests_0z0rg6v">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0gvpl5x">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_15ccyjs">
<text>"ReviewReferralResponseAdmin"</text>
</outputEntry>
Expand Down Expand Up @@ -356,6 +393,9 @@ else 2</text>
<inputEntry id="UnaryTests_1lsqrua">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_09ywq3i">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1ir1grh">
<text>"DraftAndSignJudgment"</text>
</outputEntry>
Expand Down Expand Up @@ -385,6 +425,9 @@ else 2</text>
<inputEntry id="UnaryTests_008f6zs">
<text>"Rule 21 Referral"</text>
</inputEntry>
<inputEntry id="UnaryTests_1hdfase">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0zsboti">
<text>"DraftAndSignJudgment"</text>
</outputEntry>
Expand Down Expand Up @@ -414,6 +457,9 @@ else 2</text>
<inputEntry id="UnaryTests_1rppy5k">
<text>"Hearing"</text>
</inputEntry>
<inputEntry id="UnaryTests_0f379iz">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_19aayz9">
<text>"IssuePostHearingDirection"</text>
</outputEntry>
Expand Down Expand Up @@ -443,6 +489,9 @@ else 2</text>
<inputEntry id="UnaryTests_0rjl985">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_197f9ze">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0viokea">
<text>"ReviewReferralResponseJudiciary"</text>
</outputEntry>
Expand Down Expand Up @@ -477,6 +526,9 @@ else 2</text>
<inputEntry id="UnaryTests_1047la4">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1rwzte1">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0asscuc">
<text>"ReviewReferralResponseLegalOps"</text>
</outputEntry>
Expand Down Expand Up @@ -511,6 +563,9 @@ else 2</text>
<inputEntry id="UnaryTests_0h75cox">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_00tl7fh">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0ytrqr1">
<text>"ReviewRule21Referral"</text>
</outputEntry>
Expand Down Expand Up @@ -540,6 +595,9 @@ else 2</text>
<inputEntry id="UnaryTests_140oicd">
<text>"Judgment"</text>
</inputEntry>
<inputEntry id="UnaryTests_1v9as5r">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1n64ej0">
<text>"IssueJudgment"</text>
</outputEntry>
Expand All @@ -557,6 +615,38 @@ else 2</text>
<text>"Hearing"</text>
</outputEntry>
</rule>
<rule id="DecisionRule_0edeiu4">
<inputEntry id="UnaryTests_0kmldps">
<text>"et3Vetting"</text>
</inputEntry>
<inputEntry id="UnaryTests_0jv4d1m">
<text>"Accepted"</text>
</inputEntry>
<inputEntry id="UnaryTests_1wlwrd5">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_02k7jv2">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0jperqz">
<text>"Yes"</text>
</inputEntry>
<outputEntry id="LiteralExpression_1fuv81y">
<text>"CompleteInitialConsideration"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1mp8csq">
<text>"Complete Initial Consideration"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1iv0oe0">
<text></text>
</outputEntry>
<outputEntry id="LiteralExpression_09w9ffg">
<text>2</text>
</outputEntry>
<outputEntry id="LiteralExpression_04ac9ba">
<text>"processing"</text>
</outputEntry>
</rule>
</decisionTable>
</decision>
<dmndi:DMNDI>
Expand Down
11 changes: 10 additions & 1 deletion src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskCompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,15 @@ static Stream<Arguments> scenarioProvider() {
"completionMode", "Auto"
)
)
),
Arguments.of(
"et3Vetting",
asList(
Map.of(
"taskType", "CompleteInitialConsideration",
"completionMode", "Auto"
)
)
)
);
}
Expand All @@ -192,6 +201,6 @@ void given_event_ids_should_evaluate_dmn(String eventId, List<Map<String, String
void if_this_test_fails_needs_updating_with_your_changes() {
//The purpose of this test is to prevent adding new rows without being tested
DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic();
assertThat(logic.getRules().size(), is(15));
assertThat(logic.getRules().size(), is(16));
}
}
3 changes: 2 additions & 1 deletion src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,8 @@ public static Stream<Arguments> priority_ScenarioProvider() {
Arguments.of("ReviewReferralJudiciary", "Yes", urgentMajorPriority, urgentMinorPriority),
Arguments.of("ReviewReferralLegalOps", "Yes", urgentMajorPriority, urgentMinorPriority),
Arguments.of("ReviewReferralResponseLegalOps", "Yes", urgentMajorPriority, urgentMinorPriority),
Arguments.of("IssueJudgment", "No", defaultMajorPriority, defaultMinorPriority)
Arguments.of("IssueJudgment", "No", defaultMajorPriority, defaultMinorPriority),
Arguments.of("CompleteInitialConsideration", "No", defaultMajorPriority, defaultMinorPriority)
);
}

Expand Down
17 changes: 16 additions & 1 deletion src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,21 @@ public static Stream<Arguments> scenarioProvider() {
"workingDaysAllowed", 5,
"processCategories", "Hearing"
)
),
Arguments.of(
"et3Vetting",
"Accepted",
mapAdditionalData("{\n"
+ " \"Data\":{\n"
+ " \"et3Rule26\":\"" + "Yes" + "\"\n"
+ " }"
+ "}"),
Map.of(
"taskId", "CompleteInitialConsideration",
"name", "Complete Initial Consideration",
"workingDaysAllowed", 2,
"processCategories", "processing"
)
)
);
}
Expand Down Expand Up @@ -361,7 +376,7 @@ void given_multiple_event_ids_et3response_should_evaluate_dmn(String eventId,
void if_this_test_fails_needs_updating_with_your_changes() {
//The purpose of this test is to prevent adding new rows without being tested
DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic();
assertThat(logic.getRules().size(), is(17));
assertThat(logic.getRules().size(), is(18));
}

private static Map<String, Object> mapAdditionalData(String additionalData) {
Expand Down