fix: more ProjectTypes and minor adjustments (#43)

theopensystemslab · Sep 29, 2023 · d47a46d · d47a46d
1 parent 8b08ae1
commit d47a46d
Show file tree

Hide file tree

Showing 11 changed files with 602 additions and 64 deletions.
diff --git a/examples/data/Applicant.ts b/examples/data/Applicant.ts
@@ -21,6 +21,7 @@ export const validApplicant: Schema['data']['applicant'] = {
   interest: 'owner.co',
   ownership: {
     certificate: 'a',
+    noticeGiven: true,
     owners: [
       {
         name: 'Owner 1',
@@ -29,13 +30,11 @@ export const validApplicant: Schema['data']['applicant'] = {
           town: 'Anywhere',
           postcode: 'SE5 0HU',
         },
-        noticeGiven: true,
         noticeDate: '2023-10-01',
       },
       {
         name: 'Owner 2',
         address: 'Same as Owner 1',
-        noticeGiven: false,
       },
     ],
   },

diff --git a/examples/data/Application.ts b/examples/data/Application.ts
@@ -23,6 +23,8 @@ export const validApplication: Schema['data']['application'] = {
   },
   declaration: {
     accurate: true,
-    connection: 'none',
+    connection: {
+      value: 'none',
+    },
   },
 };
diff --git a/examples/index.ts b/examples/index.ts
@@ -7,7 +7,8 @@ import {validResponses} from './data/Responses';
 
 const validMetadata: Schema['metadata'] = {
   service: {
-    publishedFlowId: 'b3320abe-f5bc-4185-b61f-40e9e65f07ad',
+    flowId: 'b3320abe-f5bc-4185-b61f-40e9e65f07ad',
+    publishedFlowId: 22,
     name: 'Test',
     owner: 'Test',
     url: 'https://www.planx.uk/',
@@ -18,6 +19,9 @@ const validMetadata: Schema['metadata'] = {
     createdAt: '2018-11-13T20:20:39+00:00',
     submittedAt: '2018-11-13T20:20:39+00:00',
   },
+  schema: {
+    url: 'https://theopensystemslab.github.io/digital-planning-data-schemas/v0.0.1/schema.json',
+  },
 };
 
 const validFiles: Schema['files'] = [

diff --git a/examples/validExampleAgent.json b/examples/validExampleAgent.json
@@ -71,7 +71,9 @@
       },
       "declaration": {
         "accurate": true,
-        "connection": "none"
+        "connection": {
+          "value": "none"
+        }
       }
     },
     "property": {
@@ -222,7 +224,8 @@
   ],
   "metadata": {
     "service": {
-      "publishedFlowId": "b3320abe-f5bc-4185-b61f-40e9e65f07ad",
+      "flowId": "b3320abe-f5bc-4185-b61f-40e9e65f07ad",
+      "publishedFlowId": 22,
       "name": "Test",
       "owner": "Test",
       "url": "https://www.planx.uk/"
@@ -232,6 +235,9 @@
       "id": "b3320abe-f5bc-4185-b61f-40e9e65f07ad",
       "createdAt": "2018-11-13T20:20:39+00:00",
       "submittedAt": "2018-11-13T20:20:39+00:00"
+    },
+    "schema": {
+      "url": "https://theopensystemslab.github.io/digital-planning-data-schemas/v0.0.1/schema.json"
     }
   },
   "responses": [

diff --git a/examples/validExampleApplicant.json b/examples/validExampleApplicant.json
@@ -24,6 +24,7 @@
       "interest": "owner.co",
       "ownership": {
         "certificate": "a",
+        "noticeGiven": true,
         "owners": [
           {
             "name": "Owner 1",
@@ -32,13 +33,11 @@
               "town": "Anywhere",
               "postcode": "SE5 0HU"
             },
-            "noticeGiven": true,
             "noticeDate": "2023-10-01"
           },
           {
             "name": "Owner 2",
-            "address": "Same as Owner 1",
-            "noticeGiven": false
+            "address": "Same as Owner 1"
           }
         ]
       }
@@ -66,7 +65,9 @@
       },
       "declaration": {
         "accurate": true,
-        "connection": "none"
+        "connection": {
+          "value": "none"
+        }
       }
     },
     "property": {
@@ -217,7 +218,8 @@
   ],
   "metadata": {
     "service": {
-      "publishedFlowId": "b3320abe-f5bc-4185-b61f-40e9e65f07ad",
+      "flowId": "b3320abe-f5bc-4185-b61f-40e9e65f07ad",
+      "publishedFlowId": 22,
       "name": "Test",
       "owner": "Test",
       "url": "https://www.planx.uk/"
@@ -227,6 +229,9 @@
       "id": "b3320abe-f5bc-4185-b61f-40e9e65f07ad",
       "createdAt": "2018-11-13T20:20:39+00:00",
       "submittedAt": "2018-11-13T20:20:39+00:00"
+    },
+    "schema": {
+      "url": "https://theopensystemslab.github.io/digital-planning-data-schemas/v0.0.1/schema.json"
     }
   },
   "responses": [