diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index 8a20eeb5..640e17d2 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -46,13 +46,13 @@ - "DECISION_OUTCOME" + "JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" "draftAnOrder" - "DECISION_OUTCOME" + "JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" "Cancel" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 591fa802..df482c6a 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1264,7 +1264,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null"description" - "[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/trigger/)" + "[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/hearings)" @@ -1940,4 +1940,4 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - \ No newline at end of file + diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index b6b5b9f2..0d58f77c 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -3602,7 +3602,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "hmcCaseUpdPrepForHearing" + "enableUpdateHearingActualTask" "JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING" @@ -3614,7 +3614,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "TO BE REMOVED LATER" + @@ -3688,7 +3688,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "hmcCaseUpdPrepForHearing" + "enableUpdateHearingActualTask" "JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING" @@ -3700,7 +3700,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "TO BE REMOVED LATER" + @@ -3774,7 +3774,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "hmcCaseUpdDecOutcome" + "enableRequestSolicitorOrderTask" "DECISION_OUTCOME" @@ -3786,7 +3786,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "TO BE REMOVED LATER" + @@ -3862,7 +3862,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "hmcCaseUpdDecOutcome" + "enableRequestSolicitorOrderTask" "DECISION_OUTCOME" @@ -3874,7 +3874,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "TO BE REMOVED LATER" + diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index c7ae1126..c10c66e4 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -1116,4 +1116,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 0e05f518..b348859c 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -774,4 +774,4 @@ - \ No newline at end of file + diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java index 1c5c1148..bb3e4890 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java @@ -256,7 +256,6 @@ void when_given_task_type_then_return_dueDateIntervalDays_and_validate_descripti "name", "dueDateIntervalDays", "value", "1" ))); - assertDescriptionField(taskType, dmnDecisionTableResult); } @@ -1365,7 +1364,6 @@ private void assertDescriptionField(String taskType, DmnDecisionTableResult dmnD assertThat(descriptionResultList.size(), is(1)); String description = getDescriptionBasedOnTaskType(taskType); - assertTrue(descriptionResultList.contains(Map.of( "name", "description", "value", description @@ -1418,7 +1416,7 @@ private static String getDescriptionBasedOnTaskType(String taskType) { case "updateHearingActualsFL401": case "updateHearingActualsC100": - return "[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/trigger/)"; + return "[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/hearings)"; case "requestSolicitorOrderFL401": case "requestSolicitorOrderC100": diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java index 9f9d7ac3..6f834407 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java @@ -378,11 +378,10 @@ static Stream scenarioProvider() { ) ),*/ Arguments.of( - "hmcCaseUpdPrepForHearing", + "enableUpdateHearingActualTask", "PREPARE_FOR_HEARING_CONDUCT_HEARING", mapAdditionalData("{\n" + " \"Data\":{\n" - + " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n," + " \"caseTypeOfApplication\":\"" + "C100" + "\"\n" + " }" + "}"), @@ -687,11 +686,10 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "hmcCaseUpdPrepForHearing", + "enableUpdateHearingActualTask", "PREPARE_FOR_HEARING_CONDUCT_HEARING", mapAdditionalData("{\n" + " \"Data\":{\n" - + " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n," + " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n" + " }" + "}"), @@ -704,11 +702,10 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "hmcCaseUpdPrepForHearing", + "enableUpdateHearingActualTask", "JUDICIAL_REVIEW", mapAdditionalData("{\n" + " \"Data\":{\n" - + " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n," + " \"caseTypeOfApplication\":\"" + "C100" + "\"\n" + " }" + "}"), @@ -721,11 +718,10 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "hmcCaseUpdPrepForHearing", + "enableUpdateHearingActualTask", "JUDICIAL_REVIEW", mapAdditionalData("{\n" + " \"Data\":{\n" - + " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n," + " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n" + " }" + "}"),