DFPL-2454: Add Attach document to Judicial Message flow (#5655)

* DFPL-2454: Add Attach document to Judicial Message flow * remove old reply message tests, tests no longer required and add tests for document selecting * update controller test + mid event name * update controller test + mid event name * add validation and list population tests * add about to start tests and remove old one + checkstyle * fix old tests and add remove temp fields from controller for email validation * checkstyle * add playwright tests and add back remove transient fields * update to use only existing documents and rename method * fix tests * checkstyle * fix test mock --------- Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com>
hmcts · Nov 20, 2024 · 4817a0a · 4817a0a
1 parent 09169ad
commit 4817a0a
Show file tree

Hide file tree

Showing 25 changed files with 896 additions and 469 deletions.
diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/court-admin.json b/ccd-definition/AuthorisationCaseField/CareSupervision/court-admin.json
@@ -3866,7 +3866,7 @@
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "CaseFieldID": "isMessageRegardingAdditionalApplications",
+    "CaseFieldID": "isMessageRegardingDocuments",
     "UserRole": "caseworker-publiclaw-courtadmin",
     "CRUD": "CRUD"
   },
@@ -3877,6 +3877,20 @@
     "UserRole": "caseworker-publiclaw-courtadmin",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "documentTypesDynamicList",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRUD"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "documentDynamicList",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRUD"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
@@ -3898,6 +3912,13 @@
     "UserRole": "caseworker-publiclaw-courtadmin",
     "CRUD": "CRD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "attachDocumentLabel",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRD"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/gatekeeper.json b/ccd-definition/AuthorisationCaseField/CareSupervision/gatekeeper.json
@@ -2571,7 +2571,21 @@
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "CaseFieldID": "isMessageRegardingAdditionalApplications",
+    "CaseFieldID": "isMessageRegardingDocuments",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRUD"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "documentTypesDynamicList",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRUD"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "documentDynamicList",
     "UserRole": "caseworker-publiclaw-gatekeeper",
     "CRUD": "CRUD"
   },
@@ -3086,6 +3100,13 @@
     "UserRole": "caseworker-publiclaw-gatekeeper",
     "CRUD": "CRD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "attachDocumentLabel",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRD"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/judiciary.json b/ccd-definition/AuthorisationCaseField/CareSupervision/judiciary.json
@@ -2746,7 +2746,21 @@
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "CaseFieldID": "isMessageRegardingAdditionalApplications",
+    "CaseFieldID": "isMessageRegardingDocuments",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRUD"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "documentTypesDynamicList",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRUD"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "documentDynamicList",
     "UserRole": "caseworker-publiclaw-judiciary",
     "CRUD": "CRUD"
   },
@@ -3268,6 +3282,13 @@
     "UserRole": "caseworker-publiclaw-judiciary",
     "CRUD": "CRD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "attachDocumentLabel",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRD"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/CaseEventToFields/CareSupervision/messageJudge.json b/ccd-definition/CaseEventToFields/CareSupervision/messageJudge.json
@@ -3,93 +3,130 @@
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
-    "CaseFieldID": "isJudiciary",
-    "PageDisplayOrder": 2,
+    "CaseFieldID": "hasAdditionalApplications",
     "PageFieldDisplayOrder": 1,
-    "PageID": "NewMessageMetaData",
     "DisplayContext": "READONLY",
+    "PageID": "AttachmentSelectorPage",
     "ShowSummaryChangeOption": "N",
-    "FieldShowCondition": "hasAdditionalApplications=\"DO NOT SHOW\""
+    "PageDisplayOrder": 1,
+    "FieldShowCondition": "isMessageRegardingDocuments=\"DO_NOT_SHOW\""
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
-    "CaseFieldID": "hasAdditionalApplications",
+    "CaseFieldID": "isMessageRegardingDocuments",
+    "PageFieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY",
+    "PageID": "AttachmentSelectorPage",
+    "ShowSummaryChangeOption": "Y",
+    "PageDisplayOrder": 1
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "messageJudgeOrLegalAdviser",
+    "CaseFieldID": "documentTypesDynamicList",
+    "PageFieldDisplayOrder": 3,
+    "PageID": "AttachmentSelectorPage",
+    "DisplayContext": "MANDATORY",
+    "ShowSummaryChangeOption": "Y",
+    "PageDisplayOrder": 1,
+    "FieldShowCondition": "isMessageRegardingDocuments=\"DOCUMENT\"",
+    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/message-judge/populate-lists/mid-event"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "messageJudgeOrLegalAdviser",
+    "CaseFieldID": "attachDocumentLabel",
     "PageFieldDisplayOrder": 1,
     "DisplayContext": "READONLY",
-    "PageID": "NewMessageMetaData",
+    "PageLabel": "Attachments",
+    "PageID": "MessageDocumentSelector",
     "ShowSummaryChangeOption": "N",
     "PageDisplayOrder": 2,
-    "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"DO_NOT_SHOW\"",
-    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/message-judge/mid-event"
+    "PageShowCondition": "isMessageRegardingDocuments!=\"NONE\"",
+    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/message-judge/populate-document-labels/mid-event"
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
-    "CaseFieldID": "isMessageRegardingAdditionalApplications",
+    "CaseFieldID": "additionalApplicationsDynamicList",
     "PageFieldDisplayOrder": 2,
     "DisplayContext": "MANDATORY",
-    "PageID": "NewMessageMetaData",
+    "PageID": "MessageDocumentSelector",
     "ShowSummaryChangeOption": "Y",
     "PageDisplayOrder": 2,
