merge commit

hmcts · Feb 19, 2025 · ac46900 · ac46900
1 parent 66aab5d
commit ac46900
Show file tree

Hide file tree

Showing 107 changed files with 3,838 additions and 180 deletions.
diff --git a/README.md b/README.md
@@ -120,7 +120,6 @@ Will run only S-1023.5:
 
     ./gradlew functional -P tags="@S-1023.5"
 
-
 ## LICENSE
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE.md) file for details.
diff --git a/build.gradle b/build.gradle
@@ -324,8 +324,8 @@ dependencies {
     // for sonar analysis
     testImplementation group: 'org.openid4java', name: 'openid4java', version: '1.0.0'
     // remove me once insights is in
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.10'
-    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.10'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
+    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.13'
 
     //excluding log4j-core which causes a vulnerability issue
     implementation(group: 'io.searchbox', name: 'jest', version: '6.3.1') {
@@ -337,8 +337,8 @@ dependencies {
     implementation 'org.jooq:jool-java-8:0.9.14'
     implementation 'com.github.hmcts:ccd-case-document-am-client:1.7.1'
 
-    testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version:  '7.23.0'
-    testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2'
+    testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version:  '7.24.2-prerelease-CME-110-9'
+    testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.2.0'
 
     contractTestImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
     contractTestImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"

diff --git a/charts/ccd-data-store-api/Chart.yaml b/charts/ccd-data-store-api/Chart.yaml
@@ -2,7 +2,7 @@ description: Helm chart for the HMCTS CCD Data Store
 name: ccd-data-store-api
 apiVersion: v2
 home: https://github.com/hmcts/ccd-data-store-api
-version: 2.0.31
+version: 2.0.32
 maintainers:
   - name: HMCTS CCD Dev Team
     email: ccd-devops@HMCTS.NET

diff --git a/charts/ccd-data-store-api/values.yaml b/charts/ccd-data-store-api/values.yaml
@@ -95,3 +95,8 @@ java:
     PACT_BROKER_URL: pact-broker.platform.hmcts.net
     PACT_BROKER_PORT: 443
     PACT_BROKER_SCHEME: https
+
+    CCD_MULTIPARTY_FIX_ENABLED: true
+    CCD_MULTIPARTY_CASE_TYPES: "*"
+    CCD_MULTIPARTY_EVENTS: "*"
+    CCD_MULTIPARTY_LOG_LEVEL: INFO
diff --git a/dependency-check-suppressions.xml b/dependency-check-suppressions.xml
@@ -1,8 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?><suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-  <suppress>
-    <notes>Temporary Suppression
-        CVE-2023-6378 refer [Ticket]
-    </notes>
-    <cve>CVE-2023-6378</cve>
-  </suppress>
 </suppressions>
diff --git a/infrastructure/state.tf b/infrastructure/state.tf
@@ -8,14 +8,14 @@
   alias                      = "postgres_network"
   subscription_id            = var.aks_subscription_id
 }
- 
+
  terraform {
   backend "azurerm" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
     random = {
       source = "hashicorp/random"

diff --git a/...-10124- NullifyByDefault/AboutToStart/Caseworker/F-1024_StartEvent_For_Caseworker.td.json b/...-10124- NullifyByDefault/AboutToStart/Caseworker/F-1024_StartEvent_For_Caseworker.td.json
@@ -0,0 +1,23 @@
+{
+  "_guid_": "F-1024_StartEventForCaseworker",
+  "_extends_": "Standard_Token_Creation_Data_For_Case_Creation",
+
+  "request": {
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType",
+      "etid": "createCaseTTLNullifyByDefault"
+    }
+  },
+  "expectedResponse": {
+    "body": {
+      "case_details" : {
+        "jurisdiction" : "BEFTA_MASTER",
+        "case_type_id" : "FT_MasterCaseType"
+      },
+      "event_id": "createCaseTTLNullifyByDefault"
+    }
+  }
+}
+
diff --git a/...NullifyByDefault/AboutToStart/Caseworker/F-1024_StartEvent_For_Caseworker_NotNull.td.json b/...NullifyByDefault/AboutToStart/Caseworker/F-1024_StartEvent_For_Caseworker_NotNull.td.json
@@ -0,0 +1,29 @@
+{
+  "_guid_": "F-1024_StartEventForCaseworker_NotNull",
+
+  "productName": "CCD Data Store",
+  "operationName": "Start event creation as Case worker",
+
+  "method": "GET",
+  "uri": "/caseworkers/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token",
+
+  "specs": [
+    "to create a token for case creation"
+  ],
+
+  "users": {
+    "invokingUser": {
+      "_extends_": "BeftaMasterCaseworker"
+    }
+  },
+  "request": {
+    "_extends_": "Common_Request",
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType",
+      "etid": "createCaseTTLNBDNotNull"
+    }
+  }
+}
+
diff --git a/...fault/AboutToStart/Caseworker/F-1024_StartEvent_For_Caseworker_RequestTTL_NotNull.td.json b/...fault/AboutToStart/Caseworker/F-1024_StartEvent_For_Caseworker_RequestTTL_NotNull.td.json
@@ -0,0 +1,34 @@
+{
+  "_guid_": "F-1024_StartEvent_For_Caseworker_RequestTTL_NotNull",
+
+  "productName": "CCD Data Store",
+  "operationName": "Start event creation as Case worker",
+
+  "method": "GET",
+  "uri": "/caseworkers/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token",
+
+  "specs": [
+    "to create a case",
+    "to create a token for case creation"
+  ],
+
+  "request": {
+    "_extends_": "Common_Request",
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType",
+      "etid": "createCaseTTLNBDNotNull"
+    },
+    "body": {
+      "data": {
+        "TTL" : {
+          "SystemTTL" : null,
+          "OverrideTTL" : null,
+          "Suspended" : "No"
+        }
+      }
+    }
+  }
+}
+
diff --git a/...ures/F-10124- NullifyByDefault/AboutToStart/Citizen/F-1024_StartEvent_For_Citizen.td.json b/...ures/F-10124- NullifyByDefault/AboutToStart/Citizen/F-1024_StartEvent_For_Citizen.td.json
@@ -0,0 +1,23 @@
+{
+  "_guid_": "F-1024_StartEventForCitizen",
+  "_extends_": "Citizen_Token_Creation_Data_For_Case_Creation",
+
+  "request": {
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType",
+      "etid": "createCaseTTLNullifyByDefault"
+    }
+  },
+  "expectedResponse": {
+    "body": {
+      "case_details" : {
+        "jurisdiction" : "BEFTA_MASTER",
+        "case_type_id" : "FT_MasterCaseType"
+      },
+      "event_id": "createCaseTTLNullifyByDefault"
+    }
+  }
+}
+
diff --git a/...0124- NullifyByDefault/AboutToStart/Citizen/F-1024_StartEvent_For_Citizen_NotNull.td.json b/...0124- NullifyByDefault/AboutToStart/Citizen/F-1024_StartEvent_For_Citizen_NotNull.td.json
@@ -0,0 +1,30 @@
+{
+  "_guid_": "F-1024_StartEventForCitizen_NotNull",
+
+  "productName": "CCD Data Store",
+  "operationName": "Start event creation as Citizen",
+
+  "method": "GET",
+  "uri": "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token",
+
+  "specs": [
+    "to create a token for case creation"
+  ],
+
+  "users": {
+    "invokingUser": {
+      "_extends_": "BeftaCitizen2"
+    }
+  },
+
+  "request": {
+    "_extends_": "Common_Request",
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType",
+      "etid": "createCaseTTLNBDNotNull"
+    }
+  }
+}
+
diff --git a/...fyByDefault/AboutToStart/Citizen/F-1024_StartEvent_For_Citizen_RequestTTL_NotNull.td.json b/...fyByDefault/AboutToStart/Citizen/F-1024_StartEvent_For_Citizen_RequestTTL_NotNull.td.json
@@ -0,0 +1,36 @@
+{
+  "_guid_": "F-1024_StartEvent_For_Citizen_RequestTTL_NotNull",
+
+  "productName": "CCD Data Store",
+  "operationName": "Start event creation as Citizen",
+
+  "method": "GET",
+  "uri": "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token",
+
+  "specs": [
+    "to create a case",
+    "to create a token for case creation as a citizen"
+  ],
+
+  "request": {
+    "headers": {
+      "_extends_": "Common_Request_Headers"
+    },
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType",
+      "etid": "createCaseTTLNBDNotNull"
+    },
+    "body": {
+      "data": {
+        "TTL" : {
+          "SystemTTL" : null,
+          "OverrideTTL" : null,
+          "Suspended" : "No"
+        }
+      }
+    }
+  }
+}
+
diff --git a/...10124- NullifyByDefault/AboutToStart/StartEventController/F-1024_StartCaseTrigger.td.json b/...10124- NullifyByDefault/AboutToStart/StartEventController/F-1024_StartCaseTrigger.td.json
@@ -0,0 +1,26 @@
+{
+	"_guid_": "F-1024_StartCaseTrigger",
+
+	"productName": "CCD Data Store",
+	"operationName": "Retrieve a trigger for case by ID",
+
+	"method": "GET",
+	"uri": "cases/{caseId}/event-triggers/{triggerId}",
+
+  "users": {
+    "invokingUser": {
+      "_extends_": "BeftaCitizen2"
+    }
+  },
+
+  "request": {
+    "_extends_": "Common_Request",
+    "headers": {
+      "experimental": "true"
+    },
+    "pathVariables": {
+      "caseId": "${[scenarioContext][childContexts][F-1024_StartCaseTrigger_Case_Creation][testData][actualResponse][body][id]}",
+      "triggerId": "updateCaseTTLNullifyByDefault"
+    }
+  }
+}
diff --git a/...ByDefault/AboutToStart/StartEventController/F-1024_StartCaseTrigger_Case_Creation.td.json b/...ByDefault/AboutToStart/StartEventController/F-1024_StartCaseTrigger_Case_Creation.td.json
@@ -0,0 +1,26 @@
+{
+  "_guid_": "F-1024_StartCaseTrigger_Case_Creation",
+  "_extends_": "F-1024_StartCaseTrigger_Case_Creation_Base",
+
+  "request": {
+    "body": {
+      "data": {
+        "_extends_": "TTL_Case_Data_NBD"
+      },
+      "data_classification": {
+        "_extends_": "TTL_Classifications"
+      }
+    }
+  },
+
+  "expectedResponse": {
+    "body": {
+      "case_data": {
+        "_extends_": "TTL_Case_Data_NBD_Empty"
+      },
+      "data_classification": {
+        "_extends_": "TTL_Classifications_NBD"
+      }
+    }
+  }
+}
diff --git a/...ault/AboutToStart/StartEventController/F-1024_StartCaseTrigger_Case_Creation_Base.td.json b/...ault/AboutToStart/StartEventController/F-1024_StartCaseTrigger_Case_Creation_Base.td.json
@@ -0,0 +1,55 @@
+{
+  "_guid_": "F-1024_StartCaseTrigger_Case_Creation_Base",
+  "_extends_": "Befta_Jurisdiction2_Citizen_Case_Creation_Base_Data",
+
+  "specs": [
+    "to create a case"
+  ],
+
+  "prerequisites" : [ {
+    "Token_Creation": "F-1024_StartCaseTrigger_Token_Creation"
+  }
+  ],
+
+  "users": {
+    "invokingUser": {
+      "_extends_": "BeftaCitizen2"
+    }
+  },
+
+  "request": {
+    "pathVariables": {
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_MasterCaseType"
+    },
+    "body": {
+      "event": {
+        "id": "createCaseTTLNullifyByDefault"
+      },
+      "event_token": "${[scenarioContext][childContexts][Token_Creation][testData][actualResponse][body][token]}"
+    }
+  },
+
+  "expectedResponse": {
+    "body": {
+      "id": "[[ANYTHING_PRESENT]]",
+      "jurisdiction": "BEFTA_MASTER",
+      "state": "CaseCreated",
+      "version": 0,
+      "case_type_id": "FT_MasterCaseType",
+      "created_date": "[[ANYTHING_PRESENT]]",
+      "last_modified": "[[ANYTHING_PRESENT]]",
+      "last_state_modified_date": "[[ANYTHING_PRESENT]]",
+      "security_classification": "PUBLIC",
+      "case_data": { },
+      "data_classification": {},
+      "supplementary_data": null,
+      "after_submit_callback_response": null,
+      "callback_response_status_code": null,
+      "callback_response_status": null,
+      "delete_draft_response_status_code": null,
+      "delete_draft_response_status": null
+    }
+  }
+}
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -120,7 +120,6 @@ Will run only S-1023.5:

		./gradlew functional -P tags="@S-1023.5"


		## LICENSE

		This project is licensed under the MIT License - see the [LICENSE](LICENSE.md) file for details.