Cafcass api fix conflict (#5538)

* Async test verifications (fixing flaky async tests) (#5519) * fix running tests locally without the env vars * Add timeouts for async tests * DFPL-1269 Non-molestation order (FL404A) (#5455) * git dfpl1269 * fix test * fix check style * fix manageOrdersRecitalsAndPreamblesOptional and add unit test * allow selecting appllicant and respondent * fix test * Update OrderTest.java * update notification * fix check style * fix code check * Update NotifyTemplates.java * Update NonMolestationOrderEventHandler.java * Upped timeout to 110 seconds (#5528) * Update statement of truth wording - DFPL-2458 (#5502) * Update statement of truth wording at case submission and on C1 and C110a applications. * Update wording for tests. * Update wording to be two separated statements * Update Welsh C110a template and update order of wording in statement of truth. * Remove sentence * Remove sentence in welsh --------- Co-authored-by: Qasim Nawaz <[email protected]> Co-authored-by: Qasim Nawaz <[email protected]> Co-authored-by: Braimah101 <[email protected]> * Rename CFV Category - Judgments/facts and reasons (#5530) * NightlyUiTestFix (#5536) * FixCaseFlagAPICaseCreationAssertion * FixGatekeepingJudgesSearchListAndShareCase * FixGatekeepingJudgesSearchListAndShareCase --------- Co-authored-by: Daniel Catchpole <[email protected]> Co-authored-by: gavinkeys <[email protected]> Co-authored-by: jamesrferguson1 <[email protected]> Co-authored-by: Qasim Nawaz <[email protected]> Co-authored-by: Qasim Nawaz <[email protected]> Co-authored-by: Braimah101 <[email protected]> Co-authored-by: prabhamuthu15 <[email protected]>
hmcts · Aug 14, 2024 · d4b16fc · d4b16fc
1 parent 8d404e7
commit d4b16fc
Show file tree

Hide file tree

Showing 59 changed files with 1,197 additions and 909 deletions.
diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/court-admin.json b/ccd-definition/AuthorisationCaseField/CareSupervision/court-admin.json
@@ -3674,6 +3674,13 @@
     "UserRole": "caseworker-publiclaw-courtadmin",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersRecitalsAndPreamblesOptional",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRUD"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
@@ -5879,6 +5886,27 @@
     "UserRole": "caseworker-publiclaw-courtadmin",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrder",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderApplicant",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderRespondent",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/eps-managing.json b/ccd-definition/AuthorisationCaseField/CareSupervision/eps-managing.json
@@ -440,6 +440,13 @@
     "UserRole": "[EPSMANAGING]",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRole": "[EPSMANAGING]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/gatekeeper.json b/ccd-definition/AuthorisationCaseField/CareSupervision/gatekeeper.json
@@ -3688,6 +3688,13 @@
     "UserRole": "caseworker-publiclaw-gatekeeper",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersRecitalsAndPreamblesOptional",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
@@ -4829,6 +4836,27 @@
     "UserRole": "caseworker-publiclaw-gatekeeper",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrder",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderApplicant",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderRespondent",
+    "UserRole": "caseworker-publiclaw-gatekeeper",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/judiciary.json b/ccd-definition/AuthorisationCaseField/CareSupervision/judiciary.json
@@ -3954,6 +3954,13 @@
     "UserRole": "caseworker-publiclaw-judiciary",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersRecitalsAndPreamblesOptional",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
@@ -5480,6 +5487,27 @@
     "UserRole": "caseworker-publiclaw-judiciary",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrder",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderApplicant",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderRespondent",
+    "UserRole": "caseworker-publiclaw-judiciary",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/la-barrister.json b/ccd-definition/AuthorisationCaseField/CareSupervision/la-barrister.json
@@ -230,6 +230,13 @@
     "UserRole": "[LABARRISTER]",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRole": "[LABARRISTER]",
+    "CRUD": "R"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/la-managing.json b/ccd-definition/AuthorisationCaseField/CareSupervision/la-managing.json
@@ -538,6 +538,13 @@
     "UserRole": "[LAMANAGING]",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRole": "[LAMANAGING]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/la-shared.json b/ccd-definition/AuthorisationCaseField/CareSupervision/la-shared.json
@@ -230,6 +230,13 @@
     "UserRole": "[LASHARED]",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRole": "[LASHARED]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/la-solicitor.json b/ccd-definition/AuthorisationCaseField/CareSupervision/la-solicitor.json
@@ -748,6 +748,13 @@
     "UserRole": "[LASOLICITOR]",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRole": "[LASOLICITOR]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/solicitor.json b/ccd-definition/AuthorisationCaseField/CareSupervision/solicitor.json
@@ -1967,6 +1967,15 @@
     ],
     "CRUD": "R"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRoles": [
+      "[SOLICITORA]", "[CHILDSOLICITORA]"
+    ],
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/AuthorisationCaseField/CareSupervision/system-update.json b/ccd-definition/AuthorisationCaseField/CareSupervision/system-update.json
@@ -727,6 +727,13 @@
     "UserRole": "caseworker-publiclaw-systemupdate",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "submissionDeclaration",
