patch(cb2-9864): adr tank details part 3 (#151)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
dvsa · Dec 6, 2023 · 604a7cf · 604a7cf
1 parent ed96656
commit 604a7cf
Show file tree

Hide file tree

Showing 54 changed files with 1,098 additions and 380 deletions.
diff --git a/...v3/tech-record/enums/tc3Types.ignore.json → ...s/v3/tech-record/enums/tc3Types.enum.json b/...v3/tech-record/enums/tc3Types.ignore.json → ...s/v3/tech-record/enums/tc3Types.enum.json
@@ -1,6 +1,11 @@
 {
     "title": "TC3 Types",
     "type": "string",
+    "tsEnumNames": [
+        "INTERMEDIATE",
+        "PERIODIC",
+        "EXCEPTIONAL"
+      ],
     "enum": [
         "intermediate",
         "periodic",

diff --git a/json-definitions/v3/tech-record/get/hgv/complete/index.json b/json-definitions/v3/tech-record/get/hgv/complete/index.json
@@ -80,9 +80,14 @@
       ]
     },
     "techRecord_adrDetails_vehicleDetails_approvalDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_permittedDangerousGoods": {
@@ -234,7 +239,8 @@
       "type": [
         "string",
         "null"
-      ]
+      ],
+      "maxLength": 40
     },
     "techRecord_adrDetails_adrCertificateNotes": {
       "type": [
@@ -303,9 +309,14 @@
       "maxLength": 70
     },
     "techRecord_adrDetails_tank_tankDetails_tc2Details_tc2IntermediateExpiryDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_tank_tankDetails_tc3Details": {
@@ -324,7 +335,7 @@
                 "type": "null"
               },
               {
-                "$ref": "../../../enums/tc3Types.ignore.json"
+                "$ref": "../../../enums/tc3Types.enum.json"
               }
             ]
           },
@@ -336,9 +347,14 @@
             "maxLength": 75
           },
           "tc3PeriodicExpiryDate": {
-            "type": [
-              "string",
-              "null"
+            "anyOf": [
+              {
+                "type": "string",
+                "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+              },
+              {
+                "type": "null"
+              }
             ]
           }
         }

diff --git a/json-definitions/v3/tech-record/get/hgv/skeleton/index.json b/json-definitions/v3/tech-record/get/hgv/skeleton/index.json
@@ -50,9 +50,14 @@
       ]
     },
     "techRecord_adrDetails_vehicleDetails_approvalDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_permittedDangerousGoods": {
@@ -204,7 +209,8 @@
       "type": [
         "string",
         "null"
-      ]
+      ],
+      "maxLength": 40
     },
     "techRecord_adrDetails_adrCertificateNotes": {
       "type": [
@@ -273,9 +279,14 @@
       "maxLength": 70
     },
     "techRecord_adrDetails_tank_tankDetails_tc2Details_tc2IntermediateExpiryDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_tank_tankDetails_tc3Details": {
@@ -294,7 +305,7 @@
                 "type": "null"
               },
               {
-                "$ref": "../../../enums/tc3Types.ignore.json"
+                "$ref": "../../../enums/tc3Types.enum.json"
               }
             ]
           },
@@ -306,9 +317,14 @@
             "maxLength": 75
           },
           "tc3PeriodicExpiryDate": {
-            "type": [
-              "string",
-              "null"
+            "anyOf": [
+              {
+                "type": "string",
+                "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+              },
+              {
+                "type": "null"
+              }
             ]
           }
         }
@@ -929,7 +945,7 @@
       "const": "v"
     },
     "techRecord_vehicleClass_description": {
-      "const": "heavy goods vehicle" 
+      "const": "heavy goods vehicle"
     },
     "techRecord_vehicleConfiguration": {
       "anyOf": [
@@ -1019,4 +1035,4 @@
       ]
     }
   }
-}
+}
diff --git a/json-definitions/v3/tech-record/get/hgv/testable/index.json b/json-definitions/v3/tech-record/get/hgv/testable/index.json
@@ -54,9 +54,14 @@
       ]
     },
     "techRecord_adrDetails_vehicleDetails_approvalDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_permittedDangerousGoods": {
@@ -208,7 +213,8 @@
       "type": [
         "string",
         "null"
-      ]
+      ],
+      "maxLength": 40
     },
     "techRecord_adrDetails_adrCertificateNotes": {
       "type": [
@@ -277,9 +283,14 @@
       "maxLength": 70
     },
     "techRecord_adrDetails_tank_tankDetails_tc2Details_tc2IntermediateExpiryDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_tank_tankDetails_tc3Details": {
@@ -298,7 +309,7 @@
                 "type": "null"
               },
               {
-                "$ref": "../../../enums/tc3Types.ignore.json"
+                "$ref": "../../../enums/tc3Types.enum.json"
               }
             ]
           },
@@ -310,9 +321,14 @@
             "maxLength": 75
           },
           "tc3PeriodicExpiryDate": {
-            "type": [
-              "string",
-              "null"
+            "anyOf": [
+              {
+                "type": "string",
+                "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+              },
+              {
+                "type": "null"
+              }
             ]
           }
         }
@@ -1010,4 +1026,4 @@
       ]
     }
   }
-}
+}
diff --git a/json-definitions/v3/tech-record/get/lgv/complete/index.json b/json-definitions/v3/tech-record/get/lgv/complete/index.json
@@ -85,9 +85,14 @@
       ]
     },
     "techRecord_adrDetails_vehicleDetails_approvalDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_permittedDangerousGoods": {
@@ -239,7 +244,8 @@
       "type": [
         "string",
         "null"
-      ]
+      ],
+      "maxLength": 40
     },
     "techRecord_adrDetails_adrCertificateNotes": {
       "type": [
@@ -308,9 +314,14 @@
       "maxLength": 70
     },
     "techRecord_adrDetails_tank_tankDetails_tc2Details_tc2IntermediateExpiryDate": {
-      "type": [
-        "string",
-        "null"
+      "anyOf": [
+        {
+          "type": "string",
+          "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+        },
+        {
+          "type": "null"
+        }
       ]
     },
     "techRecord_adrDetails_tank_tankDetails_tc3Details": {
@@ -329,7 +340,7 @@
                 "type": "null"
               },
               {
-                "$ref": "../../../enums/tc3Types.ignore.json"
+                "$ref": "../../../enums/tc3Types.enum.json"
               }
             ]
           },
@@ -341,9 +352,14 @@
             "maxLength": 75
           },
           "tc3PeriodicExpiryDate": {
-            "type": [
-              "string",
-              "null"
+            "anyOf": [
+              {
+                "type": "string",
+                "pattern": "^\\d{4}-\\d{2}-\\d{2}$"
+              },
+              {
+                "type": "null"
+              }
             ]
           }
         }
@@ -517,4 +533,4 @@
       }
     }
   }
-}
+}