major(cb2-12677): update test-results types (#174)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Leo <leo.ginever@bjss.com>
dvsa · Jun 27, 2024 · f4f6334 · f4f6334
1 parent b89f3dc
commit f4f6334
Show file tree

Hide file tree

Showing 49 changed files with 4,074 additions and 566 deletions.
diff --git a/json-definitions/v1/activity/index.json b/json-definitions/v1/activity/index.json
@@ -2,9 +2,15 @@
   "title": "Activity Schema",
   "type": "object",
   "properties": {
-    "activityType": {
+    "parentId": {
       "type": "string"
     },
+    "id": {
+      "type": "string"
+    },
+    "activityType": {
+      "$ref": "../enums/activityType.enum.json"
+    },
     "testStationName": {
       "type": "string"
     },
@@ -15,7 +21,7 @@
       "type": "string"
     },
     "testStationType": {
-      "type": "string"
+      "$ref": "../enums/testStationType.enum.json"
     },
     "testerName": {
       "type": "string"
@@ -30,24 +36,20 @@
       "type": "string"
     },
     "endTime": {
-      "type": "string"
-    },
-    "parentId": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "waitReason": {
       "type": "array",
       "items": {
-        "type": "string"
+        "$ref": "../enums/waitReason.enum.json"
       }
     },
     "notes": {
       "type": "string"
     },
-    "id": {
+    "activityDay": {
       "type": "string"
     }
-
   },
   "additionalProperties": false,
   "required": [
@@ -60,4 +62,4 @@
     "testerStaffId",
     "startTime"
   ]
-}
+}
diff --git a/json-definitions/v1/enums/activityType.enum.json b/json-definitions/v1/enums/activityType.enum.json
@@ -0,0 +1,14 @@
+{
+    "title": "Activity Type",
+    "type": "string",
+    "tsEnumNames": [
+        "VISIT",
+        "WAIT" ,
+        "UNACCOUNTABLE_TIME" 
+    ],
+    "enum": [
+        "visit",
+        "time",
+        "unaccountable time"
+    ]
+  }
diff --git a/json-definitions/v1/enums/emissionStandard.enum.json b/json-definitions/v1/enums/emissionStandard.enum.json
@@ -0,0 +1,26 @@
+{
+    "title": "Emission Standards",
+    "type": "string",
+    "tsEnumNames": [
+        "EURO3_PM",
+        "EURO4_PM",
+        "EURO3",
+        "EURO4",
+        "EURO5",
+        "EURO6",
+        "EUROV",
+        "EUROVI",
+        "FULL_ELECTRIC"
+    ],
+    "enum": [
+        "0.10 g/kWh Euro 3 PM",
+        "0.03 g/kWh Euro IV PM'",
+        "Euro 3",
+        "Euro 4",
+        "Euro 5",
+        "Euro 6",
+        "Euro V",
+        "Euro VI",
+        "Full Electric"
+    ]
+}
diff --git a/json-definitions/v1/enums/fuelType.enum.json b/json-definitions/v1/enums/fuelType.enum.json
@@ -0,0 +1,22 @@
+{
+    "title": "Fuel Type",
+    "type": "string",
+    "tsEnumNames": [
+        "DIESEL",
+        "GAS_CNG",
+        "GAS_LNG",
+        "GAS_LPG",
+        "PETROL",
+        "FUEL_CELL",
+        "FULL_ELECTRIC"
+    ],
+    "enum": [
+        "diesel",
+        "gas-cng",
+        "gas-lng",
+        "gas-lpg",
+        "petrol",
+        "fuel cell",
+        "full electric"
+    ]
+}
diff --git a/json-definitions/v1/enums/odometerReadingUnits.enum.json b/json-definitions/v1/enums/odometerReadingUnits.enum.json
@@ -0,0 +1,12 @@
+{
+    "title": "Odometer Reading Units",
+    "type": "string",
+    "tsEnumNames": [
+        "KILOMETRES",
+        "MILES"
+    ],
+    "enum": [
+        "kilometres",
+        "miles"
+    ]
+}
diff --git a/json-definitions/v1/enums/sources.enum.json b/json-definitions/v1/enums/sources.enum.json
@@ -0,0 +1,12 @@
+{
+    "title": "Test Sources",
+    "type": "string",
+    "tsEnumNames": [
+        "VTM",
+        "VTA"
+    ],
+    "enum": [
+        "vtm",
+        "vta"
+    ]
+}
diff --git a/json-definitions/v1/enums/testResult.enum.json b/json-definitions/v1/enums/testResult.enum.json
@@ -0,0 +1,16 @@
+{
+    "title": "Test Results",
+    "type": "string",
+    "tsEnumNames": [
+        "PASS",
+        "PRS",
+        "FAIL",
+        "ABANDONED"
+    ],
+    "enum": [
+        "pass",
+        "prs",
+        "fail",
+        "abandoned"
+    ]
+}
diff --git a/json-definitions/v1/enums/testStationType.enum.json b/json-definitions/v1/enums/testStationType.enum.json
@@ -0,0 +1,16 @@
+{
+    "title": "Test Station Types",
+    "type": "string",
+    "tsEnumNames": [
+        "ATF",
+        "GVTS",
+        "HQ",
+        "POTF"
+    ],
+    "enum": [
+        "atf",
+        "gvts",
+        "hq",
+        "potf"
+    ]
+}
diff --git a/json-definitions/v1/enums/testStatus.enum.json b/json-definitions/v1/enums/testStatus.enum.json
@@ -0,0 +1,12 @@
+{
+    "title": "Test Status",
+    "type": "string",
+    "tsEnumNames": [
+        "SUBMITTED",
+        "CANCELLED"
+    ],
+    "enum": [
+        "submitted",
+        "cancelled"
+    ]
+}
diff --git a/json-definitions/v1/enums/typeOfTest.enum.json b/json-definitions/v1/enums/typeOfTest.enum.json
@@ -0,0 +1,14 @@
+{
+    "title": "Type of test",
+    "type": "string",
+    "tsEnumNames": [
+        "CONTINGENCY",
+        "DESK_BASED",
+        "COMPLETION"
+    ],
+    "enum": [
+        "contingency",
+        "desk-based",
+        "completion"
+    ]
+}
diff --git a/json-definitions/v1/enums/waitReason.enum.json b/json-definitions/v1/enums/waitReason.enum.json
@@ -0,0 +1,18 @@
+{
+    "title": "Wait Reason",
+    "type": "string",
+    "tsEnumNames": [
+        "WAITING_FOR_VEHICLE",
+        "BREAK" ,
+        "ADMIN", 
+        "SITE_ISSUE",
+        "OTHER" 
+    ],
+    "enum": [
+        "Waiting for vehicle",
+        "Break",
+        "Admin",
+        "Site issue",
+        "Other"
+    ]
+  }
diff --git a/json-definitions/v1/required-standards/index.ignore.json b/json-definitions/v1/required-standards/index.ignore.json
@@ -0,0 +1,54 @@
+{
+    "title": "Specialist Custom Defects Schema Put",
+    "type": "object",
+    "properties": {
+        "sectionNumber": {
+            "type": "string"
+        },
+        "sectionDescription": {
+            "type": "string"
+        },
+        "additionalNotes": {
+            "type": [
+                "string",
+                "null"
+            ]
+        },
+        "rsNumber": {
+            "type": "integer"
+        },
+        "requiredStandard": {
+            "type": "string"
+        },
+        "refCalculation": {
+            "type": "string"
+        },
+        "additionalInfo": {
+            "type": "boolean"
+        },
+        "inspectionTypes": {
+            "type": "array",
+            "items": {
+                "anyOf": [
+                    {
+                        "$ref": "../../required-standards/defects/enums/inspectionType.ignore.json"
+                    }
+                ]
+            }
+        },
+        "prs": {
+            "type": "boolean"
+        }
+    },
+    "additionalProperties": false,
+    "required": [
+        "sectionNumber",
+        "sectionDescription",
+        "rsNumber",
+        "requiredStandard",
+        "refCalculation",
+        "additionalInfo",
+        "referenceNumber",
+        "prs"
+    ]
+}