diff --git a/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn b/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn index c6172af4..c84e935f 100644 --- a/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn +++ b/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn @@ -1,5 +1,5 @@ - + @@ -349,32 +349,15 @@ else "1234" true - - - - - - - "ReviewReferralAdmin", -"ReviewReferralResponseAdmin" - - - "description" - - - "[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/replyToReferral/replyToReferral1) or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1)" - - - true - - - "ReviewReferralJudiciary", + "ReviewReferralAdmin", +"ReviewReferralJudiciary", "ReviewReferralLegalOps", +"ReviewReferralResponseAdmin", "ReviewReferralResponseJudiciary", "ReviewReferralResponseLegalOps" @@ -382,7 +365,7 @@ else "1234" "description" - "[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)" + "[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}#Referrals)" true @@ -498,8 +481,7 @@ else "1234" - "ReviewRule21Referral", -"ContactTribunalWithAnApplication" + "ReviewRule21Referral" "description" @@ -533,35 +515,21 @@ else "1234" - "AmendClaimantDetails" + "ContactTribunalWithAnApplication", +"AmendClaimantDetails", +"AmendRespondentDetails", +"WithdrawAllOrPartOfCase" "description" - "[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)" + "[Review Application](/cases/case-details/${[CASE_REFERENCE]}#Applications)" true - - - - - - "AmendRespondentDetails" - - - "description" - - - "[Update Respondent Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendRespondentDetails/amendRespondentDetails1)" - - - true - - @@ -579,23 +547,6 @@ else "1234" true - - - - - - "WithdrawAllOrPartOfCase" - - - "description" - - - "[Create Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) or [Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)" - - - true - - diff --git a/src/main/resources/wa-task-configuration-employment-et_scotland.dmn b/src/main/resources/wa-task-configuration-employment-et_scotland.dmn index 9bd5335a..2fad9051 100644 --- a/src/main/resources/wa-task-configuration-employment-et_scotland.dmn +++ b/src/main/resources/wa-task-configuration-employment-et_scotland.dmn @@ -1,5 +1,5 @@ - + @@ -349,32 +349,15 @@ else "1234" true - - - - - - - "ReviewReferralAdmin", -"ReviewReferralResponseAdmin" - - - "description" - - - "[Reply to Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/replyToReferral/replyToReferral1) or [Close Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1)" - - - true - - - "ReviewReferralJudiciary", + "ReviewReferralAdmin", +"ReviewReferralJudiciary", "ReviewReferralLegalOps", +"ReviewReferralResponseAdmin", "ReviewReferralResponseJudiciary", "ReviewReferralResponseLegalOps" @@ -382,7 +365,7 @@ else "1234" "description" - "[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)" + "[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}#Referrals)" true @@ -498,8 +481,7 @@ else "1234" - "ReviewRule21Referral", -"ContactTribunalWithAnApplication" + "ReviewRule21Referral" "description" @@ -533,35 +515,21 @@ else "1234" - "AmendClaimantDetails" + "ContactTribunalWithAnApplication", +"AmendClaimantDetails", +"AmendRespondentDetails", +"WithdrawAllOrPartOfCase" "description" - "[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)" + "[Review Application](/cases/case-details/${[CASE_REFERENCE]}#Applications)" true - - - - - - "AmendRespondentDetails" - - - "description" - - - "[Update Respondent Details](/cases/case-details/${[CASE_REFERENCE]}/trigger/amendRespondentDetails/amendRespondentDetails1)" - - - true - - @@ -579,23 +547,6 @@ else "1234" true - - - - - - "WithdrawAllOrPartOfCase" - - - "description" - - - "[Create Referral](/cases/case-details/${[CASE_REFERENCE]}/trigger/closeReferral/closeReferral1) or [Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)" - - - true - - diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java index 7c9699c5..bc96a0eb 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java @@ -400,20 +400,9 @@ public static Stream description_ScenarioProvider() { "value", "[ET1 Vetting](/cases/case-details/${[CASE_REFERENCE]}/trigger/et1Vetting/et1Vetting1)", "canReconfigure", true )); - List> descReplyCloseReferral = List.of(Map.of( + List> 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> 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> descUploadDocForServing = List.of(Map.of( @@ -465,16 +454,9 @@ public static Stream description_ScenarioProvider() { + "/trigger/addAmendJudgment/addAmendJudgment1)", "canReconfigure", true )); - List> descUpdateClaimantDetails = List.of(Map.of( - "name", "description", - "value", "[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}" - + "/trigger/amendClaimantDetails/amendClaimantDetails1)", - "canReconfigure", true - )); - List> descUpdateRespondentDetails = List.of(Map.of( + List> 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> descCloseCase = List.of(Map.of( @@ -482,13 +464,6 @@ public static Stream description_ScenarioProvider() { "value", "[Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)", "canReconfigure", true )); - List> 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> reviewAccessRequest = List.of(Map.of( "name", "description", "value", "[Review Access Request](/role-access/${[taskId]}/assignment/${[roleAssignmentId]}/" @@ -499,13 +474,12 @@ public static Stream 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), @@ -522,17 +496,16 @@ public static Stream 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), @@ -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 mapData(String source) { diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java index 4808aaaf..a1c02863 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java @@ -397,20 +397,9 @@ public static Stream description_ScenarioProvider() { "value", "[ET1 Vetting](/cases/case-details/${[CASE_REFERENCE]}/trigger/et1Vetting/et1Vetting1)", "canReconfigure", true )); - List> descReplyCloseReferral = List.of(Map.of( + List> 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> 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> descUploadDocForServing = List.of(Map.of( @@ -462,16 +451,9 @@ public static Stream description_ScenarioProvider() { + "/trigger/addAmendJudgment/addAmendJudgment1)", "canReconfigure", true )); - List> descUpdateClaimantDetails = List.of(Map.of( - "name", "description", - "value", "[Update Claimant Details](/cases/case-details/${[CASE_REFERENCE]}" - + "/trigger/amendClaimantDetails/amendClaimantDetails1)", - "canReconfigure", true - )); - List> descUpdateRespondentDetails = List.of(Map.of( + List> 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> descCloseCase = List.of(Map.of( @@ -479,13 +461,6 @@ public static Stream description_ScenarioProvider() { "value", "[Close Case](/cases/case-details/${[CASE_REFERENCE]}/trigger/disposeCase/disposeCase1)", "canReconfigure", true )); - List> 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> reviewAccessRequest = List.of(Map.of( "name", "description", "value", "[Review Access Request](/role-access/${[taskId]}/assignment/${[roleAssignmentId]}/" @@ -496,13 +471,12 @@ public static Stream 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), @@ -519,17 +493,16 @@ public static Stream 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), @@ -861,7 +834,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 mapData(String source) {