minor(cb2-13786): add in new ADR field with validation (#180)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
dvsa · Oct 15, 2024 · c544068 · c544068
1 parent 89e4a86
commit c544068
Show file tree

Hide file tree

Showing 55 changed files with 1,708 additions and 71 deletions.
diff --git a/json-definitions/v3/tech-record/enums/adrBodyDeclarationType.enum.json b/json-definitions/v3/tech-record/enums/adrBodyDeclarationType.enum.json
@@ -0,0 +1,14 @@
+{
+    "title": "ADR Body Declaration Types",
+    "type": "string",
+    "tsEnumNames": [
+        "PRE_1ST_JULY_2005",
+        "ON_OR_AFTER_1ST_JULY_2005",
+        "UNKNOWN"
+    ],
+    "enum": [
+        "Pre 1st July 2005",
+        "On or after 1st July 2005",
+        "Unknown"
+    ]
+}
diff --git a/json-definitions/v3/tech-record/get/hgv/complete/index.json b/json-definitions/v3/tech-record/get/hgv/complete/index.json
@@ -82,6 +82,16 @@
         "null"
       ]
     },
+    "techRecord_adrDetails_bodyDeclaration_type": {
+      "anyOf": [
+        {
+          "type": "null"
+        },
+        {
+          "$ref": "../../../enums/adrBodyDeclarationType.enum.json"
+        }
+      ]
+    },
     "techRecord_adrDetails_vehicleDetails_usedOnInternationalJourneys": {
       "anyOf": [
         {
@@ -1074,6 +1084,33 @@
           ]
         }
       },