+    "UserRole": "caseworker-publiclaw-systemupdate",
+    "CRUD": "CRUD"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
@@ -2499,6 +2506,13 @@
     "UserRole": "caseworker-publiclaw-systemupdate",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersRecitalsAndPreamblesOptional",
+    "UserRole": "caseworker-publiclaw-systemupdate",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
@@ -3213,6 +3227,27 @@
     "UserRole": "caseworker-publiclaw-systemupdate",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrder",
+    "UserRole": "caseworker-publiclaw-systemupdate",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderApplicant",
+    "UserRole": "caseworker-publiclaw-systemupdate",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "manageOrdersNonMolestationOrderRespondent",
+    "UserRole": "caseworker-publiclaw-systemupdate",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

diff --git a/ccd-definition/CaseEventToFields/CareSupervision/manageOrders/5_orderDetailsSection.json b/ccd-definition/CaseEventToFields/CareSupervision/manageOrders/5_orderDetailsSection.json
@@ -9,7 +9,7 @@
     "PageID": "OrderDetails",
     "PageDisplayOrder": 6,
     "PageColumnNumber": 1,
-    "PageShowCondition": "orderTempQuestions.furtherDirections=\"YES\" OR orderTempQuestions.orderDetails=\"YES\" OR orderTempQuestions.needSealing=\"YES\" OR orderTempQuestions.uploadOrderFile=\"YES\" OR orderTempQuestions.childPlacementQuestions=\"YES\" OR orderTempQuestions.childPlacementQuestionsForBlankOrder=\"YES\" OR orderTempQuestions.manageOrdersEducationSupervision=\"YES\" OR orderTempQuestions.manageOrdersVaryOrExtendSupervisionOrder=\"YES\" OR orderTempQuestions.refuseContactQuestions=\"YES\"  OR orderTempQuestions.manageOrdersChildAssessment=\"YES\" OR orderTempQuestions.leaveToChangeChildSurname=\"YES\" OR orderTempQuestions.partyAllowedContactsAndConditions=\"YES\" OR orderTempQuestions.declarationOfParentage=\"YES\" OR orderTempQuestions.partyAllowedContactsAndConditions=\"YES\" OR orderTempQuestions.manageOrdersTransparencyOrder=\"YES\"",
+    "PageShowCondition": "orderTempQuestions.furtherDirections=\"YES\" OR orderTempQuestions.orderDetails=\"YES\" OR orderTempQuestions.needSealing=\"YES\" OR orderTempQuestions.uploadOrderFile=\"YES\" OR orderTempQuestions.childPlacementQuestions=\"YES\" OR orderTempQuestions.childPlacementQuestionsForBlankOrder=\"YES\" OR orderTempQuestions.manageOrdersEducationSupervision=\"YES\" OR orderTempQuestions.manageOrdersVaryOrExtendSupervisionOrder=\"YES\" OR orderTempQuestions.refuseContactQuestions=\"YES\"  OR orderTempQuestions.manageOrdersChildAssessment=\"YES\" OR orderTempQuestions.leaveToChangeChildSurname=\"YES\" OR orderTempQuestions.partyAllowedContactsAndConditions=\"YES\" OR orderTempQuestions.declarationOfParentage=\"YES\" OR orderTempQuestions.partyAllowedContactsAndConditions=\"YES\" OR orderTempQuestions.nonMolestationOrder=\"YES\" OR orderTempQuestions.manageOrdersTransparencyOrder=\"YES\"",
     "FieldShowCondition": "manageOrdersOperation=\"CREATE\"",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/manage-orders/order-details/mid-event",
     "ShowSummaryChangeOption": "N"
