Merge branch 'master' into DTSCCI-1314

hmcts · Feb 5, 2025 · bdd1bb6 · bdd1bb6
2 parents 5268f91 + b07b20b
commit bdd1bb6
Show file tree

Hide file tree

Showing 25 changed files with 218 additions and 88 deletions.
diff --git a/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json b/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json
@@ -0,0 +1,12 @@
+[{
+  "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+  "CaseEventID": "CREATE_NOC_ONLINE_DASHBOARD_NOTIFICATION_FOR_CLAIMANT",
+  "UserRole": "caseworker-civil-systemupdate",
+  "CRUD": "CRU"
+},
+  {
+  "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+  "CaseEventID": "NOTIFY_NEW_DEFENDANT_SOLICITOR",
+  "UserRole": "caseworker-civil-systemupdate",
+  "CRUD": "CRU"
+}]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json
@@ -442,5 +442,20 @@
         "CRUD": "CRU"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "joDJCreatedDate",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-staff",
+          "caseworker-civil-solicitor",
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
   }
 ]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json
@@ -460,5 +460,14 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "hearingDurationMinti",
+    "UserRoles": [
+      "hearing-schedule-access",
+      "caseworker-civil-solicitor"
+    ],
+    "CRUD": "CRU"
   }
 ]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json
@@ -724,16 +724,15 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-systemupdate"
         ],
         "CRUD": "CRU"
       },
       {
         "UserRoles": [
           "caseworker-civil-admin",
-          "caseworker-civil-systemupdate",
           "CITIZEN-DEFENDANT-PROFILE"
-
         ],
         "CRUD": "R"
       }

diff --git a/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json b/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json
@@ -0,0 +1,33 @@
+[{
+  "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+  "ID": "CREATE_NOC_ONLINE_DASHBOARD_NOTIFICATION_FOR_CLAIMANT",
+  "Name": "Case online",
+  "Description": "Generate Dashboard Notification in CUI",
+  "PreConditionState(s)": "*",
+  "PostConditionState": "*",
+  "SecurityClassification": "Public",
+  "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+  "ShowSummary": "Y",
+  "ShowEventNotes": "N",
+  "EndButtonLabel": "Submit",
+  "RetriesTimeoutAboutToStartEvent": 0,
+  "RetriesTimeoutURLAboutToSubmitEvent": 0,
+  "RetriesTimeoutURLSubmittedEvent": 0
+},
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "NOTIFY_NEW_DEFENDANT_SOLICITOR",
+    "Name": "Notify new defendant sol",
+    "Description": "Notify new defendant sol",
+    "PreConditionState(s)": "*",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+    "ShowSummary": "N",
+    "ShowEventNotes": "N",
+    "EndButtonLabel": "Submit",
+    "RetriesTimeoutAboutToStartEvent": 0,
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "RetriesTimeoutURLSubmittedEvent": 0
+  }
+]
diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json
@@ -186,7 +186,8 @@
     "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
     "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted",
     "RetriesTimeoutAboutToStartEvent": 0,
-    "RetriesTimeoutURLAboutToSubmitEvent": 0
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "Publish": "Y"
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",

diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json
@@ -62,7 +62,7 @@
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "PageLabel": "Select track",
-    "CaseEventFieldLabel": "Are you allocating the claim to a track?",
+    "CaseEventFieldLabel": "Are you allocating or re-allocating the claim to a track or are you changing the complexity band?",
     "CaseFieldID": "finalOrderAllocateToTrack",
     "PageDisplayOrder": 1,
     "PageFieldDisplayOrder": 1,
@@ -75,7 +75,7 @@
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "finalOrderTrackAllocation",
-    "CaseEventFieldLabel": "What track are you allocating the claim to?",
+    "CaseEventFieldLabel": "What track are you allocating or re-allocating the claim to?",
     "PageDisplayOrder": 1,
     "PageFieldDisplayOrder": 2,
     "DisplayContext": "MANDATORY",
@@ -93,7 +93,7 @@
     "DisplayContext": "READONLY",
     "PageID": "IntermediateTrackComplexityBand",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\""
+    "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\" AND finalOrderAllocateToTrack=\"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",

diff --git a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json
@@ -69,5 +69,64 @@
     "PageDisplayOrder": 2,
     "PageColumnNumber": 1,
     "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "channel",
