From 74a565fd1a830b3c60bc42faf9cfbeb6104987aa Mon Sep 17 00:00:00 2001 From: Aliveni Choppa Date: Tue, 24 Feb 2026 18:41:57 +0000 Subject: [PATCH 1/4] DIAC-1862 Remove Send CMR notification WA tsk --- .../wa-task-initiation-ia-asylum.dmn | 224 +----------------- .../resources/wa-task-types-ia-asylum.dmn | 24 +- .../dmn/CamundaTaskInitiationTest.java | 72 +----- .../dmn/CamundaTaskTypesTest.java | 14 +- 4 files changed, 5 insertions(+), 329 deletions(-) diff --git a/src/main/resources/wa-task-initiation-ia-asylum.dmn b/src/main/resources/wa-task-initiation-ia-asylum.dmn index a49770a0..0ab73a79 100644 --- a/src/main/resources/wa-task-initiation-ia-asylum.dmn +++ b/src/main/resources/wa-task-initiation-ia-asylum.dmn @@ -11755,227 +11755,7 @@ "caseProgression" - - - "cmrListing" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - "cmrListed" - - - "Send CMR notification" - - - - - - "caseProgression" - - - - - "cmrListing" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - "detainedCmrListed" - - - "Detained - Send CMR notification" - - - - - - "caseProgression" - - - + "cmrReListing" @@ -22580,4 +22360,4 @@ - + \ No newline at end of file diff --git a/src/main/resources/wa-task-types-ia-asylum.dmn b/src/main/resources/wa-task-types-ia-asylum.dmn index dbde84ab..6ee68bdb 100644 --- a/src/main/resources/wa-task-types-ia-asylum.dmn +++ b/src/main/resources/wa-task-types-ia-asylum.dmn @@ -988,28 +988,6 @@ "Detained - Review Respondent Response" - - - - - - "cmrListed" - - - "Send CMR notification" - - - - - - - - "detainedCmrListed" - - - "Detained - Send CMR notification" - - @@ -1575,4 +1553,4 @@ - + \ No newline at end of file diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java index d77eb869..a35af04e 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java @@ -3047,24 +3047,6 @@ static Stream scenarioProvider() { "name", "Detained - Update CMR notification", - "processCategories", "caseProgression" - ) - ) - ), - Arguments.of( - "cmrListing", - null, - mapAdditionalData("{\n" - + " \"Data\":{\n" - + " \"appellantInDetention\":\"" + "true" + "\",\n" - + " \"isNotificationTurnedOff\":\"" + "false" + "\"\n" - + " }" - + "}"), - singletonList( - Map.of( - "taskId", "detainedCmrListed", - "name", "Detained - Send CMR notification", - "processCategories", "caseProgression" ) ) @@ -3148,58 +3130,6 @@ static Stream scenarioProvider() { ) ) ), - Arguments.of( - "cmrListing", - null, - mapAdditionalData("{\n" - + " \"Data\":{\n" - + " \"isNotificationTurnedOff\":\"" + "false" + "\"\n" - + " }" - + "}"), - singletonList( - Map.of( - "taskId", "cmrListed", - "name", "Send CMR notification", - - "processCategories", "caseProgression" - ) - ) - ), - Arguments.of( - "cmrListing", - null, - mapAdditionalData("{\n" - + " \"Data\":{\n" - + " \"appellantInDetention\":\"" + "true" + "\",\n" - + " \"isNotificationTurnedOff\":\"" + "false" + "\"\n" - + " }" - + "}"), - singletonList( - Map.of( - "taskId", "detainedCmrListed", - "name", "Detained - Send CMR notification", - - "processCategories", "caseProgression" - ) - ) - ), - Arguments.of( - "cmrListing", - null, - mapAdditionalData("{\n" - + " \"Data\":{\n" - + " \"isNotificationTurnedOff\":\"" + "false" + "\"\n" - + " }" - + "}"), - singletonList( - Map.of( - "taskId", "cmrListed", - "name", "Send CMR notification", - - "processCategories", "caseProgression" - ) - ) - ), Arguments.of( "decisionAndReasonsStarted", "decision", @@ -4870,7 +4800,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(32)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(201)); + assertThat(logic.getRules().size(), is(199)); } public static Stream addendumScenarioProvider() { diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java index 81ee2ba9..f0ed3575 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java @@ -529,18 +529,6 @@ static Stream scenarioProvider() { "taskTypeName", "Detained - Hearing exception" ), - Map.of( - "taskTypeId", - "cmrListed", - "taskTypeName", - "Send CMR notification" - ), - Map.of( - "taskTypeId", - "detainedCmrListed", - "taskTypeName", - "Detained - Send CMR notification" - ), Map.of( "taskTypeId", "cmrUpdated", @@ -904,7 +892,7 @@ void check_dmn_changed() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(1)); assertThat(logic.getOutputs().size(), is(2)); - assertThat(logic.getRules().size(), is(141)); + assertThat(logic.getRules().size(), is(139)); } } From 1091be4390c1d953bcb0a6bbd14187cca5be7a7d Mon Sep 17 00:00:00 2001 From: Aliveni Choppa Date: Thu, 26 Feb 2026 11:09:26 +0000 Subject: [PATCH 2/4] Remove cmr listed and detained smr listed events from task configuration and permissions --- .../wa-task-configuration-ia-asylum.dmn | 14 +++++------- .../wa-task-permissions-ia-asylum.dmn | 7 ++---- .../dmn/CamundaTaskConfigurationTest.java | 10 ++------- .../dmn/CamundaTaskPermissionTest.java | 22 ------------------- 4 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/main/resources/wa-task-configuration-ia-asylum.dmn b/src/main/resources/wa-task-configuration-ia-asylum.dmn index a18f54f5..0a5ad718 100644 --- a/src/main/resources/wa-task-configuration-ia-asylum.dmn +++ b/src/main/resources/wa-task-configuration-ia-asylum.dmn @@ -283,7 +283,7 @@ - "generateDraftDecisionAndReasons","uploadDecision","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","followUpOverdueHearingRequirements","detainedFollowUpOverdueHearingRequirements","reviewHearingRequirements","detainedReviewHearingRequirements","allocateHearingJudge","detainedAllocateHearingJudge","prepareDecisionsAndReasons","startDecisionsAndReasonsDocument","createHearingBundle","createCaseSummary","listTheCase","detainedListTheCase","hearingException","detainedHearingException","cmrListed","detainedCmrListed","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","detainedEditListing","detainedListCmr" + "generateDraftDecisionAndReasons","uploadDecision","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","followUpOverdueHearingRequirements","detainedFollowUpOverdueHearingRequirements","reviewHearingRequirements","detainedReviewHearingRequirements","allocateHearingJudge","detainedAllocateHearingJudge","prepareDecisionsAndReasons","startDecisionsAndReasonsDocument","createHearingBundle","createCaseSummary","listTheCase","detainedListTheCase","hearingException","detainedHearingException","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","detainedEditListing","detainedListCmr" "workType" @@ -504,7 +504,7 @@ - "arrangeOfflinePayment","markCaseAsPaid","allocateHearingJudge","detainedAllocateHearingJudge","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","detainedEditListing","followUpSetAsideDecision","detainedFollowUpSetAsideDecision","hearingException","detainedHearingException","cmrListed","detainedCmrListed","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","reviewMigratedCase","detainedReviewMigratedCase","reviewAriaRemissionApplication","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","detainedListCmr" + "arrangeOfflinePayment","markCaseAsPaid","allocateHearingJudge","detainedAllocateHearingJudge","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","detainedEditListing","followUpSetAsideDecision","detainedFollowUpSetAsideDecision","hearingException","detainedHearingException","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","reviewMigratedCase","detainedReviewMigratedCase","reviewAriaRemissionApplication","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","detainedListCmr" "roleCategory" @@ -573,9 +573,7 @@ else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewMigratedCase" or taskType != null and taskType = "detainedReviewMigratedCase") then "[Progress migrated case](/case/IA/Asylum/${[CASE_REFERENCE]}/trigger/progressMigratedCase)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "hearingException" or taskType != null and taskType = "hearingException") then "[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedHearingException" or taskType != null and taskType = "detainedHearingException") then "[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings)" - else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "cmrListed" or taskType != null and taskType = "cmrListed") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "cmrUpdated" or taskType != null and taskType = "cmrUpdated") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" - else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedCmrListed" or taskType != null and taskType = "detainedCmrListed") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedCmrUpdated" or taskType != null and taskType = "detainedCmrUpdated") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "relistCase" or taskType != null and taskType = "relistCase") then "[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedRelistCase" or taskType != null and taskType = "detainedRelistCase") then "[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings)" @@ -591,13 +589,13 @@ then "[Decide an application](/case/IA/Asylum/${[CASE_REFERENCE]}/trigger/decideAnApplication)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewRemissionApplication" or taskType != null and taskType = "reviewRemissionApplication") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewRemissionApplication" or taskType != null and taskType = "detainedReviewRemissionApplication") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" - else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewASRemission" or taskType != null and taskType = "reviewASRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" + else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewASRemission" or taskType != null and taskType = "reviewASRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewLARemission" or taskType != null and taskType = "reviewLARemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewHOWaiverRemission" or taskType != null and taskType = "reviewHOWaiverRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewAuthorityRemission" or taskType != null and taskType = "reviewAuthorityRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewHWFRemission" or taskType != null and taskType = "reviewHWFRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewECRRemission" or taskType != null and taskType = "reviewECRRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" - else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewASRemission" or taskType != null and taskType = "detainedReviewASRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" + else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewASRemission" or taskType != null and taskType = "detainedReviewASRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewLARemission" or taskType != null and taskType = "detainedReviewLARemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewHOWaiverRemission" or taskType != null and taskType = "detainedReviewHOWaiverRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewAuthorityRemission" or taskType != null and taskType = "detainedReviewAuthorityRemission") then "[Record remission decision](/cases/case-details/${[CASE_REFERENCE]}/trigger/recordRemissionDecision/recordRemissionDecisionremissionDecision)" @@ -793,9 +791,7 @@ "assignAFTPAJudge","detainedAssignAFTPAJudge", "listTheCase","detainedListTheCase", "reviewSetAsideDecisionApplication", -"cmrListed", -"cmrUpdated","detainedCmrListed", -"detainedCmrUpdated", +"cmrUpdated","detainedCmrUpdated", "reviewAriaRemissionApplication","reviewASRemission", "reviewLARemission", "reviewHOWaiverRemission", "reviewAuthorityRemission", "reviewHWFRemission", "reviewECRRemission", "detainedReviewASRemission", "detainedReviewLARemission", "detainedReviewHOWaiverRemission", "detainedReviewAuthorityRemission", "detainedReviewHWFRemission", "detainedReviewECRRemission" diff --git a/src/main/resources/wa-task-permissions-ia-asylum.dmn b/src/main/resources/wa-task-permissions-ia-asylum.dmn index 0ec26667..7371ca12 100644 --- a/src/main/resources/wa-task-permissions-ia-asylum.dmn +++ b/src/main/resources/wa-task-permissions-ia-asylum.dmn @@ -239,7 +239,6 @@ "reviewAppealSetAsideUnderRule35","detainedReviewAppealSetAsideUnderRule35", "reviewAppealSetAsideUnderRule32","detainedReviewAppealSetAsideUnderRule32", - "cmrListed","detainedCmrListed", "cmrUpdated","detainedCmrUpdated", "relistCase","detainedRelistCase", "listTheCase","detainedReviewInterpreters","detainedListTheCase", @@ -367,7 +366,6 @@ "editListing","detainedEditListing", "followUpSetAsideDecision","detainedFollowUpSetAsideDecision", "hearingException","detainedHearingException", -"cmrListed","detainedCmrListed", "cmrUpdated","detainedCmrUpdated", "relistCase","detainedRelistCase", "listTheCase","detainedListTheCase", @@ -664,7 +662,6 @@ "assignAFTPAJudge","detainedAssignAFTPAJudge", "listTheCase","detainedListTheCase","detainedListCmr", "sendPaymentRequest","markAsPaid", -"cmrListed","detainedCmrListed", "cmrUpdated","detainedCmrUpdated", "reviewInterpreters","detainedReviewInterpreters", "processFeeRefund","detainedProcessFeeRefund", @@ -709,7 +706,7 @@ CTSC Team Leader task permissions - "reviewRemissionApplication","detainedReviewRemissionApplication","assignAFTPAJudge","detainedAssignAFTPAJudge","listTheCase","detainedListTheCase","sendPaymentRequest","markAsPaid","cmrListed","detainedCmrListed","cmrUpdated","detainedCmrUpdated","reviewInterpreters","detainedReviewInterpreters","processFeeRefund","detainedProcessFeeRefund","reviewDraftAppeal","detainedReviewDraftAppeal","detainedListCmr","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","reviewASRemission", "reviewLARemission", "reviewHOWaiverRemission", "reviewAuthorityRemission", "reviewHWFRemission", "reviewECRRemission", "detainedReviewASRemission", "detainedReviewLARemission", "detainedReviewHOWaiverRemission", "detainedReviewAuthorityRemission", "detainedReviewHWFRemission", "detainedReviewECRRemission" + "reviewRemissionApplication","detainedReviewRemissionApplication","assignAFTPAJudge","detainedAssignAFTPAJudge","listTheCase","detainedListTheCase","sendPaymentRequest","markAsPaid","cmrUpdated","detainedCmrUpdated","reviewInterpreters","detainedReviewInterpreters","processFeeRefund","detainedProcessFeeRefund","reviewDraftAppeal","detainedReviewDraftAppeal","detainedListCmr","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","reviewASRemission", "reviewLARemission", "reviewHOWaiverRemission", "reviewAuthorityRemission", "reviewHWFRemission", "reviewECRRemission", "detainedReviewASRemission", "detainedReviewLARemission", "detainedReviewHOWaiverRemission", "detainedReviewAuthorityRemission", "detainedReviewHWFRemission", "detainedReviewECRRemission" @@ -738,7 +735,7 @@ - "hearingException","detainedHearingException","cmrListed","detainedCmrListed","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","listTheCase","detainedListTheCase","reviewInterpreters","detainedReviewInterpreters","detainedListCmr" + "hearingException","detainedHearingException","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","listTheCase","detainedListTheCase","reviewInterpreters","detainedReviewInterpreters","detainedListCmr" diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java index e4ef7296..033559d2 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java @@ -345,8 +345,6 @@ public static Stream workTypeScenarioProvider() { Arguments.of("detainedListTheCase", hearingWork), Arguments.of("hearingException", hearingWork), Arguments.of("detainedHearingException", hearingWork), - Arguments.of("cmrListed", hearingWork), - Arguments.of("detainedCmrListed", hearingWork), Arguments.of("cmrUpdated", hearingWork), Arguments.of("detainedCmrUpdated", hearingWork), Arguments.of("relistCase", hearingWork), @@ -511,7 +509,7 @@ void when_taskId_then_return_judicial_role_category(String taskType) { "detainedPostHearingAttendeesDurationAndRecording", "editListing", "detainedEditListing", "followUpSetAsideDecision", "detainedFollowUpSetAsideDecision", "hearingException", "detainedHearingException", - "cmrListed", "cmrUpdated", "detainedCmrListed", "detainedCmrUpdated", + "cmrUpdated", "detainedCmrUpdated", "relistCase", "detainedRelistCase", "reviewInterpreters", "detainedReviewInterpreters", "reviewMigratedCase", "detainedReviewMigratedCase", @@ -1595,8 +1593,6 @@ private boolean validNow(ZonedDateTime expected, ZonedDateTime actual) { + "progressMigratedCase),,,10", "hearingException,[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "detainedHearingException,[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", - "cmrListed,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", - "detainedCmrListed,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "cmrUpdated,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "detainedCmrUpdated,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "relistCase,[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", @@ -1808,9 +1804,7 @@ public static Stream dueDateIntervalDaysScenarioProvider() { Arguments.of("printAndSendReheardHearingRequirements", zeroDays), Arguments.of("detainedPrintAndSendReheardHearingRequirements", zeroDays), Arguments.of("markAsPaid", fourteenDays), - Arguments.of("cmrListed", twoDays), - Arguments.of("detainedCmrUpdated", twoDays), - Arguments.of("detainedListCmr", zeroDays) + Arguments.of("detainedCmrUpdated", twoDays) ); } diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java index 04d95872..fb54474c 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java @@ -511,28 +511,6 @@ public static Stream genericScenarioProvider() { tribunalCaseWorkerPriorityTwoOwn ) ), - Arguments.of( - "cmrListed", - List.of( - taskSupervisor, - seniorCaseWorkerPriorityOne, - hearingCentreAdminPriorityOne, - ctscAdminPriorityOne, - ctscTeamLeaderPriorityOne, - tribunalCaseWorkerPriorityTwoOwn - ) - ), - Arguments.of( - "detainedCmrListed", - List.of( - taskSupervisor, - seniorCaseWorkerPriorityOne, - hearingCentreAdminPriorityOne, - ctscAdminPriorityOne, - ctscTeamLeaderPriorityOne, - tribunalCaseWorkerPriorityTwoOwn - ) - ), Arguments.of( "detainedListCmr", List.of( From b2fe61f8e40c002f80b3c9427bb6c9b6273ecac0 Mon Sep 17 00:00:00 2001 From: Aliveni Choppa Date: Thu, 26 Feb 2026 12:08:31 +0000 Subject: [PATCH 3/4] cleanup cmrListing event --- .../wa-task-cancellation-ia-asylum.dmn | 23 ------------------- .../wa-task-completion-ia-asylum.dmn | 2 +- .../dmn/CamundaTaskCancellationTest.java | 12 +--------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-ia-asylum.dmn b/src/main/resources/wa-task-cancellation-ia-asylum.dmn index 9c2fa5e2..f0e3a49c 100644 --- a/src/main/resources/wa-task-cancellation-ia-asylum.dmn +++ b/src/main/resources/wa-task-cancellation-ia-asylum.dmn @@ -528,29 +528,6 @@ - - - - - - "cmrListing" - - - - - - "Reconfigure" - - - - - - - - - - - diff --git a/src/main/resources/wa-task-completion-ia-asylum.dmn b/src/main/resources/wa-task-completion-ia-asylum.dmn index 9aca317f..ee160402 100644 --- a/src/main/resources/wa-task-completion-ia-asylum.dmn +++ b/src/main/resources/wa-task-completion-ia-asylum.dmn @@ -990,7 +990,7 @@ - "generateHearingBundle","decisionAndReasonsStarted","updateHearingRequirements","endAppeal","requestRespondentEvidence","requestCaseBuilding","requestReasonsForAppeal","sendDirection","requestRespondentReview","requestCaseEdit","sendDirectionWithQuestions","requestCmaRequirements","markEvidenceAsReviewed","markAddendumEvidenceAsReviewed","reviewCmaRequirements","updateDetailsAfterCma","requestResponseAmend","requestResponseReview","reviewHearingRequirements","changeDirectionDueDate","decideAnApplication","editCaseListing","sendDecisionAndReasons","generateDecisionAndReasons","uploadHearingRecording","postHearingAttendeesDurationAndRecording","decideFtpaApplication","recordRemissionDecision","recordAllocatedJudge","listCase","markAppealPaid","markPaymentRequestSent","requestNewHearingRequirements","refundConfirmation","progressMigratedCase","submitAppeal","generateListCmrTask","cmrListing","forceCaseToSubmitHearingRequirements" + "generateHearingBundle","decisionAndReasonsStarted","updateHearingRequirements","endAppeal","requestRespondentEvidence","requestCaseBuilding","requestReasonsForAppeal","sendDirection","requestRespondentReview","requestCaseEdit","sendDirectionWithQuestions","requestCmaRequirements","markEvidenceAsReviewed","markAddendumEvidenceAsReviewed","reviewCmaRequirements","updateDetailsAfterCma","requestResponseAmend","requestResponseReview","reviewHearingRequirements","changeDirectionDueDate","decideAnApplication","editCaseListing","sendDecisionAndReasons","generateDecisionAndReasons","uploadHearingRecording","postHearingAttendeesDurationAndRecording","decideFtpaApplication","recordRemissionDecision","recordAllocatedJudge","listCase","markAppealPaid","markPaymentRequestSent","requestNewHearingRequirements","refundConfirmation","progressMigratedCase","submitAppeal","generateListCmrTask","forceCaseToSubmitHearingRequirements" diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java index 7bf664eb..b98b427e 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java @@ -277,16 +277,6 @@ static Stream scenarioProvider() { null, emptyList() ), - Arguments.of( - null, - "cmrListing", - null, - singletonList( - Map.of( - "action", "Reconfigure" - ) - ) - ), Arguments.of( null, "cmrReListing", @@ -372,7 +362,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(3)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(29)); + assertThat(logic.getRules().size(), is(28)); } } From 91c1db094a722f2c9606204db96e73054436a98d Mon Sep 17 00:00:00 2001 From: Aliveni Choppa Date: Thu, 26 Feb 2026 13:02:31 +0000 Subject: [PATCH 4/4] DIAC-1868 Remove Update CMR notification WA task --- .../wa-task-cancellation-ia-asylum.dmn | 23 -- .../wa-task-configuration-ia-asylum.dmn | 7 +- .../wa-task-initiation-ia-asylum.dmn | 224 +----------------- .../wa-task-permissions-ia-asylum.dmn | 10 +- .../resources/wa-task-types-ia-asylum.dmn | 26 +- .../dmn/CamundaTaskCancellationTest.java | 12 +- .../dmn/CamundaTaskConfigurationTest.java | 8 +- .../dmn/CamundaTaskInitiationTest.java | 38 +-- .../dmn/CamundaTaskPermissionTest.java | 22 -- .../dmn/CamundaTaskTypesTest.java | 14 +- 10 files changed, 13 insertions(+), 371 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-ia-asylum.dmn b/src/main/resources/wa-task-cancellation-ia-asylum.dmn index f0e3a49c..09b80dc9 100644 --- a/src/main/resources/wa-task-cancellation-ia-asylum.dmn +++ b/src/main/resources/wa-task-cancellation-ia-asylum.dmn @@ -528,29 +528,6 @@ - - - - - - "cmrReListing" - - - - - - "Reconfigure" - - - - - - - - - - - diff --git a/src/main/resources/wa-task-configuration-ia-asylum.dmn b/src/main/resources/wa-task-configuration-ia-asylum.dmn index 0a5ad718..5b4fca2b 100644 --- a/src/main/resources/wa-task-configuration-ia-asylum.dmn +++ b/src/main/resources/wa-task-configuration-ia-asylum.dmn @@ -283,7 +283,7 @@ - "generateDraftDecisionAndReasons","uploadDecision","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","followUpOverdueHearingRequirements","detainedFollowUpOverdueHearingRequirements","reviewHearingRequirements","detainedReviewHearingRequirements","allocateHearingJudge","detainedAllocateHearingJudge","prepareDecisionsAndReasons","startDecisionsAndReasonsDocument","createHearingBundle","createCaseSummary","listTheCase","detainedListTheCase","hearingException","detainedHearingException","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","detainedEditListing","detainedListCmr" + "generateDraftDecisionAndReasons","uploadDecision","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","followUpOverdueHearingRequirements","detainedFollowUpOverdueHearingRequirements","reviewHearingRequirements","detainedReviewHearingRequirements","allocateHearingJudge","detainedAllocateHearingJudge","prepareDecisionsAndReasons","startDecisionsAndReasonsDocument","createHearingBundle","createCaseSummary","listTheCase","detainedListTheCase","hearingException","detainedHearingException","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","detainedEditListing","detainedListCmr" "workType" @@ -504,7 +504,7 @@ - "arrangeOfflinePayment","markCaseAsPaid","allocateHearingJudge","detainedAllocateHearingJudge","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","detainedEditListing","followUpSetAsideDecision","detainedFollowUpSetAsideDecision","hearingException","detainedHearingException","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","reviewMigratedCase","detainedReviewMigratedCase","reviewAriaRemissionApplication","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","detainedListCmr" + "arrangeOfflinePayment","markCaseAsPaid","allocateHearingJudge","detainedAllocateHearingJudge","uploadHearingRecording","postHearingAttendeesDurationAndRecording","detainedPostHearingAttendeesDurationAndRecording","editListing","detainedEditListing","followUpSetAsideDecision","detainedFollowUpSetAsideDecision","hearingException","detainedHearingException","relistCase","detainedRelistCase","reviewInterpreters","detainedReviewInterpreters","reviewMigratedCase","detainedReviewMigratedCase","reviewAriaRemissionApplication","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","detainedListCmr" "roleCategory" @@ -573,8 +573,6 @@ else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedReviewMigratedCase" or taskType != null and taskType = "detainedReviewMigratedCase") then "[Progress migrated case](/case/IA/Asylum/${[CASE_REFERENCE]}/trigger/progressMigratedCase)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "hearingException" or taskType != null and taskType = "hearingException") then "[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedHearingException" or taskType != null and taskType = "detainedHearingException") then "[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings)" - else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "cmrUpdated" or taskType != null and taskType = "cmrUpdated") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" - else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedCmrUpdated" or taskType != null and taskType = "detainedCmrUpdated") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "relistCase" or taskType != null and taskType = "relistCase") then "[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "detainedRelistCase" or taskType != null and taskType = "detainedRelistCase") then "[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings)" else if (taskAttributes != null and taskAttributes.taskType != null and taskAttributes.taskType = "reviewInterpreters" or taskType != null and taskType = "reviewInterpreters") then "[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings)" @@ -791,7 +789,6 @@ "assignAFTPAJudge","detainedAssignAFTPAJudge", "listTheCase","detainedListTheCase", "reviewSetAsideDecisionApplication", -"cmrUpdated","detainedCmrUpdated", "reviewAriaRemissionApplication","reviewASRemission", "reviewLARemission", "reviewHOWaiverRemission", "reviewAuthorityRemission", "reviewHWFRemission", "reviewECRRemission", "detainedReviewASRemission", "detainedReviewLARemission", "detainedReviewHOWaiverRemission", "detainedReviewAuthorityRemission", "detainedReviewHWFRemission", "detainedReviewECRRemission" diff --git a/src/main/resources/wa-task-initiation-ia-asylum.dmn b/src/main/resources/wa-task-initiation-ia-asylum.dmn index 0ab73a79..abda7c3a 100644 --- a/src/main/resources/wa-task-initiation-ia-asylum.dmn +++ b/src/main/resources/wa-task-initiation-ia-asylum.dmn @@ -1,5 +1,5 @@ - + @@ -11755,226 +11755,6 @@ "caseProgression" - - - "cmrReListing" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - "cmrUpdated" - - - "Update CMR notification" - - - - - - "caseProgression" - - - - - "cmrReListing" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - "detainedCmrUpdated" - - - "Detained - Update CMR notification" - - - - - - "caseProgression" - - "decisionAndReasonsStarted" @@ -22360,4 +22140,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/wa-task-permissions-ia-asylum.dmn b/src/main/resources/wa-task-permissions-ia-asylum.dmn index 7371ca12..031568f2 100644 --- a/src/main/resources/wa-task-permissions-ia-asylum.dmn +++ b/src/main/resources/wa-task-permissions-ia-asylum.dmn @@ -1,5 +1,5 @@ - + @@ -238,8 +238,6 @@ "reviewRemittedAppeal","detainedReviewRemittedAppeal", "reviewAppealSetAsideUnderRule35","detainedReviewAppealSetAsideUnderRule35", "reviewAppealSetAsideUnderRule32","detainedReviewAppealSetAsideUnderRule32", - - "cmrUpdated","detainedCmrUpdated", "relistCase","detainedRelistCase", "listTheCase","detainedReviewInterpreters","detainedListTheCase", "reviewInterpreters","detainedListCmr" @@ -366,7 +364,6 @@ "editListing","detainedEditListing", "followUpSetAsideDecision","detainedFollowUpSetAsideDecision", "hearingException","detainedHearingException", -"cmrUpdated","detainedCmrUpdated", "relistCase","detainedRelistCase", "listTheCase","detainedListTheCase", "reviewInterpreters","detainedReviewInterpreters", @@ -662,7 +659,6 @@ "assignAFTPAJudge","detainedAssignAFTPAJudge", "listTheCase","detainedListTheCase","detainedListCmr", "sendPaymentRequest","markAsPaid", -"cmrUpdated","detainedCmrUpdated", "reviewInterpreters","detainedReviewInterpreters", "processFeeRefund","detainedProcessFeeRefund", "reviewDraftAppeal","detainedReviewDraftAppeal", @@ -706,7 +702,7 @@ CTSC Team Leader task permissions - "reviewRemissionApplication","detainedReviewRemissionApplication","assignAFTPAJudge","detainedAssignAFTPAJudge","listTheCase","detainedListTheCase","sendPaymentRequest","markAsPaid","cmrUpdated","detainedCmrUpdated","reviewInterpreters","detainedReviewInterpreters","processFeeRefund","detainedProcessFeeRefund","reviewDraftAppeal","detainedReviewDraftAppeal","detainedListCmr","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","reviewASRemission", "reviewLARemission", "reviewHOWaiverRemission", "reviewAuthorityRemission", "reviewHWFRemission", "reviewECRRemission", "detainedReviewASRemission", "detainedReviewLARemission", "detainedReviewHOWaiverRemission", "detainedReviewAuthorityRemission", "detainedReviewHWFRemission", "detainedReviewECRRemission" + "reviewRemissionApplication","detainedReviewRemissionApplication","assignAFTPAJudge","detainedAssignAFTPAJudge","listTheCase","detainedListTheCase","sendPaymentRequest","markAsPaid","reviewInterpreters","detainedReviewInterpreters","processFeeRefund","detainedProcessFeeRefund","reviewDraftAppeal","detainedReviewDraftAppeal","detainedListCmr","printAndSendHoBundle","detainedPrintAndSendHoBundle","printAndSendHoResponse","printAndSendHearingRequirements","detainedPrintAndSendHearingRequirements","printAndSendHearingBundle","detainedPrintAndSendHearingBundle","printAndSendDecisionCorrectedRule31","detainedPrintAndSendDecisionCorrectedRule31","printAndSendDecisionCorrectedRule32","detainedPrintAndSendDecisionCorrectedRule32","printAndSendHoApplication","detainedPrintAndSendHoApplication","printAndSendHoEvidence","detainedPrintAndSendHoEvidence","printAndSendAppealDecision","detainedPrintAndSendAppealDecision","printAndSendFTPADecision","detainedPrintAndSendFTPADecision","printAndSendReheardHearingRequirements","detainedPrintAndSendReheardHearingRequirements","reviewASRemission", "reviewLARemission", "reviewHOWaiverRemission", "reviewAuthorityRemission", "reviewHWFRemission", "reviewECRRemission", "detainedReviewASRemission", "detainedReviewLARemission", "detainedReviewHOWaiverRemission", "detainedReviewAuthorityRemission", "detainedReviewHWFRemission", "detainedReviewECRRemission" @@ -735,7 +731,7 @@ - "hearingException","detainedHearingException","cmrUpdated","detainedCmrUpdated","relistCase","detainedRelistCase","listTheCase","detainedListTheCase","reviewInterpreters","detainedReviewInterpreters","detainedListCmr" + "hearingException","detainedHearingException","relistCase","detainedRelistCase","listTheCase","detainedListTheCase","reviewInterpreters","detainedReviewInterpreters","detainedListCmr" diff --git a/src/main/resources/wa-task-types-ia-asylum.dmn b/src/main/resources/wa-task-types-ia-asylum.dmn index 6ee68bdb..0467c12b 100644 --- a/src/main/resources/wa-task-types-ia-asylum.dmn +++ b/src/main/resources/wa-task-types-ia-asylum.dmn @@ -1,5 +1,5 @@ - + @@ -988,28 +988,6 @@ "Detained - Review Respondent Response" - - - - - - "cmrUpdated" - - - "Update CMR notification" - - - - - - - - "detainedCmrUpdated" - - - "Detained - Update CMR notification" - - @@ -1553,4 +1531,4 @@ - \ No newline at end of file + diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java index b98b427e..7e980aa0 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskCancellationTest.java @@ -277,16 +277,6 @@ static Stream scenarioProvider() { null, emptyList() ), - Arguments.of( - null, - "cmrReListing", - null, - singletonList( - Map.of( - "action", "Reconfigure" - ) - ) - ), Arguments.of( null, "hearingCancelled", @@ -362,7 +352,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(3)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(28)); + assertThat(logic.getRules().size(), is(27)); } } diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java index 033559d2..7d0baa42 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskConfigurationTest.java @@ -345,8 +345,6 @@ public static Stream workTypeScenarioProvider() { Arguments.of("detainedListTheCase", hearingWork), Arguments.of("hearingException", hearingWork), Arguments.of("detainedHearingException", hearingWork), - Arguments.of("cmrUpdated", hearingWork), - Arguments.of("detainedCmrUpdated", hearingWork), Arguments.of("relistCase", hearingWork), Arguments.of("detainedRelistCase", hearingWork), Arguments.of("reviewInterpreters", hearingWork), @@ -509,7 +507,6 @@ void when_taskId_then_return_judicial_role_category(String taskType) { "detainedPostHearingAttendeesDurationAndRecording", "editListing", "detainedEditListing", "followUpSetAsideDecision", "detainedFollowUpSetAsideDecision", "hearingException", "detainedHearingException", - "cmrUpdated", "detainedCmrUpdated", "relistCase", "detainedRelistCase", "reviewInterpreters", "detainedReviewInterpreters", "reviewMigratedCase", "detainedReviewMigratedCase", @@ -1593,8 +1590,6 @@ private boolean validNow(ZonedDateTime expected, ZonedDateTime actual) { + "progressMigratedCase),,,10", "hearingException,[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "detainedHearingException,[Go to case](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", - "cmrUpdated,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", - "detainedCmrUpdated,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "relistCase,[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "detainedRelistCase,[Relist the hearing](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", "reviewInterpreters,[View the Hearings](cases/case-details/${[CASE_REFERENCE]}/hearings),,,", @@ -1803,8 +1798,7 @@ public static Stream dueDateIntervalDaysScenarioProvider() { Arguments.of("detainedPrintAndSendFTPADecision", zeroDays), Arguments.of("printAndSendReheardHearingRequirements", zeroDays), Arguments.of("detainedPrintAndSendReheardHearingRequirements", zeroDays), - Arguments.of("markAsPaid", fourteenDays), - Arguments.of("detainedCmrUpdated", twoDays) + Arguments.of("markAsPaid", fourteenDays) ); } diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java index a35af04e..20a38ae8 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskInitiationTest.java @@ -3011,42 +3011,6 @@ static Stream scenarioProvider() { "taskId", "detainedHearingException", "name", "Detained - Hearing Exception", - "processCategories", "caseProgression" - ) - ) - ), - Arguments.of( - "cmrReListing", - null, - mapAdditionalData("{\n" - + " \"Data\":{\n" - + " \"isNotificationTurnedOff\":\"" + "false" + "\"\n" - + " }" - + "}"), - singletonList( - Map.of( - "taskId", "cmrUpdated", - "name", "Update CMR notification", - - "processCategories", "caseProgression" - ) - ) - ), - Arguments.of( - "cmrReListing", - null, - mapAdditionalData("{\n" - + " \"Data\":{\n" - + " \"appellantInDetention\":\"" + "true" + "\",\n" - + " \"isNotificationTurnedOff\":\"" + "false" + "\"\n" - + " }" - + "}"), - singletonList( - Map.of( - "taskId", "detainedCmrUpdated", - "name", "Detained - Update CMR notification", - - "processCategories", "caseProgression" ) ) @@ -4800,7 +4764,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(32)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(199)); + assertThat(logic.getRules().size(), is(197)); } public static Stream addendumScenarioProvider() { diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java index fb54474c..d727100d 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskPermissionTest.java @@ -522,28 +522,6 @@ public static Stream genericScenarioProvider() { tribunalCaseWorkerPriorityTwoOwn ) ), - Arguments.of( - "cmrUpdated", - List.of( - taskSupervisor, - seniorCaseWorkerPriorityOne, - hearingCentreAdminPriorityOne, - ctscAdminPriorityOne, - ctscTeamLeaderPriorityOne, - tribunalCaseWorkerPriorityTwoOwn - ) - ), - Arguments.of( - "detainedCmrUpdated", - List.of( - taskSupervisor, - seniorCaseWorkerPriorityOne, - hearingCentreAdminPriorityOne, - ctscAdminPriorityOne, - ctscTeamLeaderPriorityOne, - tribunalCaseWorkerPriorityTwoOwn - ) - ), Arguments.of( "relistCase", List.of( diff --git a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java index f0ed3575..037bd000 100644 --- a/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java +++ b/src/test/java/uk/gov/hmcts/reform/iataskconfiguration/dmn/CamundaTaskTypesTest.java @@ -529,18 +529,6 @@ static Stream scenarioProvider() { "taskTypeName", "Detained - Hearing exception" ), - Map.of( - "taskTypeId", - "cmrUpdated", - "taskTypeName", - "Update CMR notification" - ), - Map.of( - "taskTypeId", - "detainedCmrUpdated", - "taskTypeName", - "Detained - Update CMR notification" - ), Map.of( "taskTypeId", "reviewInterpreters", @@ -892,7 +880,7 @@ void check_dmn_changed() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(1)); assertThat(logic.getOutputs().size(), is(2)); - assertThat(logic.getRules().size(), is(139)); + assertThat(logic.getRules().size(), is(137)); } }