diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index 6f74a6e9..bfca151f 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -682,7 +682,7 @@ - "manageOrders","serviceOfApplication","createBundle","adminEditAndApproveAnOrder","editAndApproveAnOrder","returnApplication","sendOrReplyToMessages","adminRemoveLegalRepresentativeC100","adminRemoveLegalRepresentativeFL401","c100ManageFlags","fl401ManageFlags","statementOfService" + "manageOrders","serviceOfApplication","createBundle","adminEditAndApproveAnOrder","returnApplication","sendOrReplyToMessages","adminRemoveLegalRepresentativeC100","adminRemoveLegalRepresentativeFL401","c100ManageFlags","fl401ManageFlags","statementOfService" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index ef26a200..43a59e21 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -755,10 +755,10 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "checkApplicationFL401", "checkApplicationResubmittedFL401", -"sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401", +"sendToGateKeeperFL401", "sendToGateKeeperResubmittedFL401", "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "produceHearingBundleFL401", "produceHearingBundleC100", "serviceOfApplicationFL401","adminServeOrderFL401", "updateHearingActualsFL401", "requestSolicitorOrderFL401", "reviewCorrespondenceFL401", "serviceOfApplicationC100","adminServeOrderC100", "updateHearingActualsC100", "requestSolicitorOrderC100", -"reviewCorrespondenceC100", "reviewSpecificAccessRequestAdmin", "removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewDocumentsForSolAndCafcassC100","reviewAdminOrderByManager","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","reviewRaRequestsFL401","reviewInactiveRaRequestsFL401","recreateApplicationPack","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","confidentialCheckSOA","completefl416AndServe" +"reviewCorrespondenceC100", "reviewSpecificAccessRequestAdmin", "removeLegalRepresentativeFL401","reviewDocumentsForSolAndCafcassFL401","reviewDocumentsForSolAndCafcassC100","reviewAdminOrderByManager","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","reviewRaRequestsFL401","reviewInactiveRaRequestsFL401","recreateApplicationPack","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","confidentialCheckSOA","completefl416AndServe","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100","listWithoutNoticeHearingC100" "roleCategory" @@ -777,8 +777,7 @@ caseData.allegationsOfHarmYesNo="Yes") then 3000 else 5000 "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", -"reviewSpecificAccessRequestCTSC","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100","listWithoutNoticeHearingC100" +"reviewSpecificAccessRequestCTSC" "roleCategory" diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index f729f0d0..e11bad7d 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 @@ - + @@ -600,8 +600,7 @@ CTSC task permissions "checkApplicationC100", "checkApplicationResubmittedC100", -"addCaseNumber", "addCaseNumberResubmitted", -"sendToGateKeeperC100", "sendToGateKeeperResubmittedC100","removeLegalRepresentativeC100","replyToMessageForCourtAdminC100","reviewRaRequestsC100","reviewInactiveRaRequestsC100","listWithoutNoticeHearingC100" +"addCaseNumber", "addCaseNumberResubmitted" @@ -628,6 +627,36 @@ false + + CTSC task permissions + + "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100", "removeLegalRepresentativeC100", "replyToMessageForCourtAdminC100", "reviewRaRequestsC100", "reviewInactiveRaRequestsC100", "listWithoutNoticeHearingC100" + + + + + + + + + "hearing-centre-admin" + + + "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn" + + + "ADMIN" + + + "SKILL:ABA5:CHECKAPPLICATIONC100" + + + + + + false + + CTSC task permissions 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 8d140fda..cb761d41 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 @@ -218,8 +218,7 @@ static Stream scenarioProvider() { Map.of( "taskType", "reviewAdminOrderByManager", "completionMode", "Auto" - ), - Map.of() + ) ) ), Arguments.of( 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 c79f6362..35c62d0b 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 @@ -411,8 +411,7 @@ void evaluate_task_admin_reviewCorrespondencefl401(String taskType) { @ParameterizedTest @CsvSource(value = { "checkApplicationC100", "checkApplicationResubmittedC100", - "addCaseNumber", "addCaseNumberResubmitted", - "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100" + "addCaseNumber", "addCaseNumberResubmitted" }) void evaluate_task_ctsc_checkApplicationc100(String taskType) { VariableMap inputVariables = new VariableMapImpl(); @@ -435,6 +434,32 @@ void evaluate_task_ctsc_checkApplicationc100(String taskType) { ))); } + @SuppressWarnings("checkstyle:indentation") + @ParameterizedTest + @CsvSource(value = { + "sendToGateKeeperC100", "sendToGateKeeperResubmittedC100" + }) + void evaluate_task_ctsc_sendToGateKeeperc100(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( + "name", "task-supervisor", + "value", "Read,Manage,Complete,Cancel,Assign,Unassign", + "autoAssignable", false + ), Map.of( + "autoAssignable", false, + "name", "hearing-centre-admin", + "roleCategory", "ADMIN", + "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn", + "authorisations","SKILL:ABA5:CHECKAPPLICATIONC100" + ) + ))); + } + @SuppressWarnings("checkstyle:indentation") @ParameterizedTest @CsvSource(value = { @@ -557,8 +582,8 @@ void evaluate_task_admin_removeLegalRepresentativeC100(String taskType) { "value", "Read,Manage,Complete,Cancel,Assign,Unassign" ), Map.of( "autoAssignable", false, - "name", "ctsc", - "roleCategory", "CTSC", + "name", "hearing-centre-admin", + "roleCategory", "ADMIN", "authorisations", "SKILL:ABA5:CHECKAPPLICATIONC100", "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn" ) @@ -609,8 +634,8 @@ void evaluate_task_admin_reviewRaRequestsC100(String taskType) { "value", "Read,Manage,Complete,Cancel,Assign,Unassign" ), Map.of( "autoAssignable", false, - "name", "ctsc", - "roleCategory", "CTSC", + "name", "hearing-centre-admin", + "roleCategory", "ADMIN", "authorisations", "SKILL:ABA5:CHECKAPPLICATIONC100", "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn" ) @@ -662,8 +687,8 @@ void evaluate_task_admin_reviewInactiveRaRequestsC100(String taskType) { "value", "Read,Manage,Complete,Cancel,Assign,Unassign" ), Map.of( "autoAssignable", false, - "name", "ctsc", - "roleCategory", "CTSC", + "name", "hearing-centre-admin", + "roleCategory", "ADMIN", "authorisations", "SKILL:ABA5:CHECKAPPLICATIONC100", "value", "Read,Own,UnclaimAssign,Claim,Unclaim,UnassignClaim,CompleteOwn" ) @@ -795,6 +820,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(7)); - assertThat(logic.getRules().size(), is(25)); + assertThat(logic.getRules().size(), is(26)); } }