Merge branch 'master' into feat/CIV-15229

hmcts · Oct 24, 2024 · 79358a4 · 79358a4
2 parents 64214b1 + da5bb2c
commit 79358a4
Show file tree

Hide file tree

Showing 36 changed files with 226 additions and 143 deletions.
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-COSC-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-COSC-nonprod.json
@@ -18,6 +18,25 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "GENERATE_COSC_DOCUMENT",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-staff"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL",
     "CaseEventID": "CREATE_DASHBOARD_NOTIFICATION_COSC_NOT_PAID_FULL_CLAIMANT",

diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-CUI-CP-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-CUI-CP-nonprod.json
@@ -298,5 +298,89 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "NO_REMISSION_HWF",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "PARTIAL_REMISSION_HWF_GRANTED",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "MORE_INFORMATION_HWF",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "FULL_REMISSION_HWF",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "UPDATE_HELP_WITH_FEE_NUMBER",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "INVALID_HWF_REFERENCE",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "FEE_PAYMENT_OUTCOME",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
   }
 ]
diff --git a/...isationCaseEvent-amendBundle-nonprod.json → ...t/AuthorisationCaseEvent-amendBundle.json b/...isationCaseEvent-amendBundle-nonprod.json → ...t/AuthorisationCaseEvent-amendBundle.json
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventCaseProg-amendBundle-prod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventCaseProg-amendBundle-prod.json
diff --git a/...ent/systemUpdate-amendBundle-nonprod.json → ...onCaseEvent/systemUpdate-amendBundle.json b/...ent/systemUpdate-amendBundle-nonprod.json → ...onCaseEvent/systemUpdate-amendBundle.json
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-CUI-CP-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-CUI-CP-nonprod.json
@@ -907,6 +907,12 @@
           "cui-admin-profile"
         ],
         "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "CITIZEN-CLAIMANT-PROFILE"
+        ],
+        "CRUD": "R"
       }
     ]
   },
@@ -1076,5 +1082,31 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseFieldID": "trialReadyNotified",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "CITIZEN-CLAIMANT-PROFILE",
+          "CITIZEN-DEFENDANT-PROFILE"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseFieldID": "listingOrRelisting",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "CITIZEN-CLAIMANT-PROFILE",
+          "CITIZEN-DEFENDANT-PROFILE"
+        ],
+        "CRUD": "R"
+      }
+    ]
   }
 ]
diff --git a/...eld-CaseFileView-amendBundle-nonprod.json → ...onCaseField-CaseFileView-amendBundle.json b/...eld-CaseFileView-amendBundle-nonprod.json → ...onCaseField-CaseFileView-amendBundle.json
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json
@@ -196,6 +196,18 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseFieldID": "finalOrderTrackToggle",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL",
     "CaseFieldID": "finalOrderTrackAllocation",

diff --git a/...isationCaseField-amendBundle-nonprod.json → ...d/AuthorisationCaseField-amendBundle.json b/...isationCaseField-amendBundle-nonprod.json → ...d/AuthorisationCaseField-amendBundle.json
diff --git a/ccd-definition/CaseEvent/Camunda/CaseEvents-COSC-nonprod.json b/ccd-definition/CaseEvent/Camunda/CaseEvents-COSC-nonprod.json
@@ -12,6 +12,19 @@
     "ShowEventNotes": "N",
     "RetriesTimeoutURLAboutToSubmitEvent": 0
   },
+  {
+    "CaseTypeID": "CIVIL",
+    "ID": "GENERATE_COSC_DOCUMENT",
+    "Name": "Generate COSC document",
+    "Description": "Trigger event to check if paid in full is true",
+    "PreConditionState(s)": "*",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+    "ShowSummary": "N",
+    "ShowEventNotes": "N",
+    "RetriesTimeoutURLAboutToSubmitEvent": 0
+  },
   {
     "CaseTypeID": "CIVIL",
     "ID": "CREATE_DASHBOARD_NOTIFICATION_COSC_NOT_PAID_FULL_CLAIMANT",
@@ -38,4 +51,4 @@
     "ShowEventNotes": "N",
     "RetriesTimeoutURLAboutToSubmitEvent": 0
   }
-]
+]
diff --git a/...tificationEvents-amendBundle-nonprod.json → ...munda/NotificationEvents-amendBundle.json b/...tificationEvents-amendBundle-nonprod.json → ...munda/NotificationEvents-amendBundle.json
diff --git a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
@@ -44,7 +44,7 @@
   "Description": "Mark a judgment as paid in full",
   "DisplayOrder": 2,
   "PreConditionState(s)": "All_FINAL_ORDERS_ISSUED",
-  "PostConditionState": "CLOSED",
+  "PostConditionState": "*",
   "SecurityClassification": "Public",
   "ShowSummary": "N",
   "ShowEventNotes": "N",

