Revert changes to caseworker events, knock on effect to field permiss…

…ions (#960) * Revert "ADOP-2544 removal of states in case list filters (#954)" This reverts commit 1ba0ead. * KEEP the state + citizen event changes * keep readme too * keep parts of revert around draft states * checkstyle
hmcts · Nov 28, 2024 · 50e533a · 50e533a
1 parent 5b2d466
commit 50e533a
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 24 deletions.
diff --git a/...a/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseWorkerManageHearing.java b/...a/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseWorkerManageHearing.java
@@ -17,6 +17,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.Parent;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.ManageHearingOptions;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.ManageHearingDetails;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.document.CaseDataDocumentService;
@@ -113,12 +114,13 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_MANAGE_HEARING)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(MANAGE_HEARINGS)
                                    .description(MANAGE_HEARINGS)
                                    .showSummary()
                                    .aboutToSubmitCallback(this::aboutToSubmit)
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE));
     }
 
     public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(

diff --git a/.../uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerAmendApplicant.java b/.../uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerAmendApplicant.java
@@ -8,6 +8,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 
 /**
@@ -37,10 +38,11 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_AMEND_APPLICANT)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(AMEND_APPLICANT_DETAILS)
                                    .description(AMEND_APPLICANT_DETAILS)
                                    .showSummary()
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE));
     }
 }
diff --git a/.../java/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerAmendCase.java b/.../java/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerAmendCase.java
@@ -8,6 +8,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 
 /**
@@ -38,10 +39,11 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_AMEND_CASE)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(AMEND_CASE_DETAILS)
                                    .description(AMEND_CASE_DETAILS)
                                    .showSummary()
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE));
     }
 }
diff --git a/...cts/reform/adoption/adoptioncase/caseworker/event/CaseworkerAmendOtherPartiesDetails.java b/...cts/reform/adoption/adoptioncase/caseworker/event/CaseworkerAmendOtherPartiesDetails.java
@@ -12,6 +12,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.YesNoNotSure;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 
@@ -35,10 +36,12 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
     public PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_AMEND_OTHER_PARTIES_DETAILS)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(AMEND_OTHER_PARTIES_DETAILS)
                                    .description(AMEND_OTHER_PARTIES_DETAILS)
                                    .showSummary()
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }
 

diff --git a/...n/java/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerCaseNote.java b/...n/java/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerCaseNote.java
@@ -13,6 +13,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseNote;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.idam.IdamService;
@@ -61,10 +62,12 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_ADD_CASE_NOTE)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(ADD_CASE_NOTE)
                                    .description(ADD_CASE_NOTE)
                                    .showSummary()
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }
 

diff --git a/...gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerCheckAndSendOrders.java b/...gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerCheckAndSendOrders.java
@@ -18,6 +18,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.ManageOrdersData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.OrderCheckAndSend;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.AdoptionOrderData;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.MessageSendDetails;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.DirectionsOrderData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.OrderData;
@@ -98,10 +99,12 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_CHECK_AND_SEND_ORDERS)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(check_and_send_orders)
                                    .showSummary()
                                    .aboutToStartCallback(this::aboutToStart)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }
 

diff --git a/...va/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerManageOrders.java b/...va/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerManageOrders.java
@@ -18,6 +18,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.ManageOrdersData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.DirectionsOrderData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.LanguagePreference;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.document.CaseDataDocumentService;
@@ -83,12 +84,13 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_MANAGE_ORDERS)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(MANAGE_ORDERS)
                                    .description(MANAGE_ORDERS)
                                    .showSummary()
                                    .aboutToSubmitCallback(this::aboutToSubmit)
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE));
     }
 
     /**

diff --git a/...a/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerRequestAnnexA.java b/...a/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerRequestAnnexA.java
@@ -8,6 +8,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 
@@ -26,11 +27,12 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_AMEND_CASE)
-                                   .forStates(State.Draft)
+                                   .forStates(State.LaSubmitted)
                                    .name("Request Annex-A")
                                    .description("Request Annex-A")
                                    .showSummary()
                                    .showEventNotes()
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE));
     }
 }
diff --git a/...uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerReviewDocuments.java b/...uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerReviewDocuments.java
@@ -12,6 +12,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.document.model.AdoptionDocument;
@@ -56,12 +57,12 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_REVIEW_DOCUMENT)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(SCANNED_DOCUMENT)
                                    .description(SCANNED_DOCUMENT)
                                    .showSummary()
                                    .aboutToSubmitCallback(this::aboutToSubmit)
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER));
     }
 
     public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(

diff --git a/...hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerSeekFurtherInformation.java b/...hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerSeekFurtherInformation.java
@@ -18,6 +18,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.LanguagePreference;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.document.CaseDataDocumentService;
@@ -94,10 +95,12 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_SEEK_FURTHER_INFORMATION)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(SEEK_FURTHER_INFORMATION_HEADING)
                                    .description(SEEK_FURTHER_INFORMATION_HEADING)
                                    .showSummary()
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToStartCallback(this::seekFurtherInformationData)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }

diff --git a/...ava/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerSendOrReply.java b/...ava/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerSendOrReply.java
@@ -12,6 +12,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.idam.IdamService;
@@ -46,10 +47,12 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_SEND_OR_REPLY)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(SEND_OR_REPLY_HEADING)
                                    .description(SEND_OR_REPLY_HEADING)
                                    .showSummary()
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToStartCallback(this::beforeStartEvent)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }

diff --git a/...a/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerTransferCourt.java b/...a/uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerTransferCourt.java
@@ -10,6 +10,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 
@@ -33,10 +34,12 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_TRANSFER_COURT)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(TRANSFER_COURT_HEADING)
                                    .description(TRANSFER_COURT_HEADING)
                                    .showSummary()
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }
 

diff --git a/.../uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerUploadDocument.java b/.../uk/gov/hmcts/reform/adoption/adoptioncase/caseworker/event/CaseworkerUploadDocument.java
@@ -12,6 +12,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 import uk.gov.hmcts.reform.adoption.document.model.AdoptionUploadDocument;
@@ -51,12 +52,13 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_UPLOAD_DOCUMENT)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(MANAGE_DOCUMENT)
                                    .description(MANAGE_DOCUMENT)
                                    .showSummary()
                                    .aboutToSubmitCallback(this::aboutToSubmit)
-        );
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE));
     }
 
     /**

diff --git a/src/main/java/uk/gov/hmcts/reform/adoption/adoptioncase/event/CaseWorkerAllocateJudge.java b/src/main/java/uk/gov/hmcts/reform/adoption/adoptioncase/event/CaseWorkerAllocateJudge.java
@@ -11,6 +11,7 @@
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
+import uk.gov.hmcts.reform.adoption.adoptioncase.model.access.Permissions;
 import uk.gov.hmcts.reform.adoption.common.ccd.CcdPageConfiguration;
 import uk.gov.hmcts.reform.adoption.common.ccd.PageBuilder;
 
@@ -36,10 +37,12 @@ public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
     private PageBuilder addEventConfig(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
         return new PageBuilder(configBuilder
                                    .event(CASEWORKER_ALLOCATE_JUDGE)
-                                   .forAllStates()
+                                   .forStates(State.LaSubmitted)
                                    .name(ALLOCATE_JUDGE)
                                    .description(ALLOCATE_JUDGE)
                                    .showSummary()
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.CASE_WORKER)
+                                   .grant(Permissions.CREATE_READ_UPDATE, UserRole.DISTRICT_JUDGE)
                                    .aboutToSubmitCallback(this::aboutToSubmit));
     }