diff --git a/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn b/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn index ef469867..f9dd6d5c 100644 --- a/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn +++ b/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn @@ -37,7 +37,7 @@ - if(additionalData!=null and additionalData.Data!=null and additionalData.Data.genericTseApplicationCollection!=null and + if(additionalData!=null and additionalData.Data!=null and additionalData.Data.genericTseApplicationCollection!=null and count(additionalData.Data.genericTseApplicationCollection) > 0) then (reverse(additionalData.Data.genericTseApplicationCollection)[1]).value.type else null @@ -687,9 +687,7 @@ else null "SUBMIT_CLAIMANT_TSE", -"CLAIMANT_TSE_RESPOND", -"respondentTSE", -"tseRespond" +"CLAIMANT_TSE_RESPOND" "Accepted" @@ -704,7 +702,18 @@ else null - + "Withdraw all/part of claim", +"Postpone a hearing", +"Vary/revoke an order", +"Consider a decision afresh", +"Amend my claim", +"Order respondent to do something", +"Order a witness to attend", +"Tell tribunal respondent not complied", +"Restrict publicity", +"Strike out all/part of response", +"Reconsider judgement", +"Contact about something else" @@ -722,6 +731,52 @@ else null "Application" + + + "respondentTSE", +"tseRespond" + + + "Accepted" + + + + + + + + + + + + + + + "Amend response", +"Claimant not complied", +"Consider a decision afresh", +"Contact the tribunal", +"Order other party", +"Order a witness to attend to give evidence", +"Postpone a hearing", +"Reconsider judgement", +"Restrict publicity", +"Strike out all or part of a claim", +"Vary or revoke an order" + + + "ContactTribunalWithAnApplication" + + + "Contact Tribunal With An Application" + + + + + + "Application" + + "SUBMIT_CLAIMANT_TSE" diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTest.java index f47fbf07..cfba506e 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTest.java @@ -336,7 +336,11 @@ public static Stream scenarioProvider() { Arguments.of( "CLAIMANT_TSE_RESPOND", "Accepted", - null, + mapAdditionalData("{\n" + + " \"Data\":{\n" + + CLAIMANT_REASON_AMEND + + " }" + + "}"), List.of( mapExpectedOutput( "ContactTribunalWithAnApplication", @@ -369,7 +373,11 @@ public static Stream scenarioProvider() { Arguments.of( "tseRespond", "Accepted", - null, + mapAdditionalData("{\n" + + " \"Data\":{\n" + + RESPONDENT_REASON_AMEND + + " }" + + "}"), List.of( mapExpectedOutput( "ContactTribunalWithAnApplication", @@ -392,11 +400,6 @@ public static Stream scenarioProvider() { + " }" + "}"), List.of( - mapExpectedOutput( - "ContactTribunalWithAnApplication", - "Contact Tribunal With An Application", - "Application" - ), mapExpectedOutput( "AmendPartyDetails", "Amend Party Details", @@ -409,11 +412,6 @@ public static Stream scenarioProvider() { "Accepted", null, List.of( - mapExpectedOutput( - "ContactTribunalWithAnApplication", - "Contact Tribunal With An Application", - "Application" - ), mapExpectedOutput( "AmendPartyDetails", "Amend Party Details", @@ -425,16 +423,11 @@ public static Stream scenarioProvider() { "respondentTSE", "Accepted", mapAdditionalData("{\n" - + " \"Data\":{\n" - + RESPONDENT_REASON_PERSONALDETAILS - + " }" - + "}"), + + " \"Data\":{\n" + + RESPONDENT_REASON_PERSONALDETAILS + + " }" + + "}"), List.of( - mapExpectedOutput( - "ContactTribunalWithAnApplication", - "Contact Tribunal With An Application", - "Application" - ), mapExpectedOutput( "AmendPartyDetails", "Amend Party Details", @@ -447,11 +440,6 @@ public static Stream scenarioProvider() { "Accepted", null, List.of( - mapExpectedOutput( - "ContactTribunalWithAnApplication", - "Contact Tribunal With An Application", - "Application" - ), mapExpectedOutput( "AmendPartyDetails", "Amend Party Details", @@ -482,7 +470,7 @@ void given_input_should_return_outcome_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(23)); + assertThat(logic.getRules().size(), is(24)); } private static Map mapExpectedOutput(String taskId, String name, String processCategories) {