feat(cb2-9601): reverts to version 3 4 0

dvsa · Nov 1, 2023 · a977a6b · a977a6b
1 parent 6e94f2c
commit a977a6b
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 119 deletions.
diff --git a/...va/defects/enums/inspectionType.enum.json → .../defects/enums/inspectionType.ignore.json b/...va/defects/enums/inspectionType.enum.json → .../defects/enums/inspectionType.ignore.json
@@ -1,10 +1,6 @@
 {
   "title": "Inspection Type",
   "type": "string",
-  "tsEnumNames":[
-    "basic",
-    "normal"
-  ],
   "enum":[
     "basic",
     "normal"

diff --git a/json-definitions/iva/defects/get/index.json b/json-definitions/iva/defects/get/index.json
@@ -21,7 +21,7 @@
       "items": {
         "anyOf": [
           {
-            "$ref": "../../../v3/tech-record/enums/vehicleType.enum.json"
+            "$ref": "../../../v3/tech-record/enums/vehicleType.ignore.json"
           }
         ]
       }
@@ -66,7 +66,7 @@
             "items": {
               "anyOf": [
                 {
-                  "$ref": "../enums/inspectionType.enum.json"
+                  "$ref": "../enums/inspectionType.ignore.json"
                 }
               ]
             }

diff --git a/...3/tech-record/enums/vehicleType.enum.json → ...tech-record/enums/vehicleType.ignore.json b/...3/tech-record/enums/vehicleType.enum.json → ...tech-record/enums/vehicleType.ignore.json
@@ -1,14 +1,6 @@
 {
   "title": "Vehicle Type",
   "type": "string",
-  "tsEnumNames":[
-    "psv",
-    "trl",
-    "hgv",
-    "car",
-    "lgv",
-    "motorcycle"
-  ],
   "enum":[
     "psv",
     "trl",

diff --git a/json-definitions/v3/tech-record/get/search/index.json b/json-definitions/v3/tech-record/get/search/index.json
@@ -21,7 +21,7 @@
       "$ref": "../../enums/statusCode.ignore.json"
     },
     "techRecord_vehicleType": {
-      "$ref": "../../enums/vehicleType.enum.json"
+      "$ref": "../../enums/vehicleType.ignore.json"
     },
     "createdTimestamp": {
       "type": "string"

diff --git a/json-schemas/iva/defects/enums/inspectionType.enum.json b/json-schemas/iva/defects/enums/inspectionType.enum.json
diff --git a/json-schemas/iva/defects/get/index.json b/json-schemas/iva/defects/get/index.json
@@ -27,14 +27,6 @@
 					{
 						"title": "Vehicle Type",
 						"type": "string",
-						"tsEnumNames": [
-							"psv",
-							"trl",
-							"hgv",
-							"car",
-							"lgv",
-							"motorcycle"
-						],
 						"enum": [
 							"psv",
 							"trl",
@@ -138,10 +130,6 @@
 								{
 									"title": "Inspection Type",
 									"type": "string",
-									"tsEnumNames": [
-										"basic",
-										"normal"
-									],
 									"enum": [
 										"basic",
 										"normal"

diff --git a/json-schemas/v3/tech-record/enums/vehicleType.enum.json b/json-schemas/v3/tech-record/enums/vehicleType.enum.json
diff --git a/json-schemas/v3/tech-record/get/search/index.json b/json-schemas/v3/tech-record/get/search/index.json
@@ -29,14 +29,6 @@
 		"techRecord_vehicleType": {
 			"title": "Vehicle Type",
 			"type": "string",
-			"tsEnumNames": [
-				"psv",
-				"trl",
-				"hgv",
-				"car",
-				"lgv",
-				"motorcycle"
-			],
 			"enum": [
 				"psv",
 				"trl",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dvsa/cvs-type-definitions",
-  "version": "3.5.0",
+  "version": "3.4.0",
   "description": "type definitions for cvs vta and vtm applications",
   "main": "index.js",
   "repository": {

diff --git a/schemas.ts b/schemas.ts
@@ -1,5 +1,4 @@
 export const schemas = [
-  "iva/defects/enums/inspectionType.enum.json",
   "iva/defects/get/index.json",
   "v1/activity/index.json",
   "v1/defect-category-reference-data/index.json",
@@ -26,7 +25,6 @@ export const schemas = [
   "v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json",
   "v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json",
   "v3/tech-record/enums/vehicleConfigurationTrl.enum.json",
-  "v3/tech-record/enums/vehicleType.enum.json",
   "v3/tech-record/get/car/complete/index.json",
   "v3/tech-record/get/car/skeleton/index.json",
   "v3/tech-record/get/hgv/complete/index.json",

diff --git a/types/iva/defects/enums/inspectionType.enum.ts b/types/iva/defects/enums/inspectionType.enum.ts
diff --git a/types/iva/defects/get/index.d.ts b/types/iva/defects/get/index.d.ts
@@ -5,6 +5,9 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
+export type VehicleType = "psv" | "trl" | "hgv" | "car" | "lgv" | "motorcycle";
+export type InspectionType = "basic" | "normal";
+
 export interface DefectGETIVA {
   sectionNumber: string;
   sectionDescription: string;
@@ -19,14 +22,6 @@ export interface DefectGETIVA {
   }[];
 }
 
-export enum VehicleType {
-  psv = "psv",
-  trl = "trl",
-  hgv = "hgv",
-  car = "car",
-  lgv = "lgv",
-  motorcycle = "motorcycle"
-}
 export enum EUVehicleCategory {
   M1 = "m1",
   M2 = "m2",
@@ -47,7 +42,3 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
-export enum InspectionType {
-  basic = "basic",
-  normal = "normal"
-}
diff --git a/types/v3/tech-record/enums/vehicleType.enum.ts b/types/v3/tech-record/enums/vehicleType.enum.ts
diff --git a/types/v3/tech-record/get/search/index.d.ts b/types/v3/tech-record/get/search/index.d.ts
@@ -6,6 +6,7 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
+export type VehicleType = "psv" | "trl" | "hgv" | "car" | "lgv" | "motorcycle";
 
 export interface TechRecordSearchSchema {
   primaryVrm?: string;
@@ -23,12 +24,3 @@ export interface TechRecordSearchSchema {
   techRecord_reasonForCreation?: string;
   techRecord_createdByName?: string;
 }
-
-export enum VehicleType {
-  psv = "psv",
-  trl = "trl",
-  hgv = "hgv",
-  car = "car",
-  lgv = "lgv",
-  motorcycle = "motorcycle"
-}