+    "PageFieldDisplayOrder": 4,
+    "DisplayContext": "MANDATORY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "allocatedTrack",
+    "PageFieldDisplayOrder": 8,
+    "DisplayContext": "READONLY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "FieldShowCondition" : "hearingNoticeList = \"DO_NOT_SHOW\"",
+    "ShowSummaryChangeOption": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "responseClaimTrack",
+    "PageFieldDisplayOrder": 8,
+    "DisplayContext": "READONLY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "FieldShowCondition" : "hearingNoticeList = \"DO_NOT_SHOW\"",
+    "ShowSummaryChangeOption": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "hearingDuration",
+    "PageFieldDisplayOrder": 9,
+    "DisplayContext": "MANDATORY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "FieldShowCondition" : "(allocatedTrack = \"SMALL_CLAIM\" OR allocatedTrack = \"FAST_CLAIM\" OR responseClaimTrack = \"SMALL_CLAIM\" OR responseClaimTrack = \"FAST_CLAIM\") OR (hearingNoticeList = \"OTHER\" OR hearingNoticeList = \"SMALL_CLAIMS\")",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "hearingDurationMinti",
+    "PageFieldDisplayOrder": 9,
+    "DisplayContext": "MANDATORY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "FieldShowCondition" : "(allocatedTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR responseClaimTrack = \"INTERMEDIATE_CLAIM\") AND hearingNoticeList = \"FAST_TRACK_TRIAL\"",
+    "ShowSummaryChangeOption": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-prod.json b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-prod.json
@@ -9,5 +9,27 @@
     "PageDisplayOrder": 1,
     "PageColumnNumber": 1,
     "ShowSummaryChangeOption": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "channel",
+    "PageFieldDisplayOrder": 4,
+    "DisplayContext": "MANDATORY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "HEARING_SCHEDULED",
+    "CaseFieldID": "hearingDuration",
+    "PageFieldDisplayOrder": 9,
+    "DisplayContext": "MANDATORY",
+    "PageID": "HearingDetails",
+    "PageDisplayOrder": 4,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "N"
   }
 ]
diff --git a/ccd-definition/CaseEventToFields/HearingNotice.json b/ccd-definition/CaseEventToFields/HearingNotice.json
@@ -103,17 +103,6 @@
     "PageColumnNumber": 1,
     "ShowSummaryChangeOption": "N"
   },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseEventID": "HEARING_SCHEDULED",
-    "CaseFieldID": "channel",
-    "PageFieldDisplayOrder": 4,
-    "DisplayContext": "MANDATORY",
-    "PageID": "HearingDetails",
-    "PageDisplayOrder": 4,
-    "PageColumnNumber": 1,
-    "ShowSummaryChangeOption": "N"
-  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "HEARING_SCHEDULED",
@@ -159,17 +148,6 @@
     "ShowSummaryChangeOption": "Y",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/checkFutureDate"
   },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseEventID": "HEARING_SCHEDULED",
-    "CaseFieldID": "hearingDuration",
-    "PageFieldDisplayOrder": 9,
-    "DisplayContext": "MANDATORY",
-    "PageID": "HearingDetails",
-    "PageDisplayOrder": 4,
-    "PageColumnNumber": 1,
-    "ShowSummaryChangeOption": "N"
-  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "HEARING_SCHEDULED",

diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json
@@ -368,5 +368,13 @@
     "FieldType": "YesOrNo",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "joDJCreatedDate",
+    "Label": " ",
+    "FieldType": "DateTime",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
   }
 ]
diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json
@@ -163,7 +163,7 @@
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "ID": "uploadOrderDocumentFromTemplateLabel",
-    "Label": "**** \n ## Add document \n Make sure your file is named either directions or order, the party names and the date. Upload your completed order in DOC/DOCX (Word) format.",
+    "Label": "**** \n ## Add document \n Upload your completed order in DOC/DOCX (Word) format.",
     "FieldType": "Label",
     "SecurityClassification": "Public",
     "Searchable": "N"
@@ -225,5 +225,13 @@
     "FieldType": "YesOrNo",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "hearingDurationMinti",
+    "Label": "Duration",
+    "FieldType": "TextArea",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
   }
 ]
diff --git a/ccd-definition/CaseTypeTab/ApplicationsCaseWorkerGAspec-nonprod.json b/ccd-definition/CaseTypeTab/ApplicationsCaseWorkerGAspec-nonprod.json
diff --git a/ccd-definition/CaseTypeTab/ApplicationsLegalAdviserGAspec.json b/ccd-definition/CaseTypeTab/ApplicationsLegalAdviserGAspec.json
diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml
@@ -86,17 +86,21 @@ civil-service:
         extraEnvVars:
           - name: POSTGRESQL_WAL_LEVEL
             value: "logical"
+          - name: POSTGRESQL_MAX_CONNECTIONS
+            value: "400"
+        extendedConfiguration: |
+            max_connections = 400
+            shared_buffers = 512MB
         resources:
           requests:
-            cpu: 25m
+            cpu: 500m
+            memory: 2048Mi
         podAnnotations:
           cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
         initdb:
           user: postgres
           password: ${POSTGRES_PASSWORD}
           scripts:
-            00_grant_superuser_role.sql: |
-              ALTER ROLE hmcts WITH SUPERUSER;
             01_init_civil.sql: |
               CREATE DATABASE cmc WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1;
               CREATE DATABASE "data-store" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1;