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-4515-4518: Update Next Steps #102

Merged
merged 3 commits into from
Nov 24, 2023
Merged

RET-4515-4518: Update Next Steps #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
995d2e5
RET-4515: Revert Referral Next Steps
fergusoshea Nov 24, 2023
d54270e
RET-4518: CR Application Next Steps
fergusoshea Nov 24, 2023
2091820
RET-4518: CR Application Next Steps
fergusoshea Nov 24, 2023
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
71 changes: 11 additions & 60 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.14.0">
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.16.0">
<decision id="wa-task-configuration-employment-et_englandwales" name="ET Task configuration DMN">
<decisionTable id="DecisionTable_14cx079" hitPolicy="COLLECT">
<input id="InputClause_1gxyo7f" label="CCD Case Data" camunda:inputVariable="caseData">
Expand Down Expand Up @@ -349,40 +349,23 @@ else "1234"</text>
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_0abku11">
<description></description>
<inputEntry id="UnaryTests_0xt95i9">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_136m8g2">
<text>"ReviewReferralAdmin",
"ReviewReferralResponseAdmin"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0uxjjxf">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_02zdiu5">
<text>"[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/replyToReferral/replyToReferral1) or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0s7te75">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_0n0lyo2">
<inputEntry id="UnaryTests_1q1ukdj">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_07rgo5f">
<text>"ReviewReferralJudiciary",
<text>"ReviewReferralAdmin",
"ReviewReferralJudiciary",
"ReviewReferralLegalOps",
"ReviewReferralResponseAdmin",
"ReviewReferralResponseJudiciary",
"ReviewReferralResponseLegalOps"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0c6p65o">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1b7smpa">
<text>"[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/replyToReferral/replyToReferral1) or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) or [Accept/Reject Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/preAcceptanceCase/preAcceptanceCase1)"</text>
<text>"[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}#Referrals)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0nnd54t">
<text>true</text>
Expand Down Expand Up @@ -498,8 +481,7 @@ else "1234"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1upl2e0">
<text>"ReviewRule21Referral",
"ContactTribunalWithAnApplication"</text>
<text>"ReviewRule21Referral"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0uttcm7">
<text>"description"</text>
Expand Down Expand Up @@ -533,35 +515,21 @@ else "1234"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_084mxl9">
<text>"AmendClaimantDetails"</text>
<text>"ContactTribunalWithAnApplication",
"AmendClaimantDetails",
"AmendRespondentDetails",
"WithdrawAllOrPartOfCase"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0cakil9">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0trcq8d">
<text>"[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)"</text>
<text>"[Review Application](/cases/case-details/${[CASE_REFERENCE]}#Applications)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0celo90">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_136d3sz">
<inputEntry id="UnaryTests_1veneqq">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0mc2ryf">
<text>"AmendRespondentDetails"</text>
</inputEntry>
<outputEntry id="LiteralExpression_15hl68v">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_04s7gmq">
<text>"[Update Respondent Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendRespondentDetails/amendRespondentDetails1)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_13no40g">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_1hplv47">
<inputEntry id="UnaryTests_0cjyelf">
<text></text>
Expand All @@ -579,23 +547,6 @@ else "1234"</text>
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_1hx0oqp">
<inputEntry id="UnaryTests_1o7293h">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_102pi1k">
<text>"WithdrawAllOrPartOfCase"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0j05fcd">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0k9sgy7">
<text>"[Create Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) or [Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1hnp98x">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_12zdyry">
<inputEntry id="UnaryTests_00oc2a8">
<text></text>
Expand Down
71 changes: 11 additions & 60 deletions src/main/resources/wa-task-configuration-employment-et_scotland.dmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.14.0">
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.16.0">
<decision id="wa-task-configuration-employment-et_scotland" name="ET Task configuration DMN">
<decisionTable id="DecisionTable_14cx079" hitPolicy="COLLECT">
<input id="InputClause_1gxyo7f" label="CCD Case Data" camunda:inputVariable="caseData">
Expand Down Expand Up @@ -349,40 +349,23 @@ else "1234"</text>
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_0abku11">
<description></description>
<inputEntry id="UnaryTests_0xt95i9">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_136m8g2">
<text>"ReviewReferralAdmin",
"ReviewReferralResponseAdmin"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0uxjjxf">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_02zdiu5">
<text>"[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/replyToReferral/replyToReferral1) or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0s7te75">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_02k4psa">
<inputEntry id="UnaryTests_1v1y792">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1rwubnw">
<text>"ReviewReferralJudiciary",
<text>"ReviewReferralAdmin",
"ReviewReferralJudiciary",
"ReviewReferralLegalOps",
"ReviewReferralResponseAdmin",
"ReviewReferralResponseJudiciary",
"ReviewReferralResponseLegalOps"</text>
</inputEntry>
<outputEntry id="LiteralExpression_071sio5">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_14vawv2">
<text>"[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/replyToReferral/replyToReferral1) or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) or [Accept/Reject Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/preAcceptanceCase/preAcceptanceCase1)"</text>
<text>"[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}#Referrals)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1gw6v67">
<text>true</text>
Expand Down Expand Up @@ -498,8 +481,7 @@ else "1234"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0gstj6a">
<text>"ReviewRule21Referral",
"ContactTribunalWithAnApplication"</text>
<text>"ReviewRule21Referral"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0kitfsk">
<text>"description"</text>
Expand Down Expand Up @@ -533,35 +515,21 @@ else "1234"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_102pi1k">
<text>"AmendClaimantDetails"</text>
<text>"ContactTribunalWithAnApplication",
"AmendClaimantDetails",
"AmendRespondentDetails",
"WithdrawAllOrPartOfCase"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0j05fcd">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0k9sgy7">
<text>"[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)"</text>
<text>"[Review Application](/cases/case-details/${[CASE_REFERENCE]}#Applications)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1hnp98x">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_1uik1j4">
<inputEntry id="UnaryTests_0f4x4tl">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1lpzzn0">
<text>"AmendRespondentDetails"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0zhywdp">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1au44ex">
<text>"[Update Respondent Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendRespondentDetails/amendRespondentDetails1)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_00s5pc2">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_136d3sz">
<inputEntry id="UnaryTests_1veneqq">
<text></text>
Expand All @@ -579,23 +547,6 @@ else "1234"</text>
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_0kc6n4b">
<inputEntry id="UnaryTests_0820zvv">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0yw8dzs">
<text>"WithdrawAllOrPartOfCase"</text>
</inputEntry>
<outputEntry id="LiteralExpression_00gnug1">
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_16xi0q8">
<text>"[Create Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) or [Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0oya7dl">
<text>true</text>
</outputEntry>
</rule>
<rule id="DecisionRule_12zdyry">
<inputEntry id="UnaryTests_00oc2a8">
<text></text>
Expand Down
57 changes: 15 additions & 42 deletions src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,20 +400,9 @@ public static Stream<Arguments> description_ScenarioProvider() {
"value", "[ET1 Vetting](/cases/case-details/${[CASE_REFERENCE]}/trigger/et1Vetting/et1Vetting1)",
"canReconfigure", true
));
List<Map<String, Object>> descReplyCloseReferral = List.of(Map.of(
List<Map<String, Object>> descReferralTab = List.of(Map.of(
"name", "description",
"value", "[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}"
+ "/trigger/replyToReferral/replyToReferral1) "
+ "or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1)",
"canReconfigure", true
));
List<Map<String, Object>> descReplyCloseReferralAcceptCase = List.of(Map.of(
"name", "description",
"value", "[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}"
+ "/trigger/replyToReferral/replyToReferral1) "
+ "or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) "
+ "or [Accept/Reject Case](/cases/case-details/${[CASE_REFERENCE]}"
+ "/trigger/preAcceptanceCase/preAcceptanceCase1)",
"value", "[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}#Referrals)",
"canReconfigure", true
));
List<Map<String, Object>> descUploadDocForServing = List.of(Map.of(
Expand Down Expand Up @@ -465,30 +454,16 @@ public static Stream<Arguments> description_ScenarioProvider() {
+ "/trigger/addAmendJudgment/addAmendJudgment1)",
"canReconfigure", true
));
List<Map<String, Object>> descUpdateClaimantDetails = List.of(Map.of(
"name", "description",
"value", "[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}"
+ "/trigger/amendClaimantDetails/amendClaimantDetails1)",
"canReconfigure", true
));
List<Map<String, Object>> descUpdateRespondentDetails = List.of(Map.of(
List<Map<String, Object>> descApplicationsTab = List.of(Map.of(
"name", "description",
"value", "[Update Respondent Details](/cases/case-details/${[CASE_REFERENCE]}"
+ "/trigger/amendRespondentDetails/amendRespondentDetails1)",
"value", "[Review Application](/cases/case-details/${[CASE_REFERENCE]}#Applications)",
"canReconfigure", true
));
List<Map<String, Object>> descCloseCase = List.of(Map.of(
"name", "description",
"value", "[Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)",
"canReconfigure", true
));
List<Map<String, Object>> descCreateReferralCloseCase = List.of(Map.of(
"name", "description",
"value", "[Create Referral](/cases/case-details/${[CASE_REFERENCE]}"
+ "/trigger/closeReferral/closeReferral1) "
+ "or [Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)",
"canReconfigure", true
));
List<Map<String, Object>> reviewAccessRequest = List.of(Map.of(
"name", "description",
"value", "[Review Access Request](/role-access/${[taskId]}/assignment/${[roleAssignmentId]}/"
Expand All @@ -499,13 +474,12 @@ public static Stream<Arguments> description_ScenarioProvider() {
return Stream.of(
Arguments.of("Et1Vetting", descET1Vetting),

Arguments.of("ReviewReferralAdmin", descReplyCloseReferral),
Arguments.of("ReviewReferralResponseAdmin", descReplyCloseReferral),

Arguments.of("ReviewReferralJudiciary", descReplyCloseReferralAcceptCase),
Arguments.of("ReviewReferralLegalOps", descReplyCloseReferralAcceptCase),
Arguments.of("ReviewReferralResponseJudiciary", descReplyCloseReferralAcceptCase),
Arguments.of("ReviewReferralResponseLegalOps", descReplyCloseReferralAcceptCase),
Arguments.of("ReviewReferralAdmin", descReferralTab),
Arguments.of("ReviewReferralJudiciary", descReferralTab),
Arguments.of("ReviewReferralLegalOps", descReferralTab),
Arguments.of("ReviewReferralResponseAdmin", descReferralTab),
Arguments.of("ReviewReferralResponseJudiciary", descReferralTab),
Arguments.of("ReviewReferralResponseLegalOps", descReferralTab),

Arguments.of("ListServeClaim", descUploadDocForServing),

Expand All @@ -522,17 +496,16 @@ public static Stream<Arguments> description_ScenarioProvider() {
Arguments.of("ET3Processing", descET3Processing),

Arguments.of("ReviewRule21Referral", descCreateReferral),
Arguments.of("ContactTribunalWithAnApplication", descCreateReferral),

Arguments.of("DraftAndSignJudgment", descAddJudgment),

Arguments.of("AmendClaimantDetails", descUpdateClaimantDetails),
Arguments.of("AmendRespondentDetails", descUpdateRespondentDetails),
Arguments.of("ContactTribunalWithAnApplication", descApplicationsTab),
Arguments.of("AmendClaimantDetails", descApplicationsTab),
Arguments.of("AmendRespondentDetails", descApplicationsTab),
Arguments.of("WithdrawAllOrPartOfCase", descApplicationsTab),

Arguments.of("IssueJudgment", descCloseCase),

Arguments.of("WithdrawAllOrPartOfCase", descCreateReferralCloseCase),

Arguments.of("reviewSpecificAccessRequestJudiciary", reviewAccessRequest),
Arguments.of("reviewSpecificAccessRequestAdmin", reviewAccessRequest),
Arguments.of("reviewSpecificAccessRequestLegalOps", reviewAccessRequest),
Expand Down Expand Up @@ -864,7 +837,7 @@ 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(53));
assertThat(logic.getRules().size(), is(50));
}

private static Map<String, Object> mapData(String source) {
Expand Down
Loading