+      {
+        "if": {
+          "properties": {
+            "techRecord_adrDetails_permittedDangerousGoods": {
+              "type": "array",
+              "contains": {
+                "type": "string",
+                "not": {
+                  "enum": [
+                    "Explosives (type 3)"
+                  ]
+                }
+              }
+            }
+          },
+          "required": [
+            "techRecord_adrDetails_permittedDangerousGoods"
+          ]
+        },
+        "then": {
+          "not": {
+            "required": [
+              "techRecord_adrDetails_bodyDeclaration_type"
+            ]
+          }
+        }
+      },
       {
         "if": {
           "properties": {

diff --git a/json-definitions/v3/tech-record/get/hgv/skeleton/index.json b/json-definitions/v3/tech-record/get/hgv/skeleton/index.json
@@ -52,6 +52,16 @@
         "null"
       ]
     },
+    "techRecord_adrDetails_bodyDeclaration_type": {
+      "anyOf": [
+        {
+          "type": "null"
+        },
+        {
+          "$ref": "../../../enums/adrBodyDeclarationType.enum.json"
+        }
+      ]
+    },
     "techRecord_adrDetails_vehicleDetails_usedOnInternationalJourneys": {
       "anyOf": [
         {
@@ -1155,6 +1165,33 @@
           ]
         }
       },
+      {
+        "if": {
+          "properties": {
+            "techRecord_adrDetails_permittedDangerousGoods": {
+              "type": "array",
+              "contains": {
+                "type": "string",
+                "not": {
+                  "enum": [
+                    "Explosives (type 3)"
+                  ]
+                }
+              }
+            }
+          },
+          "required": [
+            "techRecord_adrDetails_permittedDangerousGoods"
+          ]
+        },
+        "then": {
+          "not": {
+            "required": [
+              "techRecord_adrDetails_bodyDeclaration_type"
+            ]
+          }
+        }
+      },
       {
         "if": {
           "properties": {

diff --git a/json-definitions/v3/tech-record/get/hgv/testable/index.json b/json-definitions/v3/tech-record/get/hgv/testable/index.json
@@ -56,6 +56,16 @@
         "null"
       ]
     },
+    "techRecord_adrDetails_bodyDeclaration_type": {
+      "anyOf": [
+        {
+          "type": "null"
+        },
+        {
+          "$ref": "../../../enums/adrBodyDeclarationType.enum.json"
+        }
+      ]
+    },
     "techRecord_adrDetails_vehicleDetails_usedOnInternationalJourneys": {
       "anyOf": [
         {
@@ -1146,6 +1156,33 @@
           ]
         }
       },
+      {
+        "if": {
+          "properties": {
+            "techRecord_adrDetails_permittedDangerousGoods": {
+              "type": "array",
+              "contains": {
+                "type": "string",
+                "not": {
+                  "enum": [
+                    "Explosives (type 3)"
+                  ]
+                }
+              }
+            }
+          },
+          "required": [
+            "techRecord_adrDetails_permittedDangerousGoods"
+          ]
+        },
+        "then": {
+          "not": {
+            "required": [
+              "techRecord_adrDetails_bodyDeclaration_type"
+            ]
+          }
+        }
+      },
       {
         "if": {
           "properties": {

diff --git a/json-definitions/v3/tech-record/get/lgv/complete/index.json b/json-definitions/v3/tech-record/get/lgv/complete/index.json
@@ -73,8 +73,8 @@
       "maxLength": 255
     },
     "techRecord_adrDetails_documentId": {
-			"type": "string"
-		},
+      "type": "string"
+    },
     "techRecord_adrDetails_dangerousGoods": {
       "type": [
         "boolean",
@@ -87,6 +87,16 @@
         "null"
       ]
     },
+    "techRecord_adrDetails_bodyDeclaration_type": {
+      "anyOf": [
+        {
+          "type": "null"
+        },
+        {
+          "$ref": "../../../enums/adrBodyDeclarationType.enum.json"
+        }
+      ]
+    },
     "techRecord_adrDetails_vehicleDetails_usedOnInternationalJourneys": {
       "anyOf": [
         {
@@ -472,7 +482,7 @@
           "createdByName": {
             "type": "string"
           },
-          "certificateType":{
+          "certificateType": {
             "$ref": "../../../enums/adrCertificateTypes.enum.json"
           },
           "generatedTimestamp": {
@@ -638,13 +648,15 @@
           "properties": {
             "techRecord_adrDetails_permittedDangerousGoods": {
               "type": "array",
-                "contains": {
-                  "type": "string",
-                  "pattern": "^Explosives \\(type \\d\\)$"
-                }
+              "contains": {
+                "type": "string",
+                "pattern": "^Explosives \\(type \\d\\)$"
+              }
             }
           },
-          "required": ["techRecord_adrDetails_permittedDangerousGoods"]
+          "required": [
+            "techRecord_adrDetails_permittedDangerousGoods"
+          ]
         },
         "then": {
           "required": [
@@ -653,17 +665,53 @@
         }
       },
       {
-        "if" : {
+        "if": {
+          "properties": {
+            "techRecord_adrDetails_permittedDangerousGoods": {
+              "type": "array",
+              "contains": {
+                "type": "string",
+                "not": {
+                  "enum": [
+                    "Explosives (type 3)"
+                  ]
+                }
+              }
+            }
+          },
+          "required": [
+            "techRecord_adrDetails_permittedDangerousGoods"
+          ]
+        },
+        "then": {
+          "not": {
+            "required": [
+              "techRecord_adrDetails_bodyDeclaration_type"
+            ]
+          }
+        }
+      },
+      {
+        "if": {
           "properties": {
             "techRecord_adrDetails_vehicleDetails_type": {
-              "enum": ["Rigid tank","Rigid battery","Full drawbar tank",
-               "Full drawbar battery", "Centre axle tank" ,"Centre axle battery",
-               "Semi trailer tank","Semi trailer battery"]
+              "enum": [
+                "Rigid tank",
+                "Rigid battery",
+                "Full drawbar tank",
+                "Full drawbar battery",
+                "Centre axle tank",
+                "Centre axle battery",
+                "Semi trailer tank",
+                "Semi trailer battery"
+              ]
             }
           },
-          "required": ["techRecord_adrDetails_vehicleDetails_type"]
+          "required": [
+            "techRecord_adrDetails_vehicleDetails_type"
+          ]
         },
-        "then" : {
+        "then": {
           "required": [
             "techRecord_adrDetails_tank_tankDetails_tankManufacturer",
             "techRecord_adrDetails_tank_tankDetails_yearOfManufacture",
@@ -686,7 +734,9 @@
           ]
         },
         "then": {
-          "required":["techRecord_adrDetails_batteryListNumber"]
+          "required": [
+            "techRecord_adrDetails_batteryListNumber"
+          ]
         }
       },
       {
@@ -701,9 +751,11 @@
           ]
         },
         "then": {
-          "required": ["techRecord_adrDetails_weight"]
+          "required": [
+            "techRecord_adrDetails_weight"
+          ]
         }
       }
     ]
   }
-}
+}