Null json schema update (#695)

* update json schemas, allow optional fields to be null * update json schemas, allow ALL fields to be null * update json schemas, allow ALL fields to be null * update json schemas, allow ALL fields to be null * update json schemas, allow ALL fields to be null * update json schemas, allow optional fields to be null * update json schemas, allow additional nullable fields * update json schemas, type changes for result_id and originator_id * update json schemas, type changes for result_id and originator_id
hmcts · Jan 9, 2025 · 5035b87 · 5035b87
1 parent 3bee6c4
commit 5035b87
Show file tree

Hide file tree

Showing 13 changed files with 238 additions and 217 deletions.
diff --git a/.../resources/features/opalMode/manualAccountCreation/draftAccounts/accountJson/account.json b/.../resources/features/opalMode/manualAccountCreation/draftAccounts/accountJson/account.json
@@ -2,7 +2,7 @@
   "account_type": "Fine",
   "defendant_type": "DEFENDANT",
   "originator_name": "ORIGINATOR_NAME",
-  "originator_id": "ORIGINATOR_ID",
+  "originator_id": 1234,
   "enforcement_court_id": 101,
   "collection_order_made": true,
   "collection_order_made_today": false,
@@ -18,7 +18,7 @@
       "offence_id": 1234,
       "impositions": [
         {
-          "result_id": 1,
+          "result_id": "1234",
           "amount_imposed": 500.0,
           "amount_paid": 200.0
         }

diff --git a/...urces/features/opalMode/manualAccountCreation/draftAccounts/accountJson/adultAccount.json b/...urces/features/opalMode/manualAccountCreation/draftAccounts/accountJson/adultAccount.json
@@ -2,7 +2,7 @@
   "account_type": "Fine",
   "defendant_type": "Adult",
   "originator_name": "Police Force",
-  "originator_id": "PF12345",
+  "originator_id": 12345,
   "enforcement_court_id": 101,
   "collection_order_made": true,
   "collection_order_made_today": false,
@@ -21,7 +21,7 @@
       "offence_id": 1234,
       "impositions": [
         {
-          "result_id": 1,
+          "result_id": "1234",
           "amount_imposed": 500.0,
           "amount_paid": 200.0
         }

diff --git a/...grationTest/java/uk/gov/hmcts/opal/controllers/DraftAccountControllerIntegrationTest.java b/...grationTest/java/uk/gov/hmcts/opal/controllers/DraftAccountControllerIntegrationTest.java
@@ -846,7 +846,7 @@ private static String validCreateRequestBody() {
               "account_type": "Fine",
               "defendant_type": "Adult",
               "originator_name": "Police Force",
-              "originator_id": "PF12345",
+              "originator_id": 12345,
               "enforcement_court_id": 101,
               "collection_order_made": true,
               "collection_order_made_today": false,
@@ -887,7 +887,7 @@ private static String validCreateRequestBody() {
                   "offence_id": 1234,
                   "impositions": [
                     {
-                      "result_id": 1,
+                      "result_id": "1",
                       "amount_imposed": 500.00,
                       "amount_paid": 200.00,
                       "major_creditor_id": 999
@@ -997,7 +997,7 @@ private final String validAccountJson() {
               "account_type": "Fine",
               "defendant_type": "Adult",
               "originator_name": "Police Force",
-              "originator_id": "PF12345",
+              "originator_id": 12345,
               "enforcement_court_id": 101,
               "collection_order_made": true,
               "collection_order_made_today": false,
@@ -1036,7 +1036,7 @@ private final String validAccountJson() {
                   "offence_id": 1234,
                   "impositions": [
                     {
-                      "result_id": 1,
+                      "result_id": "1",
                       "amount_imposed": 500.00,
                       "amount_paid": 200.00,
                       "major_creditor_id": 999