-    "FieldShowCondition": "hasAdditionalApplications=\"Yes\""
+    "FieldShowCondition": "isMessageRegardingDocuments=\"APPLICATION\""
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
-    "CaseFieldID": "additionalApplicationsDynamicList",
+    "CaseFieldID": "documentDynamicList",
     "PageFieldDisplayOrder": 3,
     "DisplayContext": "MANDATORY",
-    "PageID": "NewMessageMetaData",
+    "PageID": "MessageDocumentSelector",
     "ShowSummaryChangeOption": "Y",
     "PageDisplayOrder": 2,
-    "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"Yes\""
+    "FieldShowCondition": "isMessageRegardingDocuments=\"DOCUMENT\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "messageJudgeOrLegalAdviser",
+    "CaseFieldID": "relatedDocumentsLabel",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "NewMessageMetaData",
+    "ShowSummaryChangeOption": "N",
+    "PageDisplayOrder": 3,
+    "FieldShowCondition": "isMessageRegardingDocuments=\"DOCUMENT\" OR isMessageRegardingDocuments=\"APPLICATION\""
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
     "CaseFieldID": "judicialMessageMetaData",
-    "PageFieldDisplayOrder": 4,
+    "PageFieldDisplayOrder": 2,
     "DisplayContext": "COMPLEX",
     "PageID": "NewMessageMetaData",
     "ShowSummaryChangeOption": "Y",
-    "PageDisplayOrder": 2
+    "PageDisplayOrder": 3
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
-    "CaseFieldID": "nextHearingLabel",
-    "PageFieldDisplayOrder": 1,
+    "CaseFieldID": "isJudiciary",
+    "PageDisplayOrder": 3,
+    "PageFieldDisplayOrder": 3,
+    "PageID": "NewMessageMetaData",
     "DisplayContext": "READONLY",
-    "PageID": "NewMessageNote",
     "ShowSummaryChangeOption": "N",
-    "PageDisplayOrder": 3
+    "FieldShowCondition": "hasAdditionalApplications=\"DO NOT SHOW\""
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
-    "CaseFieldID": "relatedDocumentsLabel",
-    "PageFieldDisplayOrder": 2,
+    "CaseFieldID": "nextHearingLabel",
+    "PageFieldDisplayOrder": 4,
     "DisplayContext": "READONLY",
-    "PageID": "NewMessageNote",
+    "PageID": "NewMessageMetaData",
     "ShowSummaryChangeOption": "N",
-    "PageDisplayOrder": 3,
-    "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"Yes\""
+    "PageDisplayOrder": 3
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
     "CaseFieldID": "judicialMessageNote",
-    "PageFieldDisplayOrder": 4,
+    "PageFieldDisplayOrder": 5,
     "DisplayContext": "MANDATORY",
-    "PageID": "NewMessageNote",
+    "PageID": "NewMessageMetaData",
     "ShowSummaryChangeOption": "Y",
     "PageDisplayOrder": 3
   },
@@ -98,25 +135,24 @@
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
     "CaseFieldID": "latestRoleSent",
-    "PageFieldDisplayOrder": 5,
+    "PageFieldDisplayOrder": 6,
     "DisplayContext": "MANDATORY",
-    "PageID": "NewMessageNote",
+    "PageID": "NewMessageMetaData",
     "ShowSummaryChangeOption": "N",
     "PageDisplayOrder": 3,
     "Publish": "Y",
-    "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"DO_NOT_SHOW\""
+    "FieldShowCondition": "isMessageRegardingDocuments=\"DO_NOT_SHOW\""
   },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "messageJudgeOrLegalAdviser",
     "CaseFieldID": "court",
-    "PageFieldDisplayOrder": 100,
+    "PageFieldDisplayOrder": 7,
     "DisplayContext": "READONLY",
-    "PageID": "NewMessageNote",
+    "PageID": "NewMessageMetaData",
     "PageDisplayOrder": 3,
-    "PageColumnNumber": 1,
     "Publish": "Y",
-    "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"DO_NOT_SHOW\""
+    "FieldShowCondition": "isMessageRegardingDocuments=\"DO_NOT_SHOW\""
   }
 ]
diff --git a/ccd-definition/CaseField/CareSupervision/messageJudge.json b/ccd-definition/CaseField/CareSupervision/messageJudge.json
@@ -11,9 +11,28 @@
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "ID": "isMessageRegardingAdditionalApplications",
-    "Label": "Is it about an Application?",
-    "FieldType": "YesOrNo",
+    "ID": "isMessageRegardingDocuments",
+    "Label": "Is it about an Application or Document?",
+    "FieldType": "FixedRadioList",
+    "FieldTypeParameter": "MessageAttachmentSelector",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "attachDocumentLabel",
+    "Label": "Attach a document or application",
+    "FieldType": "TextArea",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "documentDynamicList",
+    "FieldType": "DynamicList",
+    "Label": "Which document?",
     "SecurityClassification": "Public",
     "Searchable": "N"
   },
@@ -26,6 +45,15 @@
     "SecurityClassification": "Public",
     "Searchable": "N"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "documentTypesDynamicList",
+    "FieldType": "DynamicList",
+    "Label": "Document type",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/FixedLists/CareSupervision/MessageAttachmentSelector.json b/ccd-definition/FixedLists/CareSupervision/MessageAttachmentSelector.json
@@ -0,0 +1,23 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "MessageAttachmentSelector",
+    "ListElementCode": "DOCUMENT",
+    "ListElement": "Document",
+    "DisplayOrder": 1
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "MessageAttachmentSelector",
+    "ListElementCode": "APPLICATION",
+    "ListElement": "Application",
+    "DisplayOrder": 2
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "MessageAttachmentSelector",
+    "ListElementCode": "NONE",
+    "ListElement": "No attachment",
+    "DisplayOrder": 3
+  }
+]