Merge from next into master for release as v3.2.0 (#218)

* 166 missing discriminator properties in items inside arrays (#168) * Simplify TA10 structure, fix extractOverlay to handle discriminator in array items, correct planOnlyIndicator boolean * Fix TA10 enums * Bump version to release 3.0.1 * Remove "None" as accessibilityAndAdaptations option (#169) * Remove "None" as accessibilityAndAdaptations option * Bump to 3.0.2-1 * Add support for MI for lettings and NTS-L overlay (#171) * Add support for MI for lettings and NTS-L overlay * Add more transaction statuses, bump version * Fix holding deposit title and building safety description typo, bump version * AccessibiityAndAdaptations no longer required, as it can be empty, bump version * Add missing ntslRequireds, bump version * Missing NTSL Required * Bump to v3.1.0 * Add ISO 3-letter country code (#177) * Add district- county- and unitary-authority council names (#178) * Add district- county- and unitary-authority council names * Bump version to 3.2.0 pre-release 1 * add not available as option to base schema (#183) * update community to communal heating (#182) * Bump pre-release version (#185) * property address in titles supports array (#189) * Migrate from baspiRef to baspi4Ref, add baspi 5 fields and refs (#196) * Migrate from baspiRef to baspi4Ref, add baspi 5 fields and refs * Add mobile phone refs * Restructure sellers capacity in new seller role oneOf (#193) * Add 'additionalDocuments' to titles (#202) * 201 add title to participants mrmrs etc (#203) * Moved pdtf-verified-claims.json, updated tests and added README.md (#191) * Add licensing caveat for BASPI, PIQ and TA forms (#199) * Add title to participant --------- Co-authored-by: Amol Pednekar <[email protected]> * Add additional fields to support conveyancing quotes (#206) * Add additional fields * Add more properties * Bump pre-release version to 3.2.0-3 * Add additional address properties to participants (#207) * 208 restructure newly added properties (#209) * Moved pdtf-verified-claims.json, updated tests and added README.md (#191) * Add licensing caveat for BASPI, PIQ and TA forms (#199) * Amended structure of new properties --------- Co-authored-by: Amol Pednekar <[email protected]> * Bump version (#211) * 212 add seller declaration of authority to act (#213) * Added Sale Ready declarations in new prototype sr24 overlay * Bump pre-release version * 214 make sale ready declarations required (#215) * Add required * Bump version * Bump version (#217) --------- Co-authored-by: Jack Nelson <[email protected]> Co-authored-by: Amol Pednekar <[email protected]>
Property-Data-Trust-Framework · Jul 24, 2024 · 7f1f2b9 · 7f1f2b9
1 parent aeb6e21
commit 7f1f2b9
Show file tree

Hide file tree

Showing 17 changed files with 14,066 additions and 3,178 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,3 @@
-const { dereference } = require("@jdw/jst");
 const merge = require("deepmerge");
 const Ajv = require("ajv");
 const addFormats = require("ajv-formats");
@@ -33,7 +32,8 @@ const overlaysMap = {
     null: {},
   },
   "https://trust.propdata.org.uk/schemas/v3/pdtf-transaction.json": {
-    baspiV4: require("./src/schemas/v3/overlays/baspi.json"),
+    baspiV4: require("./src/schemas/v3/overlays/baspi4.json"),
+    baspiV5: require("./src/schemas/v3/overlays/baspi5.json"),
     ta6ed4: require("./src/schemas/v3/overlays/ta6.json"),
     ta7ed3: require("./src/schemas/v3/overlays/ta7.json"),
     ta10ed3: require("./src/schemas/v3/overlays/ta10.json"),
@@ -47,6 +47,7 @@ const overlaysMap = {
     rdsV333: require("./src/schemas/v3/overlays/rds.json"),
     oc1v21: require("./src/schemas/v3/overlays/oc1.json"),
     piqV3: require("./src/schemas/v3/overlays/piq.json"),
+    sr24: require("./src/schemas/v3/overlays/sr24.json"),
     null: {},
   },
 };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pdtf/schemas",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Property Data Trust Framework Schemas and Utilities",
   "main": "index.js",
   "directories": {

diff --git a/src/examples/v3/exampleTransaction.json b/src/examples/v3/exampleTransaction.json
@@ -5,16 +5,21 @@
   "participants": [
     {
       "name": {
+        "title": "Mr",
         "firstName": "Peter",
         "lastName": "Hetherington-Smythe"
       },
       "dateOfBirth": "1975-12-25",
       "phone": "07777 222333",
       "email": "[email protected]",
-      "address": { "line1": "47 Park Road", "postcode": "AL3 5AF" },
+      "address": {
+        "line1": "47 Park Road",
+        "postcode": "AL3 5AF",
+        "countryCode": "GBR"
+      },
       "role": "Seller",
       "sellersCapacity": { "capacity": "Legal Owner" },
-      "externalIds": { "MoveReady": "123434" }
+      "externalIds": { "Moverly": "123434" }
     },
     {
       "role": "Seller's Conveyancer",
@@ -23,7 +28,8 @@
         "line1": "123 Sweet St",
         "line2": "Test building",
         "town": "London",
-        "postcode": "SW1A 1AA"
+        "postcode": "SW1A 1AA",
+        "countryCode": "GBR"
       },
       "email": "[email protected]",
       "organisation": "Suemme and Profitt",
@@ -37,9 +43,14 @@
       "line2": "",
       "line3": "",
       "town": "HARPENDEN",
-      "postcode": "AL3 5AF"
+      "postcode": "AL3 5AF",
+      "homeNation": "England"
+    },
+    "localAuthority": {
+      "localAuthorityName": "Neverland Hook",
+      "districtCouncil": "Neverland Hook",
+      "countyCouncil": "Neverland County Council"
     },
-    "localAuthority": { "localAuthorityName": "Neverland Hook" },
     "priceInformation": {
       "price": 1260000,
       "priceQualifier": "Offers in excess of"
@@ -683,14 +694,18 @@
               "commonholdIndicator": false
             },
             "officialCopyDateTime": "2021-12-16T08:39:52",
-            "propertyAddress": {
-              "postcodeZone": {
-                "postcode": "AL3 5AF"
+            "propertyAddress": [
+              {
+                "postcodeZone": {
+                  "postcode": "AL3 5AF"
+                }
               },
-              "addressLine": {
-                "line": ["47 Park Road", "Harpenden"]
+              {
+                "addressLine": {
+                  "line": ["47 Park Road", "Harpenden"]
+                }
               }
-            },
+            ],
             "proprietorship": {
               "registeredProprietorParty": [
                 {