patch(cb2-10282): separate RequiredStandard object from SectionIVA (#159

) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel Searle <daniel.searle1@dvsa.gov.uk>
dvsa · Jan 3, 2024 · fe91e3f · fe91e3f
1 parent 99dcdc1
commit fe91e3f
Show file tree

Hide file tree

Showing 9 changed files with 437 additions and 135 deletions.
diff --git a/json-definitions/iva/defects/get/index.json b/json-definitions/iva/defects/get/index.json
@@ -1,67 +1,43 @@
 {
-  "title": "Section IVA",
+  "title": "DefectGETIVA",
   "type": "object",
   "additionalProperties": false,
-  "required": [
-    "sectionNumber",
-    "sectionDescription",
-    "vehicleTypes",
-    "requiredStandards"
+  "required" : [
+    "euVehicleCategories",
+    "basic",
+    "normal"
   ],
   "properties": {
-    "sectionNumber": {
-      "type": ["string"]
-    },
-    "sectionDescription": {
-      "type": ["string"]
+    "euVehicleCategories": {
+      "type": "array",
+      "items": {
+        "anyOf" : [
+          {
+            "$ref": "../enums/euVehicleCategory.enum.json"
+          }
+        ]
+      }
     },
-    "requiredStandards": {
+    "basic": {
       "type": "array",
       "items": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": [
-          "rsNumber",
-          "requiredStandard",
-          "refCalculation",
-          "additionalInfo",
-          "inspectionTypes"
-        ],
-        "properties": {
-          "rsNumber": {
-            "type": ["integer"]
-          },
-          "requiredStandard": {
-            "type": ["string"]
-          },
-          "refCalculation": {
-            "type": ["string"]
-          },
-          "additionalInfo": {
-            "type": ["boolean"]
-          },
-          "inspectionTypes": {
-            "type": "array",
-            "items": {
-              "anyOf": [
-                {
-                  "$ref": "../enums/inspectionType.ignore.json"
-                }
-              ]
-            }
+        "anyOf": [
+          {
+            "$ref" : "../sectionIVA.json"
           }
-        }
+        ]
       }
     },
-    "additionalInformation": {
-      "type": "object",
-      "additionalProperties" : false,
-      "required" : ["notes"],
-      "properties": {
-        "notes" : {
-          "type" : ["string"]
-        }
+    "normal": {
+      "type": "array",
+      "items": {
+        "anyOf": [
+          {
+            "$ref" : "../sectionIVA.json"
+          }
+        ]
       }
     }
   }
 }
+
diff --git a/json-definitions/iva/defects/sectionIVA.json b/json-definitions/iva/defects/sectionIVA.json
@@ -0,0 +1,69 @@
+{
+  "title": "SectionIVA",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "sectionNumber",
+    "sectionDescription",
+    "requiredStandards"
+  ],
+  "properties": {
+    "sectionNumber": {
+      "type": [
+        "string"
+      ]
+    },
+    "sectionDescription": {
+      "type": [
+        "string"
+      ]
+    },
+    "requiredStandards": {
+      "type": "array",
+      "items": {
+        "title": "Required Standard",
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "rsNumber",
+          "requiredStandard",
+          "refCalculation",
+          "additionalInfo",
+          "inspectionTypes"
+        ],
+        "properties": {
+          "rsNumber": {
+            "type": [
+              "integer"
+            ]
+          },
+          "requiredStandard": {
+            "type": [
+              "string"
+            ]
+          },
+          "refCalculation": {
+            "type": [
+              "string"
+            ]
+          },
+          "additionalInfo": {
+            "type": [
+              "boolean"
+            ]
+          },
+          "inspectionTypes": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "./enums/inspectionType.ignore.json"
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}