From 465d393d1be5dfe2eed15804e37151d3b4d3365f Mon Sep 17 00:00:00 2001 From: Yogendra Upasani Date: Tue, 20 Feb 2024 00:28:02 +0000 Subject: [PATCH 1/6] PRL-4510-CA-ListWithoutNotice --- ...-task-configuration-privatelaw-prlapps.dmn | 27 +++++-- .../wa-task-initiation-privatelaw-prlapps.dmn | 73 ++++++++++++++++++- ...wa-task-permissions-privatelaw-prlapps.dmn | 4 +- .../wa-task-types-privatelaw-prlapps.dmn | 14 +++- 4 files changed, 109 insertions(+), 9 deletions(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index cd3442cc..d27eb9ff 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -310,7 +310,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","reviewAdminOrderProvided","reviewAdminOrderByManager","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401" + "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","reviewAdminOrderProvided","reviewAdminOrderByManager","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","listWithoutNoticeHearingC100" "dueDateIntervalDays" @@ -531,7 +531,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","serviceOfApplicationC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist" + "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","serviceOfApplicationC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","listWithoutNoticeHearingC100" "majorPriority" @@ -652,7 +652,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe" + "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","listWithoutNoticeHearingC100" "workType" @@ -795,7 +795,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "produceHearingBundleC100", "serviceOfApplicationC100","adminServeOrderC100", "updateHearingActualsC100", "requestSolicitorOrderC100", -"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC","removeLegalRepresentativeC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100" +"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC","removeLegalRepresentativeC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100","listWithoutNoticeHearingC100" "roleCategory" @@ -1385,6 +1385,23 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 + + + + + + "listWithoutNoticeHearingC100" + + + "description" + + + "[List without notice hearing(see case notes)]" + + + + + diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 2c707e5e..4e42f00f 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 @@ - + @@ -6021,6 +6021,77 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewDocsFL401" + + + "listWithoutNoticeHearingC100" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "listWithoutNoticeHearingC100" + + + "List without notice hearing (see case notes)" + + + + + + "listWithoutNoticeHearingC100" + + diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index e970f4b7..2cc7cc15 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -571,7 +571,7 @@ "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100" +"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100","listWithoutNoticeHearingC100" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 6519723d..155b5567 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -513,6 +513,18 @@ "Review inactive RA requests" + + LWNHC100 + + + + + "listWithoutNoticeHearingC100" + + + "List without notice hearing(see case notes)" + + From f13d85ed1d098e4602b1cbfa31902c283fb535d4 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Tue, 20 Feb 2024 18:18:09 +0000 Subject: [PATCH 2/6] Test case fix --- .../prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java | 2 +- .../prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java | 2 +- .../prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 76d2f654..109af60d 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 @@ -23,6 +23,6 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(2)); assertThat(logic.getOutputs().size(), is(3)); - assertThat(logic.getRules().size(), is(80)); + assertThat(logic.getRules().size(), is(81)); } } 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 be5ef111..2219779d 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 @@ -37,7 +37,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(19)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(82)); + assertThat(logic.getRules().size(), is(83)); } static Stream scenarioProvider() { diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java index 1bb8f1b9..f975099c 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java @@ -22,6 +22,6 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(1)); assertThat(logic.getOutputs().size(), is(2)); - assertThat(logic.getRules().size(), is(42)); + assertThat(logic.getRules().size(), is(43)); } } From cf58da1d852d7fd1cbfe0d3b508f22a947b0e868 Mon Sep 17 00:00:00 2001 From: Sathish Kannan Date: Wed, 21 Feb 2024 18:50:33 +0000 Subject: [PATCH 3/6] Resolving conflict issues --- .../wa-task-initiation-privatelaw-prlapps.dmn | 73 ++++++++++++++++++- .../dmn/CamundaTaskInitiationTest.java | 14 +++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 7ee9dab0..cdd1e748 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 @@ - + @@ -6376,6 +6376,77 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewDocsC100" + + + "listWithoutNoticeHearingC100" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "listWithoutNoticeHearingC100" + + + "List without notice hearing (see case notes)" + + + + + + "listWithoutNoticeHearingC100" + + 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 fe784bea..4b2366e9 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 @@ -37,7 +37,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(19)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(87)); + assertThat(logic.getRules().size(), is(88)); } static Stream scenarioProvider() { @@ -928,6 +928,18 @@ static Stream scenarioProvider() { "taskId", "appStatementOfServiceByAdmin" ) ) + ), + Arguments.of( + "listWithoutNoticeHearingC100", + null, + null, + List.of( + Map.of( + "name", "List without notice hearing (see case notes)", + "processCategories", "listWithoutNoticeHearingC100", + "taskId", "listWithoutNoticeHearingC100" + ) + ) ) ); } From 0c6e120f11f258164d2753103b1826367dd76af3 Mon Sep 17 00:00:00 2001 From: Yogendra Upasani Date: Mon, 26 Feb 2024 15:46:50 +0000 Subject: [PATCH 4/6] Updated test case --- .../prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 109af60d..76d2f654 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 @@ -23,6 +23,6 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(2)); assertThat(logic.getOutputs().size(), is(3)); - assertThat(logic.getRules().size(), is(81)); + assertThat(logic.getRules().size(), is(80)); } } From a4788b6aeb79a7ff1823c16045a6899523836528 Mon Sep 17 00:00:00 2001 From: Yogendra Upasani Date: Tue, 27 Feb 2024 14:53:11 +0000 Subject: [PATCH 5/6] PRL-4510 list without notice c100 --- .../resources/wa-task-configuration-privatelaw-prlapps.dmn | 2 +- src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index bc4cbbd9..0ea3c557 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1379,7 +1379,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "[List without notice hearing(see case notes)]" + "" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 4267e243..4b0618c5 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 @@ - + @@ -6378,7 +6378,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "listWithoutNoticeHearingC100" + "c100listWithoutNotice" From 3d2ca299bf1562ff1e7c1c92f3ac4e01da5cab62 Mon Sep 17 00:00:00 2001 From: Yogendra Upasani Date: Tue, 27 Feb 2024 14:59:40 +0000 Subject: [PATCH 6/6] updated test case --- .../prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4b2366e9..0e2b853a 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 @@ -930,7 +930,7 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "listWithoutNoticeHearingC100", + "c100listWithoutNotice", null, null, List.of(