Merge pull request #31 from Property-Data-Trust-Framework/next

Merge 1.0.0 to master
Property-Data-Trust-Framework · Dec 1, 2022 · c97b72a · c97b72a
2 parents 25675d2 + cfbd7f8
commit c97b72a
Show file tree

Hide file tree

Showing 5 changed files with 341 additions and 286 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pdtf/schemas",
-  "version": "0.11.0",
+  "version": "1.0.0",
   "description": "Property Data Trust Framework Schemas and Utilities",
   "main": "index.js",
   "directories": {

diff --git a/src/examples/exampleTransaction.json b/src/examples/exampleTransaction.json
@@ -30,22 +30,27 @@
         "hasDelayFactors": { "yesNo": "No" }
       },
       "ownership": {
-        "ownershipType": "Leasehold",
-        "sharedOwnership": { "isSharedOwnership": "No" },
-        "startYearOfLease": 1900,
-        "lengthOfLeaseInYears": 999,
-        "currentGroundRent": 1750,
-        "rentIncrease": { "yesNo": "No" },
-        "annualServiceCharge": 250.23,
-        "largeAdditionalExpense": { "yesNo": "No" },
-        "additionalFeesOnSale": 0,
-        "freeholderContactDetails": {
-          "nameOrOrganisation": "Fleesum Properties"
-        },
-        "managingAgentContactDetails": {
-          "nameOrOrganisation": "Pricee Living"
-        },
-        "managementCompanyDirectorRequirement": { "yesNo": "No" }
+        "ownershipsToBeTransferred": [
+          {
+            "titleNumber": "HD221222",
+            "ownershipType": "Leasehold",
+            "sharedOwnership": { "isSharedOwnership": "No" },
+            "startYearOfLease": 1900,
+            "lengthOfLeaseInYears": 999,
+            "currentGroundRent": 1750,
+            "rentIncrease": { "yesNo": "No" },
+            "annualServiceCharge": 250.23,
+            "largeAdditionalExpense": { "yesNo": "No" },
+            "additionalFeesOnSale": 0,
+            "freeholderContactDetails": {
+              "nameOrOrganisation": "Fleesum Properties"
+            },
+            "managingAgentContactDetails": {
+              "nameOrOrganisation": "Pricee Living"
+            },
+            "managementCompanyDirectorRequirement": { "yesNo": "No" }
+          }
+        ]
       },
       "parking": {
         "parkingArrangements": {
@@ -425,6 +430,7 @@
       "legalOwners": {
         "namesOfLegalOwners": [
           {
+            "ownerType": "Private individual",
             "firstName": "Peter",
             "lastName": "Hetherington-Smythe"
           }

diff --git a/src/schemas/v1/legal-information.json b/src/schemas/v1/legal-information.json
@@ -24,39 +24,68 @@
       "type": "object",
       "properties": {
         "namesOfLegalOwners": {
-          "baspiRef": "B1.1",
+          "baspiRef": "B1",
           "RDSRef": "RightsHolders",
-          "title": "Full names of all legal owner(s)",
+          "title": "Names of all legal owners",
           "type": "array",
           "minItems": 1,
           "items": {
+            "baspiRef": "B1",
+            "title": "Legal owner",
             "type": "object",
-            "baspiRef": "B1.1.1",
-            "title": "Owner name",
-            "required": ["firstName", "lastName"],
+            "required": ["ownerType"],
             "properties": {
-              "firstName": {
-                "baspiRef": "B1.1.1",
-                "title": "First name",
+              "ownerType": {
                 "type": "string",
-                "minLength": 1
-              },
-              "middleNames": {
-                "baspiRef": "B1.1.2",
-                "title": "Middle names",
-                "type": "string"
+                "title": "Type of owner",
+                "enum": ["Private individual", "Organisation"]
+              }
+            },
+            "discriminator": { "propertyName": "ownerType" },
+            "oneOf": [
+              {
+                "properties": {
+                  "ownerType": {
+                    "enum": ["Private individual"]
+                  },
+                  "firstName": {
+                    "baspiRef": "B1.1.1",
+                    "title": "First name",
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "middleNames": {
+                    "baspiRef": "B1.1.2",
+                    "title": "Middle names",
+                    "type": "string"
+                  },
+                  "lastName": {
+                    "baspiRef": "B1.1.3",
+                    "title": "Last name",
+                    "type": "string",
+                    "minLength": 1
+                  }
+                },
+                "required": ["firstName", "lastName"]
               },
-              "lastName": {
-                "baspiRef": "B1.1.3",
-                "title": "Last name",
-                "type": "string",
-                "minLength": 1
+              {
+                "properties": {
+                  "ownerType": {
+                    "enum": ["Organisation"]
+                  },
+                  "organisationName": {
+                    "baspiRef": "B1.1.1",
+                    "title": "Organisation name",
+                    "type": "string",
+                    "minLength": 1
+                  }
+                },
+                "required": ["organisationName"]
               }
-            }
+            ]
           }
         }
-      },
-      "required": ["namesOfLegalOwners"]
+      }
     },
     "sellersCapacity": {
       "baspiRef": "B1.3",