fix: Ownership should include interest plus updated example paylo…

…ads (#168)
theopensystemslab · May 6, 2024 · 579db95 · 579db95
1 parent 93ccd19
commit 579db95
Show file tree

Hide file tree

Showing 10 changed files with 202 additions and 93 deletions.
diff --git a/examples/data/ldcE.ts b/examples/data/ldcE.ts
@@ -54,22 +54,21 @@ export const validLDCE: Schema = {
       siteContact: {
         role: 'applicant',
       },
-      interest: 'owner.co',
       ownership: {
-        certificate: 'b',
-        noticeGiven: true,
+        interest: 'occupier',
         owners: [
           {
+            interest: 'owner',
             name: 'Matilda Wormwood',
             address: {
               town: 'Reading',
               line1: '9, Library Way',
               line2: '',
               county: '',
-              country: '',
+              country: 'UK',
               postcode: 'L1T3R8Y',
             },
-            noticeDate: '1988-04-01',
+            noticeGiven: true,
           },
         ],
       },

diff --git a/examples/data/ldcP.ts b/examples/data/ldcP.ts
@@ -51,9 +51,8 @@ export const validLDCP: Schema = {
       siteContact: {
         role: 'applicant',
       },
-      interest: 'owner.sole',
       ownership: {
-        certificate: 'a',
+        interest: 'owner',
       },
     },
     property: {

diff --git a/examples/data/listedBuildingConsent.ts b/examples/data/listedBuildingConsent.ts
@@ -29,8 +29,8 @@ export const validListedBuildingConsent: Schema = {
         email: '[email protected]',
         phone: '987654321',
       },
-      interest: 'owner.sole',
       ownership: {
+        interest: 'owner.sole',
         certificate: 'b',
         noticeGiven: true,
         agriculturalTenants: true,

diff --git a/examples/data/planningPermission.ts b/examples/data/planningPermission.ts
@@ -54,9 +54,13 @@ export const validPlanningPermission: Schema = {
       siteContact: {
         role: 'proxy',
       },
-      interest: 'owner.sole',
       ownership: {
+        interest: 'owner.sole',
         certificate: 'a',
+        agriculturalTenants: false,
+        declaration: {
+          accurate: true,
+        },
       },
       agent: {
         name: {

diff --git a/examples/validLawfulDevelopmentCertificateExisting.json b/examples/validLawfulDevelopmentCertificateExisting.json
@@ -50,22 +50,21 @@
       "siteContact": {
         "role": "applicant"
       },
-      "interest": "owner.co",
       "ownership": {
-        "certificate": "b",
-        "noticeGiven": true,
+        "interest": "occupier",
         "owners": [
           {
+            "interest": "owner",
             "name": "Matilda Wormwood",
             "address": {
               "town": "Reading",
               "line1": "9, Library Way",
               "line2": "",
               "county": "",
-              "country": "",
+              "country": "UK",
               "postcode": "L1T3R8Y"
             },
-            "noticeDate": "1988-04-01"
+            "noticeGiven": true
           }
         ]
       },

diff --git a/examples/validLawfulDevelopmentCertificateProposed.json b/examples/validLawfulDevelopmentCertificateProposed.json
@@ -47,9 +47,8 @@
       "siteContact": {
         "role": "applicant"
       },
-      "interest": "owner.sole",
       "ownership": {
-        "certificate": "a"
+        "interest": "owner"
       }
     },
     "property": {

diff --git a/examples/validListedBuildingConsent.json b/examples/validListedBuildingConsent.json
@@ -25,8 +25,8 @@
         "email": "[email protected]",
         "phone": "987654321"
       },
-      "interest": "owner.sole",
       "ownership": {
+        "interest": "owner.sole",
         "certificate": "b",
         "noticeGiven": true,
         "agriculturalTenants": true,

diff --git a/examples/validPlanningPermission.json b/examples/validPlanningPermission.json
@@ -50,9 +50,13 @@
       "siteContact": {
         "role": "proxy"
       },
-      "interest": "owner.sole",
       "ownership": {
-        "certificate": "a"
+        "interest": "owner.sole",
+        "certificate": "a",
+        "agriculturalTenants": false,
+        "declaration": {
+          "accurate": true
+        }
       },
       "agent": {
         "name": {

diff --git a/schema/schema.json b/schema/schema.json
@@ -118,17 +118,6 @@
         "email": {
           "$ref": "#/definitions/Email"
         },
-        "interest": {
-          "enum": [
-            "owner",
-            "owner.sole",
-            "owner.co",
-            "tenant",
-            "occupier",
-            "other"
-          ],
-          "type": "string"
-        },
         "name": {
           "additionalProperties": false,
           "properties": {
@@ -1774,17 +1763,6 @@
         "email": {
           "$ref": "#/definitions/Email"
         },
-        "interest": {
-          "enum": [
-            "owner",
-            "owner.sole",
-            "owner.co",
-            "tenant",
-            "occupier",
-            "other"
-          ],
-          "type": "string"
-        },
         "name": {
           "additionalProperties": false,
           "properties": {
@@ -5397,6 +5375,135 @@
       ],
       "description": "Types of natural open spaces"
     },
+    "Owners": {
+      "$id": "#Owners",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/OwnersNoticeGiven"
+        },
+        {
+          "$ref": "#/definitions/OwnersNoNoticeGiven"
+        },
+        {
+          "$ref": "#/definitions/OwnersNoticeDate"
+        }
+      ],
+      "description": "Names and addresses of all known owners and agricultural tenants, including confirmation or date of notice, or reason requisite notice has not been given if applicable"
+    },
+    "OwnersNoNoticeGiven": {
+      "additionalProperties": false,
+      "properties": {
+        "address": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Address"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "interest": {
+          "enum": [
+            "owner",
+            "tenant",
+            "occupier",
+            "other"
+          ],
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "noNoticeReason": {
+          "type": "string"
+        },
+        "noticeGiven": {
+          "const": false,
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "address",
+        "name",
+        "noNoticeReason",
+        "noticeGiven"
+      ],
+      "type": "object"
+    },
+    "OwnersNoticeDate": {
+      "additionalProperties": false,
+      "properties": {
+        "address": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Address"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "interest": {
+          "enum": [
+            "owner",
+            "tenant",
+            "occupier",
+            "other"
+          ],
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "noticeDate": {
+          "$ref": "#/definitions/Date"
+        }
+      },
+      "required": [
+        "address",
+        "name",
+        "noticeDate"
+      ],
+      "type": "object"
+    },
+    "OwnersNoticeGiven": {
+      "additionalProperties": false,
+      "properties": {
+        "address": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Address"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "interest": {
+          "enum": [
+            "owner",
+            "tenant",
+            "occupier",
+            "other"
+          ],
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "noticeGiven": {
+          "const": true,
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "address",
+        "name",
+        "noticeGiven"
+      ],
+      "type": "object"
+    },
     "Ownership": {
       "$id": "#Ownership",
       "additionalProperties": false,
@@ -5420,6 +5527,7 @@
           "description": "Declaration of the accuracy of the ownership certificate, including reasonable steps taken to find all owners and publish notice",
           "properties": {
             "accurate": {
+              "const": true,
               "type": "boolean"
             }
           },
@@ -5428,6 +5536,17 @@
           ],
           "type": "object"
         },
+        "interest": {
+          "enum": [
+            "owner",
+            "owner.sole",
+            "owner.co",
+            "tenant",
+            "occupier",
+            "other"
+          ],
+          "type": "string"
+        },
         "noticeGiven": {
           "description": "Has requisite notice been given to all the known owners and agricultural tenants?",
           "type": "boolean"
@@ -5451,36 +5570,9 @@
           ],
           "type": "object"
         },
-        "noticeReason": {
-          "type": "string"
-        },
         "owners": {
-          "description": "Names and addresses of all known owners and agricultural tenants",
           "items": {
-            "additionalProperties": false,
-            "properties": {
-              "address": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/Address"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              },
-              "name": {
-                "type": "string"
-              },
-              "noticeDate": {
-                "$ref": "#/definitions/Date"
-              }
-            },
-            "required": [
-              "name",
-              "address"
-            ],
-            "type": "object"
+            "$ref": "#/definitions/Owners"
           },
           "type": "array"
         },
@@ -5494,9 +5586,6 @@
           "type": "string"
         }
       },
-      "required": [
-        "certificate"
-      ],
       "type": "object"
     },
     "PlanXMetadata": {