From dcf66a07b206d5715ce9934cc12d5f964d1266b3 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Mon, 9 Oct 2023 18:27:45 +0100 Subject: [PATCH 01/17] RA Review tasks WA --- .../wa-task-completion-privatelaw-prlapps.dmn | 24 ++++- ...-task-configuration-privatelaw-prlapps.dmn | 50 +++++++-- .../wa-task-initiation-privatelaw-prlapps.dmn | 102 +++++++++++++++++- ...wa-task-permissions-privatelaw-prlapps.dmn | 6 +- .../wa-task-types-privatelaw-prlapps.dmn | 26 ++++- .../dmn/CamundaTaskCompletionTest.java | 18 ++++ .../dmn/CamundaTaskInitiationTest.java | 34 +++++- .../dmn/CamundaTaskPermissionTest.java | 52 +++++++++ .../dmn/CamundaTaskTypeFilterTest.java | 2 +- 9 files changed, 298 insertions(+), 16 deletions(-) diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index fb5fe0a9..52ac11fb 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -548,6 +548,28 @@ + + + "c100ManageFlags" + + + "reviewRARequestsC100" + + + "Auto" + + + + + "fl401ManageFlags" + + + "reviewRaRequestsFL401" + + + "Auto" + + diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index c89ea06f..fab05446 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 @@ - + @@ -314,7 +314,7 @@ - "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided" + "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRARequestsC100","reviewRaRequestsFL401" "dueDateIntervalDays" @@ -365,7 +365,7 @@ - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRARequestsC100","reviewRaRequestsFL401" "priorityDateOriginRef" @@ -518,7 +518,7 @@ - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","reviewCorrespondenceFL401","produceHearingBundleFL401","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401", "replyToMessageForCourtAdminFL401", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLAFL401" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","reviewCorrespondenceFL401","produceHearingBundleFL401","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401", "replyToMessageForCourtAdminFL401", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLAFL401","reviewRaRequestsFL401" "majorPriority" @@ -535,7 +535,7 @@ - "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA" + "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","reviewRARequestsC100" "majorPriority" @@ -571,7 +571,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary" + "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRARequestsC100","reviewRaRequestsFL401" "workType" @@ -692,7 +692,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "checkApplicationFL401", "checkApplicationResubmittedFL401", "sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401", -"produceHearingBundleFL401", "adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "reviewSpecificAccessRequestAdmin", "adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401" +"produceHearingBundleFL401", "adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "reviewSpecificAccessRequestAdmin", "adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewRaRequestsFL401" "roleCategory" @@ -714,7 +714,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "produceHearingBundleC100", "adminServeOrderC100", "updateHearingActualsC100", "requestSolicitorOrderC100", -"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100" +"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRARequestsC100" "roleCategory" @@ -1066,6 +1066,40 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 + + + + + + "reviewRARequestsC100" + + + "description" + + + "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/c100ManageFlags/c100ManageFlags)" + + + + + + + + + + + "reviewRaRequestsFL401" + + + "description" + + + "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/fl401ManageFlags/fl401ManageFlags)" + + + + + diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 96167011..707973ea 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 @@ - + @@ -2338,6 +2338,106 @@ "reviewDocsFL401" + + + "c100RequestSupport" + + + "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + + + "C100" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "reviewRARequestsC100" + + + "Review RA request" + + + + + + "reviewRAC100" + + + + + "fl401RequestSupport" + + + "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + + + "FL401" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "reviewRaRequestsFL401" + + + "Review RA request" + + + + + + "reviewRAFL401" + + diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index a6052619..34d41c50 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 @@ - + @@ -209,7 +209,7 @@ Court admin check application skills permission "checkApplicationFL401", "checkApplicationResubmittedFL401", -"sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401","removeLegalRepresentativeFL401","confidentialCheckSOA","replyToMessageForCourtAdminFL401" +"sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401","removeLegalRepresentativeFL401","confidentialCheckSOA","replyToMessageForCourtAdminFL401","reviewRaRequestsFL401" @@ -390,7 +390,7 @@ "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100" +"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRARequestsC100" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 215b8557..731eb0f4 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 @@ - + @@ -441,6 +441,30 @@ "FL401 Review Documents Submitted By Sol or Cafcass" + + RRRC100 + + - + + + "reviewRARequestsC100" + + + "Review RA requests" + + + + RRRFL401 + + + + + "reviewRaRequestsFL401" + + + "Review RA requests" + + diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java index 0212b8be..8b62446f 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java @@ -267,6 +267,24 @@ static Stream scenarioProvider() { ), Map.of() ) + ), + Arguments.of( + "c100ManageFlags", + singletonList( + Map.of( + "taskType", "reviewRARequestsC100", + "completionMode", "Auto" + ) + ) + ), + Arguments.of( + "fl401ManageFlags", + singletonList( + Map.of( + "taskType", "reviewRaRequestsFL401", + "completionMode", "Auto" + ) + ) ) ); } 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 4bf1797f..dd2e5805 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(12)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(45)); + assertThat(logic.getRules().size(), is(47)); } static Stream scenarioProvider() { @@ -396,6 +396,38 @@ static Stream scenarioProvider() { "taskId", "removeLegalRepresentativeFL401" ) ) + ), + Arguments.of( + "c100RequestSupport", + null, + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"caseTypeOfApplication\":\"" + "C100" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "reviewRARequestsC100", + "name", "Review RA request", + "processCategories", "reviewRARequestsC100" + ) + ) + ), + Arguments.of( + "fl401RequestSupport", + null, + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "name", "Review RA request", + "processCategories", "reviewRaRequestsFL401", + "taskId", "reviewRaRequestsFL401" + ) + ) ) ); } diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java index d06f88a2..298749b4 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java @@ -553,6 +553,58 @@ void evaluate_task_admin_removeLegalRepresentativeFL401(String taskType) { ))); } + @SuppressWarnings("checkstyle:indentation") + @ParameterizedTest + @CsvSource(value = { + "reviewRaRequestC100" + }) + void evaluate_task_admin_reviewRaRequestC100(String taskType) { + VariableMap inputVariables = new VariableMapImpl(); + inputVariables.putValue("taskAttributes", Map.of("taskType", taskType)); + + DmnDecisionTableResult dmnDecisionTableResult = evaluateDmnTable(inputVariables); + + MatcherAssert.assertThat(dmnDecisionTableResult.getResultList(), is(List.of( + Map.of( + "autoAssignable", false, + "name", "task-supervisor", + "value", "Read,Manage,Complete,Cancel,Assign,Unassign" + ), Map.of( + "autoAssignable", false, + "name", "ctsc", + "roleCategory", "CTSC", + "authorisations", "SKILL:ABA5:CHECKAPPLICATIONC100", + "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim" + ) + ))); + } + + @SuppressWarnings("checkstyle:indentation") + @ParameterizedTest + @CsvSource(value = { + "reviewRaRequestsFL401" + }) + void evaluate_task_admin_reviewRaRequestFL401(String taskType) { + VariableMap inputVariables = new VariableMapImpl(); + inputVariables.putValue("taskAttributes", Map.of("taskType", taskType)); + + DmnDecisionTableResult dmnDecisionTableResult = evaluateDmnTable(inputVariables); + + MatcherAssert.assertThat(dmnDecisionTableResult.getResultList(), is(List.of( + Map.of( + "autoAssignable", false, + "name", "task-supervisor", + "value", "Read,Manage,Complete,Cancel,Assign,Unassign" + ), Map.of( + "autoAssignable", false, + "name", "hearing-centre-admin", + "roleCategory", "ADMIN", + "authorisations", "SKILL:ABA5:CHECKAPPLICATIONFL401", + "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim" + ) + ))); + } + @ParameterizedTest @CsvSource(value = { "confidentialCheckSOA" 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 16db8b27..e2e11042 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(36)); + assertThat(logic.getRules().size(), is(38)); } } From 2214cf5fbda9415860d9b9fd6aa4bfdb0e1bdae2 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Mon, 9 Oct 2023 18:31:54 +0100 Subject: [PATCH 02/17] RA Review tasks WA --- config/owasp/suppressions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index 94fae55a..04e75e2f 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -90,6 +90,7 @@ CVE-2022-22965 CVE-2023-20883 + CVE-2023-34047 From 2c7ebc9264d3bab34ab5b72d1904e441755fd489 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Mon, 9 Oct 2023 18:46:10 +0100 Subject: [PATCH 03/17] Build fix --- .../wa-task-completion-privatelaw-prlapps.dmn | 2 +- .../wa-task-configuration-privatelaw-prlapps.dmn | 12 ++++++------ .../wa-task-initiation-privatelaw-prlapps.dmn | 2 +- .../wa-task-permissions-privatelaw-prlapps.dmn | 2 +- .../resources/wa-task-types-privatelaw-prlapps.dmn | 2 +- .../dmn/CamundaTaskCompletionTest.java | 4 ++-- .../dmn/CamundaTaskInitiationTest.java | 12 ++++++------ 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index 52ac11fb..6899a6b1 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -553,7 +553,7 @@ "c100ManageFlags" - "reviewRARequestsC100" + "reviewRaRequestC100" "Auto" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index fab05446..2344c89a 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -314,7 +314,7 @@ - "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRARequestsC100","reviewRaRequestsFL401" + "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRaRequestC100","reviewRaRequestsFL401" "dueDateIntervalDays" @@ -365,7 +365,7 @@ - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRARequestsC100","reviewRaRequestsFL401" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRaRequestC100","reviewRaRequestsFL401" "priorityDateOriginRef" @@ -535,7 +535,7 @@ - "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","reviewRARequestsC100" + "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","reviewRaRequestC100" "majorPriority" @@ -571,7 +571,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRARequestsC100","reviewRaRequestsFL401" + "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestC100","reviewRaRequestsFL401" "workType" @@ -714,7 +714,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "produceHearingBundleC100", "adminServeOrderC100", "updateHearingActualsC100", "requestSolicitorOrderC100", -"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRARequestsC100" +"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestC100" "roleCategory" @@ -1071,7 +1071,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "reviewRARequestsC100" + "reviewRaRequestC100" "description" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 707973ea..206ab120 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -2376,7 +2376,7 @@ - "reviewRARequestsC100" + "reviewRaRequestC100" "Review RA request" diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index 34d41c50..cfa47d76 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -390,7 +390,7 @@ "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRARequestsC100" +"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestC100" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 731eb0f4..93533aca 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -447,7 +447,7 @@ - - "reviewRARequestsC100" + "reviewRaRequestC100" "Review RA requests" diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java index 8b62446f..3a4ce0fd 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java @@ -272,7 +272,7 @@ static Stream scenarioProvider() { "c100ManageFlags", singletonList( Map.of( - "taskType", "reviewRARequestsC100", + "taskType", "reviewRaRequestC100", "completionMode", "Auto" ) ) @@ -307,7 +307,7 @@ 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(49)); + assertThat(logic.getRules().size(), is(51)); } 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 dd2e5805..9d368933 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 @@ -399,7 +399,7 @@ static Stream scenarioProvider() { ), Arguments.of( "c100RequestSupport", - null, + "JUDICIAL_REVIEW", mapAdditionalData("{\n" + " \"Data\":{\n" + " \"caseTypeOfApplication\":\"" + "C100" + "\"\n" @@ -407,15 +407,15 @@ static Stream scenarioProvider() { + "}"), singletonList( Map.of( - "taskId", "reviewRARequestsC100", + "taskId", "reviewRaRequestC100", "name", "Review RA request", - "processCategories", "reviewRARequestsC100" + "processCategories", "reviewRAC100" ) ) ), Arguments.of( "fl401RequestSupport", - null, + "JUDICIAL_REVIEW", mapAdditionalData("{\n" + " \"Data\":{\n" + " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n" @@ -423,9 +423,9 @@ static Stream scenarioProvider() { + "}"), singletonList( Map.of( + "taskId", "reviewRaRequestsFL401", "name", "Review RA request", - "processCategories", "reviewRaRequestsFL401", - "taskId", "reviewRaRequestsFL401" + "processCategories", "reviewRAFL401" ) ) ) From d91c2484d6b49f80431f31cd4d538364e2170abd Mon Sep 17 00:00:00 2001 From: alokDatta Date: Sat, 4 Nov 2023 17:26:24 +0000 Subject: [PATCH 04/17] PRL-4546 - Manage support task management --- .../wa-task-completion-privatelaw-prlapps.dmn | 4 +- ...-task-configuration-privatelaw-prlapps.dmn | 4 +- .../wa-task-initiation-privatelaw-prlapps.dmn | 100 ++++++++++++++++++ 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index 6899a6b1..d386e079 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -550,7 +550,7 @@ - "c100ManageFlags" + "c100ManageFlagsWA" "reviewRaRequestC100" @@ -561,7 +561,7 @@ - "fl401ManageFlags" + "fl401ManageFlagsWA" "reviewRaRequestsFL401" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 2344c89a..f4499c68 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1077,7 +1077,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/c100ManageFlags/c100ManageFlags)" + "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/c100ManageFlagsWA/c100ManageFlagsWA)" @@ -1094,7 +1094,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/fl401ManageFlags/fl401ManageFlags)" + "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/fl401ManageFlagsWA/fl401ManageFlagsWA)" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 206ab120..153401c2 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -2438,6 +2438,106 @@ "reviewRAFL401" + + + "c100ManageSupport" + + + "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + + + "C100" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "reviewRaRequestC100" + + + "Review RA request" + + + + + + "reviewRAC100" + + + + + "fl401ManageSupport" + + + "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + + + "FL401" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "reviewRaRequestsFL401" + + + "Review RA request" + + + + + + "reviewRAFL401" + + From d607cd0ce8e283ac566a207985ae76fd16b91418 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Sat, 4 Nov 2023 17:41:17 +0000 Subject: [PATCH 05/17] PRL-4546 - Manage support task management --- .../dmn/CamundaTaskCompletionTest.java | 4 +-- .../dmn/CamundaTaskInitiationTest.java | 34 ++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java index 3a4ce0fd..37be9fda 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java @@ -269,7 +269,7 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "c100ManageFlags", + "c100ManageFlagsWA", singletonList( Map.of( "taskType", "reviewRaRequestC100", @@ -278,7 +278,7 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "fl401ManageFlags", + "fl401ManageFlagsWA", singletonList( Map.of( "taskType", "reviewRaRequestsFL401", 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 9d368933..3ff99fb3 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(12)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(47)); + assertThat(logic.getRules().size(), is(49)); } static Stream scenarioProvider() { @@ -428,6 +428,38 @@ static Stream scenarioProvider() { "processCategories", "reviewRAFL401" ) ) + ), + Arguments.of( + "c100ManageSupport", + "JUDICIAL_REVIEW", + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"caseTypeOfApplication\":\"" + "C100" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "reviewRaRequestC100", + "name", "Review RA request", + "processCategories", "reviewRAC100" + ) + ) + ), + Arguments.of( + "fl401ManageSupport", + "JUDICIAL_REVIEW", + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "reviewRaRequestsFL401", + "name", "Review RA request", + "processCategories", "reviewRAFL401" + ) + ) ) ); } From 3db0707fe74b25299538518c8efe37c254867aff Mon Sep 17 00:00:00 2001 From: alokDatta Date: Tue, 7 Nov 2023 17:24:42 +0000 Subject: [PATCH 06/17] removed unnecessary changes --- .../wa-task-completion-privatelaw-prlapps.dmn | 26 +++++++++---------- ...-task-configuration-privatelaw-prlapps.dmn | 4 +-- .../dmn/CamundaTaskCompletionTest.java | 14 +++++----- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index d386e079..0acd9aed 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -537,20 +537,9 @@ "Auto" - - - "manageOrders","serviceOfApplication","createBundle","adminEditAndApproveAnOrder","editAndApproveAnOrder","returnApplication","sendOrReplyToMessages","issueAndSendToLocalCourtCallback" - - - - - - - - - "c100ManageFlagsWA" + "c100ManageFlags" "reviewRaRequestC100" @@ -561,7 +550,7 @@ - "fl401ManageFlagsWA" + "fl401ManageFlags" "reviewRaRequestsFL401" @@ -570,6 +559,17 @@ "Auto" + + + "manageOrders","serviceOfApplication","createBundle","adminEditAndApproveAnOrder","editAndApproveAnOrder","returnApplication","sendOrReplyToMessages","issueAndSendToLocalCourtCallback","c100ManageFlags","fl401ManageFlags" + + + + + + + + diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index f4499c68..2344c89a 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1077,7 +1077,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/c100ManageFlagsWA/c100ManageFlagsWA)" + "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/c100ManageFlags/c100ManageFlags)" @@ -1094,7 +1094,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/fl401ManageFlagsWA/fl401ManageFlagsWA)" + "[Review RA request](/cases/case-details/${[CASE_REFERENCE]}/trigger/fl401ManageFlags/fl401ManageFlags)" diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java index 37be9fda..05975a73 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java @@ -269,21 +269,23 @@ static Stream scenarioProvider() { ) ), Arguments.of( - "c100ManageFlagsWA", - singletonList( + "c100ManageFlags", + asList( Map.of( "taskType", "reviewRaRequestC100", "completionMode", "Auto" - ) + ), + Map.of() ) ), Arguments.of( - "fl401ManageFlagsWA", - singletonList( + "fl401ManageFlags", + asList( Map.of( "taskType", "reviewRaRequestsFL401", "completionMode", "Auto" - ) + ), + Map.of() ) ) ); From ac849508e649eba5cf5249dc2d356c1eb26407a2 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Tue, 7 Nov 2023 17:27:51 +0000 Subject: [PATCH 07/17] CVE Suppressed --- config/owasp/suppressions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index 04e75e2f..b8ea8449 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -91,6 +91,8 @@ CVE-2022-22965 CVE-2023-20883 CVE-2023-34047 + CVE-2023-5072 + CVE-2023-44487 From cfbbe41bad1b393b6e46270a9df24aeaee285ed9 Mon Sep 17 00:00:00 2001 From: Aloknath Datta Date: Tue, 7 Nov 2023 17:36:20 +0000 Subject: [PATCH 08/17] Update suppressions.xml --- config/owasp/suppressions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index b8ea8449..3e6bbf65 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -93,6 +93,8 @@ CVE-2023-34047 CVE-2023-5072 CVE-2023-44487 + CVE-2023-42795 + CVE-2023-45648 From 5d765f5da6bdad1d500de0efc46f621d76bda3b2 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Fri, 24 Nov 2023 14:39:09 +0000 Subject: [PATCH 09/17] WA task fix --- .../wa-task-initiation-privatelaw-prlapps.dmn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 153401c2..8af0421d 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -2343,10 +2343,10 @@ "c100RequestSupport" - "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + - "C100" + @@ -2393,10 +2393,10 @@ "fl401RequestSupport" - "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + - "FL401" + @@ -2443,10 +2443,10 @@ "c100ManageSupport" - "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + - "C100" + @@ -2493,10 +2493,10 @@ "fl401ManageSupport" - "SUBMITTED_PAID", "CASE_ISSUED","JUDICIAL_REVIEW","PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME" + - "FL401" + From f4bb3f7d6dc9b1de371c2da82dadf7cd6188af16 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Fri, 24 Nov 2023 14:46:54 +0000 Subject: [PATCH 10/17] reviewRaRequestC100 modified to reviewRaRequestsC100 --- .../wa-task-completion-privatelaw-prlapps.dmn | 2 +- .../wa-task-configuration-privatelaw-prlapps.dmn | 12 ++++++------ .../wa-task-initiation-privatelaw-prlapps.dmn | 4 ++-- .../wa-task-permissions-privatelaw-prlapps.dmn | 2 +- .../resources/wa-task-types-privatelaw-prlapps.dmn | 2 +- .../dmn/CamundaTaskCompletionTest.java | 2 +- .../dmn/CamundaTaskInitiationTest.java | 4 ++-- .../dmn/CamundaTaskPermissionTest.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index 0acd9aed..24b1c6c3 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -542,7 +542,7 @@ "c100ManageFlags" - "reviewRaRequestC100" + "reviewRaRequestsC100" "Auto" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 2344c89a..4e4fb61c 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -314,7 +314,7 @@ - "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRaRequestC100","reviewRaRequestsFL401" + "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRaRequestsC100","reviewRaRequestsFL401" "dueDateIntervalDays" @@ -365,7 +365,7 @@ - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRaRequestC100","reviewRaRequestsFL401" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRaRequestsC100","reviewRaRequestsFL401" "priorityDateOriginRef" @@ -535,7 +535,7 @@ - "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","reviewRaRequestC100" + "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","reviewRaRequestsC100" "majorPriority" @@ -571,7 +571,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestC100","reviewRaRequestsFL401" + "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401" "workType" @@ -714,7 +714,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "produceHearingBundleC100", "adminServeOrderC100", "updateHearingActualsC100", "requestSolicitorOrderC100", -"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestC100" +"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100" "roleCategory" @@ -1071,7 +1071,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "reviewRaRequestC100" + "reviewRaRequestsC100" "description" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 8af0421d..a6feb970 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -2376,7 +2376,7 @@ - "reviewRaRequestC100" + "reviewRaRequestsC100" "Review RA request" @@ -2476,7 +2476,7 @@ - "reviewRaRequestC100" + "reviewRaRequestsC100" "Review RA request" diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index cfa47d76..26e89f6d 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -390,7 +390,7 @@ "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestC100" +"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 93533aca..156686e7 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -447,7 +447,7 @@ - - "reviewRaRequestC100" + "reviewRaRequestsC100" "Review RA requests" diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java index 05975a73..447294d4 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java @@ -272,7 +272,7 @@ static Stream scenarioProvider() { "c100ManageFlags", asList( Map.of( - "taskType", "reviewRaRequestC100", + "taskType", "reviewRaRequestsC100", "completionMode", "Auto" ), Map.of() 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 3ff99fb3..607bca4c 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 @@ -407,7 +407,7 @@ static Stream scenarioProvider() { + "}"), singletonList( Map.of( - "taskId", "reviewRaRequestC100", + "taskId", "reviewRaRequestsC100", "name", "Review RA request", "processCategories", "reviewRAC100" ) @@ -439,7 +439,7 @@ static Stream scenarioProvider() { + "}"), singletonList( Map.of( - "taskId", "reviewRaRequestC100", + "taskId", "reviewRaRequestsC100", "name", "Review RA request", "processCategories", "reviewRAC100" ) diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java index 298749b4..e10a4111 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java @@ -556,9 +556,9 @@ void evaluate_task_admin_removeLegalRepresentativeFL401(String taskType) { @SuppressWarnings("checkstyle:indentation") @ParameterizedTest @CsvSource(value = { - "reviewRaRequestC100" + "reviewRaRequestsC100" }) - void evaluate_task_admin_reviewRaRequestC100(String taskType) { + void evaluate_task_admin_reviewRaRequestsC100(String taskType) { VariableMap inputVariables = new VariableMapImpl(); inputVariables.putValue("taskAttributes", Map.of("taskType", taskType)); From 029c54434f33a82392110eda87b7e70344cde8ed Mon Sep 17 00:00:00 2001 From: alokDatta Date: Tue, 28 Nov 2023 17:58:44 +0000 Subject: [PATCH 11/17] Fix for the priority --- ...-task-configuration-privatelaw-prlapps.dmn | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 4e4fb61c..148a8006 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -518,7 +518,7 @@ - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","reviewCorrespondenceFL401","produceHearingBundleFL401","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401", "replyToMessageForCourtAdminFL401", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLAFL401","reviewRaRequestsFL401" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","reviewCorrespondenceFL401","produceHearingBundleFL401","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401", "replyToMessageForCourtAdminFL401", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLAFL401" "majorPriority" @@ -535,7 +535,7 @@ - "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA","reviewRaRequestsC100" + "checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewCorrespondenceC100","produceHearingBundleC100","adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100","reviewDocumentsForSolAndCafcassC100","replyToMessageForLA" "majorPriority" @@ -566,6 +566,23 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 + + + + + + "reviewRaRequestsC100","reviewRaRequestsFL401" + + + "majorPriority" + + + 3000 + + + + + From 31224706cc428a531b6fa80b309c1c1e322a01e2 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Wed, 29 Nov 2023 19:16:27 +0000 Subject: [PATCH 12/17] Manage support WA changes --- ...-task-configuration-privatelaw-prlapps.dmn | 29 +++++++--- .../wa-task-initiation-privatelaw-prlapps.dmn | 12 ++--- ...wa-task-permissions-privatelaw-prlapps.dmn | 4 +- .../wa-task-types-privatelaw-prlapps.dmn | 24 +++++++++ .../dmn/CamundaTaskInitiationTest.java | 12 ++--- .../dmn/CamundaTaskPermissionTest.java | 53 +++++++++++++++++++ .../dmn/CamundaTaskTypeFilterTest.java | 2 +- 7 files changed, 115 insertions(+), 21 deletions(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 148a8006..3594e82a 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -314,7 +314,7 @@ - "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRaRequestsC100","reviewRaRequestsFL401" + "gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","adminServeOrderC100","adminServeOrderFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401" "dueDateIntervalDays" @@ -365,7 +365,7 @@ - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRaRequestsC100","reviewRaRequestsFL401" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA", "replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401" "priorityDateOriginRef" @@ -571,7 +571,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "reviewRaRequestsC100","reviewRaRequestsFL401" + "reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401" "majorPriority" @@ -588,7 +588,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 - "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401" + "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","adminServeOrderC100","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","adminServeOrderCreatedByJudgeC100","adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401" "workType" @@ -709,7 +709,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "checkApplicationFL401", "checkApplicationResubmittedFL401", "sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401", -"produceHearingBundleFL401", "adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "reviewSpecificAccessRequestAdmin", "adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewRaRequestsFL401" +"produceHearingBundleFL401", "adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "reviewSpecificAccessRequestAdmin", "adminServeOrderCreatedByJudgeFL401","removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewRaRequestsFL401","reviewInactiveRaRequestsFL401" "roleCategory" @@ -731,7 +731,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "produceHearingBundleC100", "adminServeOrderC100", "updateHearingActualsC100", "requestSolicitorOrderC100", -"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100" +"reviewCorrespondenceC100", "reviewSpecificAccessRequestCTSC", "adminServeOrderCreatedByJudgeC100","removeLegalRepresentativeC100","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100" "roleCategory" @@ -1117,6 +1117,23 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 + + + + + + "reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401" + + + "description" + + + "[Review inactive RA request](/cases/case-details/${[CASE_REFERENCE]}#Case Flags" + + + + + diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index a6feb970..00f74bb4 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -2476,16 +2476,16 @@ - "reviewRaRequestsC100" + "reviewInactiveRaRequestsC100" - "Review RA request" + "Review inactive RA request" - "reviewRAC100" + "reviewInactiveRAC100" @@ -2526,16 +2526,16 @@ - "reviewRaRequestsFL401" + "reviewInactiveRaRequestsFL401" - "Review RA request" + "Review inactive RA request" - "reviewRAFL401" + "reviewInactiveRAFL401" diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index 26e89f6d..1ef9b812 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -209,7 +209,7 @@ Court admin check application skills permission "checkApplicationFL401", "checkApplicationResubmittedFL401", -"sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401","removeLegalRepresentativeFL401","confidentialCheckSOA","replyToMessageForCourtAdminFL401","reviewRaRequestsFL401" +"sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401","removeLegalRepresentativeFL401","confidentialCheckSOA","replyToMessageForCourtAdminFL401","reviewRaRequestsFL401","reviewInactiveRaRequestsFL401" @@ -390,7 +390,7 @@ "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100" +"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 156686e7..0e6ab655 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -465,6 +465,30 @@ "Review RA requests" + + RRRIC100 + + + + + "reviewInactiveRaRequestsC100" + + + "Review inactive RA requests" + + + + RRRIFL401 + + + + + "reviewInactiveRaRequestsFL401" + + + "Review inactive RA requests" + + 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 607bca4c..ac470c84 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 @@ -439,9 +439,9 @@ static Stream scenarioProvider() { + "}"), singletonList( Map.of( - "taskId", "reviewRaRequestsC100", - "name", "Review RA request", - "processCategories", "reviewRAC100" + "taskId", "reviewInactiveRaRequestsC100", + "name", "Review inactive RA request", + "processCategories", "reviewInactiveRAC100" ) ) ), @@ -455,9 +455,9 @@ static Stream scenarioProvider() { + "}"), singletonList( Map.of( - "taskId", "reviewRaRequestsFL401", - "name", "Review RA request", - "processCategories", "reviewRAFL401" + "taskId", "reviewInactiveRaRequestsFL401", + "name", "Review inactive RA request", + "processCategories", "reviewInactiveRAFL401" ) ) ) diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java index e10a4111..ee0b3475 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskPermissionTest.java @@ -605,6 +605,59 @@ void evaluate_task_admin_reviewRaRequestFL401(String taskType) { ))); } + + @SuppressWarnings("checkstyle:indentation") + @ParameterizedTest + @CsvSource(value = { + "reviewInactiveRaRequestsC100" + }) + void evaluate_task_admin_reviewInactiveRaRequestsC100(String taskType) { + VariableMap inputVariables = new VariableMapImpl(); + inputVariables.putValue("taskAttributes", Map.of("taskType", taskType)); + + DmnDecisionTableResult dmnDecisionTableResult = evaluateDmnTable(inputVariables); + + MatcherAssert.assertThat(dmnDecisionTableResult.getResultList(), is(List.of( + Map.of( + "autoAssignable", false, + "name", "task-supervisor", + "value", "Read,Manage,Complete,Cancel,Assign,Unassign" + ), Map.of( + "autoAssignable", false, + "name", "ctsc", + "roleCategory", "CTSC", + "authorisations", "SKILL:ABA5:CHECKAPPLICATIONC100", + "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim" + ) + ))); + } + + @SuppressWarnings("checkstyle:indentation") + @ParameterizedTest + @CsvSource(value = { + "reviewRaRequestsFL401" + }) + void evaluate_task_admin_reviewInactiveRaRequestFL401(String taskType) { + VariableMap inputVariables = new VariableMapImpl(); + inputVariables.putValue("taskAttributes", Map.of("taskType", taskType)); + + DmnDecisionTableResult dmnDecisionTableResult = evaluateDmnTable(inputVariables); + + MatcherAssert.assertThat(dmnDecisionTableResult.getResultList(), is(List.of( + Map.of( + "autoAssignable", false, + "name", "task-supervisor", + "value", "Read,Manage,Complete,Cancel,Assign,Unassign" + ), Map.of( + "autoAssignable", false, + "name", "hearing-centre-admin", + "roleCategory", "ADMIN", + "authorisations", "SKILL:ABA5:CHECKAPPLICATIONFL401", + "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim" + ) + ))); + } + @ParameterizedTest @CsvSource(value = { "confidentialCheckSOA" 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 e2e11042..1008e48a 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(38)); + assertThat(logic.getRules().size(), is(40)); } } From b3dcd842f76c97e3701fffc30fd46f14d9a68781 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Fri, 1 Dec 2023 13:31:50 +0000 Subject: [PATCH 13/17] Manage support WA changes --- src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 3594e82a..f6fdbdb4 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1128,7 +1128,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "[Review inactive RA request](/cases/case-details/${[CASE_REFERENCE]}#Case Flags" + "(Click on the Case Flags tab to view the inactive flag)" From f7c179c4952da3c203433d5e40c75b3a434e74d6 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Fri, 1 Dec 2023 13:39:26 +0000 Subject: [PATCH 14/17] Manage support WA changes --- src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index f6fdbdb4..551c4445 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1128,7 +1128,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "description" - "(Click on the Case Flags tab to view the inactive flag)" + "[Review inactive case flags](/cases/case-details/${[CASE_REFERENCE]}#Case%20Flags)" From 4090ff459029c2635d8b8b45936f90a5d03dabee Mon Sep 17 00:00:00 2001 From: alokDatta Date: Wed, 24 Jan 2024 10:19:44 +0000 Subject: [PATCH 15/17] Conflict fix --- .../prl/taskconfiguration/dmn/CamundaTaskCompletionTest.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/CamundaTaskCompletionTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java index f8e6cac3..57cc4ebe 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCompletionTest.java @@ -324,7 +324,7 @@ 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(53)); + assertThat(logic.getRules().size(), is(55)); } 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 ce0ae9bd..c7d39cc6 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(12)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(49)); + assertThat(logic.getRules().size(), is(50)); } 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 1008e48a..1bb8f1b9 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(40)); + assertThat(logic.getRules().size(), is(42)); } } From b2e6c992251a395eaf5f986dc71f4840bfee3efa Mon Sep 17 00:00:00 2001 From: Aloknath Datta Date: Fri, 2 Feb 2024 15:07:21 +0000 Subject: [PATCH 16/17] Update suppressions.xml --- config/owasp/suppressions.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index c5c88ba3..c8801e64 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -100,11 +100,6 @@ CVE-2022-22965 CVE-2023-20883 - CVE-2023-34047 - CVE-2023-5072 - CVE-2023-44487 - CVE-2023-42795 - CVE-2023-45648 From 699c2ae93c0eac45bdc9c87b02ca47673d56a25e Mon Sep 17 00:00:00 2001 From: alokDatta Date: Thu, 8 Feb 2024 10:22:47 +0000 Subject: [PATCH 17/17] Conflict fix --- .../wa-task-initiation-privatelaw-prlapps.dmn | 202 +++++++++++------- .../dmn/CamundaTaskConfigurationTest.java | 2 +- 2 files changed, 126 insertions(+), 78 deletions(-) diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index b8cdcae5..abbd8b53 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 @@ - + @@ -4008,203 +4008,251 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewDocsFL401" - - + + "c100RequestSupport" - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + "reviewRaRequestsC100" - + "Review RA request" - + - + "reviewRAC100" - - - "fl401RequestSupport" + + + "c100ManageSupport" - + - + - + - + - + - + - + - + - + - + - + - - "reviewRaRequestsFL401" + + + + + + + + + + + + + + "reviewInactiveRaRequestsC100" - - "Review RA request" + + "Review inactive RA request" - + - - "reviewRAFL401" + + "reviewInactiveRAC100" - - - "c100ManageSupport" + + + "fl401RequestSupport" - + - + - + - + - + - + - + - + - + - + - + - - "reviewInactiveRaRequestsC100" + + + + + + + + + + + + + + "reviewRaRequestsFL401" - - "Review inactive RA request" + + "Review RA request" - + - - "reviewInactiveRAC100" + + "reviewRAFL401" - - + + "fl401ManageSupport" - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + "reviewInactiveRaRequestsFL401" - + "Review inactive RA request" - + - + "reviewInactiveRAFL401" 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 f87c8635..b2d1babc 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(68)); + assertThat(logic.getRules().size(), is(73)); } }