minor(cb2-10282): Update types definition for new data structure (#158)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Daniel Searle <daniel.searle1@dvsa.gov.uk>

json-definitions/iva/defects/enums/euVehicleCategory.enum.json

@@ -0,0 +1,44 @@
+{
+  "title": "EU Vehicle Category",
+  "type": "string",
+  "tsEnumNames": [
+    "M1",
+    "M2",
+    "M3",
+    "N1",
+    "N2",
+    "N3",
+    "O1",
+    "O2",
+    "O3",
+    "O4",
+    "L1E_A",
+    "l1E",
+    "L2e",
+    "L3E",
+    "L4E",
+    "L5E",
+    "L6E",
+    "L7E"
+  ],
+  "enum": [
+    "m1",
+    "m2",
+    "m3",
+    "n1",
+    "n2",
+    "n3",
+    "o1",
+    "o2",
+    "o3",
+    "o4",
+    "l1e-a",
+    "l1e",
+    "l2e",
+    "l3e",
+    "l4e",
+    "l5e",
+    "l6e",
+    "l7e"
+  ]
+}

json-definitions/iva/defects/get/index.json

@@ -1,12 +1,11 @@
 {
-  "title": "Defect GET IVA",
+  "title": "Section IVA",
   "type": "object",
   "additionalProperties": false,
   "required": [
     "sectionNumber",
     "sectionDescription",
     "vehicleTypes",
-    "euVehicleCategories",
     "requiredStandards"
   ],
   "properties": {
@@ -16,16 +15,6 @@
     "sectionDescription": {
       "type": ["string"]
     },
-    "euVehicleCategories": {
-      "type": "array",
-      "items": {
-        "anyOf": [
-          {
-            "$ref": "../../../v3/tech-record/enums/euVehicleCategory.enum.json"
-          }
-        ]
-      }
-    },
     "requiredStandards": {
       "type": "array",
       "items": {
@@ -35,7 +24,8 @@
           "rsNumber",
           "requiredStandard",
           "refCalculation",
-          "additionalInfo"
+          "additionalInfo",
+          "inspectionTypes"
         ],
         "properties": {
           "rsNumber": {

json-schemas/iva/defects/enums/euVehicleCategory.enum.json

@@ -0,0 +1,44 @@
+{
+	"title": "EU Vehicle Category",
+	"type": "string",
+	"tsEnumNames": [
+		"M1",
+		"M2",
+		"M3",
+		"N1",
+		"N2",
+		"N3",
+		"O1",
+		"O2",
+		"O3",
+		"O4",
+		"L1E_A",
+		"l1E",
+		"L2e",
+		"L3E",
+		"L4E",
+		"L5E",
+		"L6E",
+		"L7E"
+	],
+	"enum": [
+		"m1",
+		"m2",
+		"m3",
+		"n1",
+		"n2",
+		"n3",
+		"o1",
+		"o2",
+		"o3",
+		"o4",
+		"l1e-a",
+		"l1e",
+		"l2e",
+		"l3e",
+		"l4e",
+		"l5e",
+		"l6e",
+		"l7e"
+	]
+}

json-schemas/iva/defects/get/index.json

@@ -1,12 +1,11 @@
 {
-	"title": "Defect GET IVA",
+	"title": "Section IVA",
 	"type": "object",
 	"additionalProperties": false,
 	"required": [
 		"sectionNumber",
 		"sectionDescription",
 		"vehicleTypes",
-		"euVehicleCategories",
 		"requiredStandards"
 	],
 	"properties": {
@@ -20,57 +19,6 @@
 				"string"
 			]
 		},
-		"euVehicleCategories": {
-			"type": "array",
-			"items": {
-				"anyOf": [
-					{
-						"title": "EU vehicle category",
-						"type": "string",
-						"tsEnumNames": [
-							"M1",
-							"M2",
-							"M3",
-							"N1",
-							"N2",
-							"N3",
-							"O1",
-							"O2",
-							"O3",
-							"O4",
-							"L1E_A",
-							"l1E",
-							"L2e",
-							"L3E",
-							"L4E",
-							"L5E",
-							"L6E",
-							"L7E"
-						],
-						"enum": [
-							"m1",
-							"m2",
-							"m3",
-							"n1",
-							"n2",
-							"n3",
-							"o1",
-							"o2",
-							"o3",
-							"o4",
-							"l1e-a",
-							"l1e",
-							"l2e",
-							"l3e",
-							"l4e",
-							"l5e",
-							"l6e",
-							"l7e"
-						]
-					}
-				]
-			}
-		},
 		"requiredStandards": {
 			"type": "array",
 			"items": {
@@ -80,7 +28,8 @@
 					"rsNumber",
 					"requiredStandard",
 					"refCalculation",
-					"additionalInfo"
+					"additionalInfo",
+					"inspectionTypes"
 				],
 				"properties": {
 					"rsNumber": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvsa/cvs-type-definitions",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "description": "type definitions for cvs vta and vtm applications",
   "main": "index.js",
   "repository": {

schemas.ts

@@ -1,4 +1,5 @@
 export const schemas = [
+  "iva/defects/enums/euVehicleCategory.enum.json",
   "iva/defects/get/index.json",
   "v1/activity/index.json",
   "v1/defect-category-reference-data/index.json",

types/iva/defects/enums/euVehicleCategory.enum.ts

@@ -0,0 +1,27 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+export enum EUVehicleCategory {
+  M1 = "m1",
+  M2 = "m2",
+  M3 = "m3",
+  N1 = "n1",
+  N2 = "n2",
+  N3 = "n3",
+  O1 = "o1",
+  O2 = "o2",
+  O3 = "o3",
+  O4 = "o4",
+  L1E_A = "l1e-a",
+  l1E = "l1e",
+  L2e = "l2e",
+  L3E = "l3e",
+  L4E = "l4e",
+  L5E = "l5e",
+  L6E = "l6e",
+  L7E = "l7e"
+}

types/iva/defects/get/index.d.ts

@@ -7,39 +7,17 @@
 
 export type InspectionType = "basic" | "normal";
 
-export interface DefectGETIVA {
+export interface SectionIVA {
   sectionNumber: string;
   sectionDescription: string;
-  euVehicleCategories: EUVehicleCategory[];
   requiredStandards: {
     rsNumber: number;
     requiredStandard: string;
     refCalculation: string;
     additionalInfo: boolean;
-    inspectionTypes?: InspectionType[];
+    inspectionTypes: InspectionType[];
   }[];
   additionalInformation?: {
     notes: string;
   };
 }
-
-export enum EUVehicleCategory {
-  M1 = "m1",
-  M2 = "m2",
-  M3 = "m3",
-  N1 = "n1",
-  N2 = "n2",
-  N3 = "n3",
-  O1 = "o1",
-  O2 = "o2",
-  O3 = "o3",
-  O4 = "o4",
-  L1E_A = "l1e-a",
-  l1E = "l1e",
-  L2e = "l2e",
-  L3E = "l3e",
-  L4E = "l4e",
-  L5E = "l5e",
-  L6E = "l6e",
-  L7E = "l7e"
-}