@@ -1416,5 +1416,57 @@
     "PageColumnNumber": 1,
     "FieldShowCondition": "orderTempQuestions.manageOrdersTransparencyOrder=\"YES\"",
     "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "manageOrders",
+    "CaseFieldID": "manageOrdersNonMolestationOrderApplicant",
+    "PageFieldDisplayOrder": 69,
+    "DisplayContext": "MANDATORY",
+    "PageID": "OrderDetails",
+    "PageDisplayOrder": 6,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "orderTempQuestions.nonMolestationOrder=\"YES\"",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "manageOrders",
+    "CaseFieldID": "manageOrdersNonMolestationOrderRespondent",
+    "PageFieldDisplayOrder": 70,
+    "DisplayContext": "MANDATORY",
+    "PageID": "OrderDetails",
+    "PageDisplayOrder": 6,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "orderTempQuestions.nonMolestationOrder=\"YES\"",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "manageOrders",
+    "CaseFieldID": "manageOrdersRecitalsAndPreamblesOptional",
+    "PageFieldDisplayOrder": 71,
+    "DisplayContext": "OPTIONAL",
+    "PageID": "OrderDetails",
+    "PageDisplayOrder": 6,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "orderTempQuestions.nonMolestationOrder=\"YES\"",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "manageOrders",
+    "CaseFieldID": "manageOrdersNonMolestationOrder",
+    "PageFieldDisplayOrder": 72,
+    "DisplayContext": "MANDATORY",
+    "PageID": "OrderDetails",
+    "PageDisplayOrder": 6,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "orderTempQuestions.nonMolestationOrder=\"YES\"",
+    "ShowSummaryChangeOption": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEventToFields/CareSupervision/submitApplication.json b/ccd-definition/CaseEventToFields/CareSupervision/submitApplication.json
@@ -35,12 +35,24 @@
     "PageColumnNumber": 1,
     "ShowSummaryChangeOption": "Y"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "submitApplication",
+    "CaseFieldID": "submissionDeclaration",
+    "PageFieldDisplayOrder": 5,
+    "DisplayContext": "READONLY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "Y"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "submitApplication",
     "CaseFieldID": "submissionConsentLabel",
-    "PageFieldDisplayOrder": 4,
+    "PageFieldDisplayOrder": 6,
     "DisplayContext": "READONLY",
     "PageID": 1,
     "PageDisplayOrder": 1,
@@ -52,7 +64,7 @@
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "submitApplication",
     "CaseFieldID": "submissionConsent",
-    "PageFieldDisplayOrder": 5,
+    "PageFieldDisplayOrder": 7,
     "DisplayContext": "MANDATORY",
     "PageID": 1,
     "PageDisplayOrder": 1,
@@ -64,7 +76,7 @@
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "submitApplication",
     "CaseFieldID": "displayAmountToPay",
-    "PageFieldDisplayOrder": 6,
+    "PageFieldDisplayOrder": 8,
     "DisplayContext": "READONLY",
     "PageID": 1,
     "PageDisplayOrder": 1,
@@ -77,7 +89,7 @@
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "submitApplication",
     "CaseFieldID": "amountToPay",
-    "PageFieldDisplayOrder": 7,
+    "PageFieldDisplayOrder": 9,
     "DisplayContext": "READONLY",
     "PageID": 1,
     "PageDisplayOrder": 1,
@@ -90,7 +102,7 @@
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "CaseEventID": "submitApplication",
     "CaseFieldID": "hearing",
-    "PageFieldDisplayOrder": 8,
+    "PageFieldDisplayOrder": 10,
     "DisplayContext": "READONLY",
     "PageID": 1,
     "PageDisplayOrder": 1,