diff --git a/ccd-definition/CaseEvent/User/UserEvents-amendBundle-prod.json b/ccd-definition/CaseEvent/User/UserEvents-amendBundle-prod.json
diff --git a/.../User/UserEvents-amendBundle-nonprod.json → ...aseEvent/User/UserEvents-amendBundle.json b/.../User/UserEvents-amendBundle-nonprod.json → ...aseEvent/User/UserEvents-amendBundle.json
diff --git a/...elds/AmendBundle-amendBundle-nonprod.json → ...ventToFields/AmendBundle-amendBundle.json b/...elds/AmendBundle-amendBundle-nonprod.json → ...ventToFields/AmendBundle-amendBundle.json
diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json
@@ -1,4 +1,15 @@
 [
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "finalOrderTrackToggle",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY",
+    "PageID": "TrackAllocation",
+    "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"",
+    "ShowSummaryChangeOption": "N"
+  },
 
   {
     "CaseTypeID": "CIVIL",
@@ -10,7 +21,8 @@
     "PageFieldDisplayOrder": 1,
     "DisplayContext": "MANDATORY",
     "PageID": "TrackAllocation",
-    "ShowSummaryChangeOption": "Y"
+    "ShowSummaryChangeOption": "Y",
+    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/assign-track-toggle"
   },
   {
     "CaseTypeID": "CIVIL",
@@ -34,7 +46,7 @@
     "DisplayContext": "READONLY",
     "PageID": "FastTrackComplexityBand",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderTrackAllocation=\"FAST_CLAIM\" AND finalOrderAllocateToTrack=\"Yes\""
+    "PageShowCondition": "finalOrderTrackToggle=\"FAST_CLAIM\""
   },
   {
     "CaseTypeID": "CIVIL",
@@ -56,7 +68,7 @@
     "DisplayContext": "READONLY",
     "PageID": "IntermediateTrackComplexityBand",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderTrackAllocation=\"INTERMEDIATE_CLAIM\" AND finalOrderAllocateToTrack=\"Yes\""
+    "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\""
   },
   {
     "CaseTypeID": "CIVIL",
@@ -77,7 +89,8 @@
     "PageFieldDisplayOrder": 1,
     "DisplayContext": "READONLY",
     "PageID": "FinalOrderSelect",
-    "ShowSummaryChangeOption": "N"
+    "ShowSummaryChangeOption": "N",
+    "PageShowCondition": "finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\""
   },
   {
     "CaseTypeID": "CIVIL",
@@ -110,8 +123,8 @@
     "PageFieldDisplayOrder": 1,
     "DisplayContext": "READONLY",
     "PageID": "SelectTemplate",
-    "PageShowCondition": "finalOrderSelection=\"DOWNLOAD_ORDER_TEMPLATE\"",
     "ShowSummaryChangeOption": "N",
+    "PageShowCondition": "finalOrderTrackToggle= \"INTERMEDIATE_CLAIM\" OR finalOrderTrackToggle= \"MULTI_CLAIM\"",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/create-download-template-document"
   },
   {
@@ -144,7 +157,7 @@
     "PageFieldDisplayOrder": 2,
     "DisplayContext": "READONLY",
     "PageID": "FinalOrderAssistedOrder",
-    "PageShowCondition": "finalOrderSelection=\"ASSISTED_ORDER\"",
+    "PageShowCondition": "finalOrderSelection = \"ASSISTED_ORDER\" AND (finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\")",
     "ShowSummaryChangeOption": "N"
   },
   {
@@ -550,7 +563,7 @@
     "DisplayContext": "READONLY",
     "PageID": "FreeFormOrder",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderSelection = \"FREE_FORM_ORDER\""
+    "PageShowCondition": "finalOrderSelection = \"FREE_FORM_ORDER\" AND (finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\")"
   },
   {
     "CaseTypeID": "CIVIL",
@@ -676,7 +689,7 @@
     "DisplayContext": "COMPLEX",
     "PageID": "FinalOrderPreview",
     "ShowSummaryChangeOption": "Y",
-    "PageShowCondition": "finalOrderSelection!=\"DOWNLOAD_ORDER_TEMPLATE\""
+    "PageShowCondition": "finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\""
   },
   {
     "CaseTypeID": "CIVIL",
@@ -688,7 +701,7 @@
     "DisplayContext": "READONLY",
     "PageID": "DownloadTemplate",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderSelection=\"DOWNLOAD_ORDER_TEMPLATE\""
+    "PageShowCondition": "finalOrderTrackToggle= \"INTERMEDIATE_CLAIM\" OR finalOrderTrackToggle= \"MULTI_CLAIM\""
   },
   {
     "CaseTypeID": "CIVIL",
@@ -721,7 +734,7 @@
     "DisplayContext": "READONLY",
     "PageID": "UploadOrder",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderSelection=\"DOWNLOAD_ORDER_TEMPLATE\""
+    "PageShowCondition": "finalOrderTrackToggle= \"INTERMEDIATE_CLAIM\" OR finalOrderTrackToggle= \"MULTI_CLAIM\""
   },
   {
     "CaseTypeID": "CIVIL",

diff --git a/...rationFields-CUI-amendBundle-nonprod.json → ...ionIntegrationFields-CUI-amendBundle.json b/...rationFields-CUI-amendBundle-nonprod.json → ...ionIntegrationFields-CUI-amendBundle.json
diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json
@@ -1,4 +1,12 @@
 [
+  {
+    "CaseTypeID": "CIVIL",
+    "ID": "finalOrderTrackToggle",
+    "Label": " ",
+    "FieldType": "Text",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
   {
     "CaseTypeID": "CIVIL",
     "ID": "eligibilityQuestions",

diff --git a/...eField/CaseField-amendBundle-nonprod.json → ...tion/CaseField/CaseField-amendBundle.json b/...eField/CaseField-amendBundle-nonprod.json → ...tion/CaseField/CaseField-amendBundle.json
diff --git a/...ories/Categories-amendBundle-nonprod.json → ...on/Categories/Categories-amendBundle.json b/...ories/Categories-amendBundle-nonprod.json → ...on/Categories/Categories-amendBundle.json