@pdtf/schemas 2.0.0-2 → 2.0.0-21

package/index.js

@@ -45,25 +45,28 @@ const validator = ajv.compile(transactionSchema);
 
 // v2, via accessor functions and overlays
 const combinedSchema = require("./src/schemas/v2/combined.json");
-const coreSchema = require("./src/schemas/v2/core.json");
+const v2CoreSchema = require("./src/schemas/v2/pdtf-transaction.json");
 
 const baspiOverlay = require("./src/schemas/v2/overlays/baspi.json");
-// const ta6Overlay = require("./src/schemas/v2/overlays/ta6.json");
-// const ta7Overlay = require("./src/schemas/v2/overlays/ta7.json");
-// const lpe1Overlay = require("./src/schemas/v2/overlays/lpe1.json");
-// const fme1Overlay = require("./src/schemas/v2/overlays/fme1.json");
-// const llc1Overlay = require("./src/schemas/v2/overlays/llc1.json");
-// const con29ROverlay = require("./src/schemas/v2/overlays/con29R.json");
-// const con29DWOverlay = require("./src/schemas/v2/overlays/con29DW.json");
-// const rdsOverlay = require("./src/schemas/v2/overlays/rds.json");
-// const oc1Overlay = require("./src/schemas/v2/overlays/oc1.json");
-
-const overlays = { baspiV4: baspiOverlay };
+const ta6Overlay = require("./src/schemas/v2/overlays/ta6.json");
+const ta7Overlay = require("./src/schemas/v2/overlays/ta7.json");
+const ta10Overlay = require("./src/schemas/v2/overlays/ta10.json");
+const lpe1Overlay = require("./src/schemas/v2/overlays/lpe1.json");
+const fme1Overlay = require("./src/schemas/v2/overlays/fme1.json");
+const llc1Overlay = require("./src/schemas/v2/overlays/llc1.json");
+const ntsOverlay = require("./src/schemas/v2/overlays/nts.json");
+const con29ROverlay = require("./src/schemas/v2/overlays/con29R.json");
+const con29DWOverlay = require("./src/schemas/v2/overlays/con29DW.json");
+const rdsOverlay = require("./src/schemas/v2/overlays/rds.json");
+const oc1Overlay = require("./src/schemas/v2/overlays/oc1.json");
+
+const overlays = { baspiV4: baspiOverlay, null: {} };
 
 const transactionSchemas = {
   "https://trust.propdata.org.uk/schemas/v1/pdtf-transaction.json":
     transactionSchema,
-  "https://trust.propdata.org.uk/schemas/v2/pdtf-transaction.json": coreSchema,
+  "https://trust.propdata.org.uk/schemas/v2/pdtf-transaction.json":
+    v2CoreSchema,
 };
 
 const combineMerge = (target, source, options) => {
@@ -139,8 +142,8 @@ const isPathValid = (path, schemaId, overlay) => {
 
 const getSubschemaValidator = (path, schemaId, overlay) => {
   const subSchema = getSubschema(path, schemaId, overlay);
-  // see if we can retrieve the schema by path
-  const cacheKey = `${path}-${schemaId}`;
+  // see if we can retrieve the schema by path, schemaId and overlay
+  const cacheKey = `${path}-${schemaId}-${overlay}`;
   let validator = ajv.getSchema(cacheKey);
   // retrieve whole schema by $id if available
   if (!validator && subSchema.$id) validator = ajv.getSchema(cacheKey);
@@ -195,7 +198,7 @@ const getTitleAtPath = (schema, path, rootPath = path) => {
   }
 };
 
-const validateVerifiedClaims = (verifiedClaims) => {
+const validateVerifiedClaims = (verifiedClaims, schemaId, overlay) => {
   const validatorVClaims = ajv.compile(verifiedClaimsSchema);
 
   const validationErrorsArr = [];
@@ -213,11 +216,10 @@ const validateVerifiedClaims = (verifiedClaims) => {
 
   verifiedClaimsArray.forEach((claim) => {
     const paths = Object.keys(claim.claims);
-
     for (const path of paths) {
-      const validPath = isPathValid(path);
+      const validPath = isPathValid(path, schemaId, overlay);
       if (validPath) {
-        const subValidator = getSubschemaValidator(path);
+        const subValidator = getSubschemaValidator(path, schemaId, overlay);
         const isValid = subValidator(claim.claims[path]);
         if (!isValid) {
           validationErrorsArr.push(...subValidator.errors);
@@ -245,4 +247,16 @@ module.exports = {
   getTitleAtPath,
   verifiedClaimsSchema,
   validateVerifiedClaims,
+  baspiOverlay,
+  ta6Overlay,
+  ta7Overlay,
+  ta10Overlay,
+  lpe1Overlay,
+  fme1Overlay,
+  llc1Overlay,
+  ntsOverlay,
+  con29ROverlay,
+  con29DWOverlay,
+  rdsOverlay,
+  oc1Overlay,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pdtf/schemas",
-  "version": "2.0.0-2",
+  "version": "2.0.0-21",
   "description": "Property Data Trust Framework Schemas and Utilities",
   "main": "index.js",
   "directories": {

package/src/examples/v2/exampleTransaction.json

@@ -21,8 +21,8 @@
       "address": {
         "line1": "47 Park Road",
         "line2": "",
+        "line3": "",
         "town": "HARPENDEN",
-        "county": "Herts",
         "postcode": "AL3 5AF"
       },
       "delayFactors": {
@@ -34,23 +34,37 @@
             "titleNumber": "HD221222",
             "ownershipType": "Leasehold",
             "leaseholdInformation": {
+              "typeOfLeasehold": {
+                "leaseholdType": "Shared ownership",
+                "sharedOwnershipPercentage": 50,
+                "sharedOwnershipRent": 200,
+                "sharedOwnershipRentFrequency": "Monthly"
+              },
+              "leaseTerm": {
+                "startYearOfLease": 1900,
+                "lengthOfLeaseInYears": 999
+              },
               "contactDetails": {
                 "contacts": {
                   "landlord": {
-                    "nameOrOrganisation": "Fleesum Properties",
-                    "address": {
-                      "line1": "47 Park Road",
-                      "postcode": "AL3 5AF"
-                    },
-                    "emailAddress": "james@fleesum.com"
+                    "contact": {
+                      "nameOrOrganisation": "Fleesum Properties",
+                      "address": {
+                        "line1": "47 Park Road",
+                        "postcode": "AL3 5AF"
+                      },
+                      "emailAddress": "james@fleesum.com"
+                    }
                   },
                   "managingAgent": {
-                    "nameOrOrganisation": "Pricee Living",
-                    "address": {
-                      "line1": "Pricee House",
-                      "postcode": "AL3 5KK"
-                    },
-                    "emailAddress": "marcel@pricee.co.uk"
+                    "contact": {
+                      "nameOrOrganisation": "Pricee Living",
+                      "address": {
+                        "line1": "Pricee House",
+                        "postcode": "AL3 5KK"
+                      },
+                      "emailAddress": "marcel@pricee.co.uk"
+                    }
                   }
                 }
               },
@@ -77,20 +91,6 @@
                   "details": "There is sinking fund."
                 }
               },
-              "general": {
-                "typeOfLeasehold": {
-                  "leaseholdType": "Shared ownership",
-                  "sharedOwnershipPercentage": 50,
-                  "sharedOwnershipRent": 200,
-                  "sharedOwnershipRentFrequency": "Monthly"
-                },
-                "leaseTerm": {
-                  "startYearOfLease": 1900,
-                  "lengthOfLeaseInYears": 999
-                }
-              },
-
-              "largeAdditionalExpense": { "yesNo": "No" },
               "additionalFeesOnSale": 0
             }
           }
@@ -128,6 +128,11 @@
         "certificate": {
           "certificateNumber": "12345",
           "currentEnergyRating": "A"
+        },
+        "greenDealLoan": {
+          "hasGreenDealLoan": {
+            "yesNo": "No"
+          }
         }
       },
       "councilTax": {
@@ -272,50 +277,51 @@
         }
       },
       "waterAndDrainage": {
-        "mainsWater": {
-          "maintenanceAgreements": {
-            "yesNo": "No"
-          },
-          "yesNo": "To be connected",
-          "dateToBeConnected": "2022-12-15",
-          "supplier": "Northumbria Water"
+        "water": {
+          "mainsWater": {
+            "yesNo": "To be connected",
+            "dateToBeConnected": "2022-12-15",
+            "supplier": "Northumbria Water"
+          }
         },
-        "mainsSurfaceWaterDrainage": {
-          "maintenanceAgreements": {
-            "yesNo": "No"
+        "drainage": {
+          "mainsSurfaceWaterDrainage": {
+            "yesNo": "Yes"
           },
-          "yesNo": "Yes"
-        },
-        "mainsFoulDrainage": {
-          "yesNo": "No",
-          "sustainableDrainageSystem": { "yesNo": "No" },
-          "septicTank": {
-            "yesNo": "Yes",
-            "details": "Last emptied on 1 Jan 2022",
-            "dateReplaced": "2022-01-01",
-            "dateLastEmptied": "2022-01-01"
-          },
-          "cesspit": { "yesNo": "No" },
-          "sewerageTreatmentPlant": { "yesNo": "No" },
-          "otherConnectedProperties": { "yesNo": "No" },
-          "yearSystemInstalled": 1980,
-          "plantOnOtherLand": { "yesNo": "No" },
-          "plantRegistered": { "yesNo": "No" },
-          "plantDrainsIntoWaterway": {
-            "yesNo": "Yes",
-            "dischargeCompliesWithGBR": "Yes"
+          "mainsFoulDrainage": {
+            "yesNo": "No",
+            "sustainableDrainageSystem": { "yesNo": "No" },
+            "septicTank": {
+              "yesNo": "Yes",
+              "details": "Last emptied on 1 Jan 2022",
+              "dateReplaced": "2022-01-01",
+              "dateLastEmptied": "2022-01-01"
+            },
+            "cesspit": { "yesNo": "No" },
+            "sewerageTreatmentPlant": { "yesNo": "No" },
+            "otherConnectedProperties": { "yesNo": "No" },
+            "yearSystemInstalled": 1980,
+            "plantOnOtherLand": { "yesNo": "No" },
+            "plantRegistered": { "yesNo": "No" },
+            "plantDrainsIntoWaterway": {
+              "yesNo": "Yes",
+              "dischargeCompliesWithGBR": "Yes"
+            }
           }
+        },
+        "maintenanceAgreements": {
+          "yesNo": "No"
         }
       },
-      "utilities": {
-        "electricity": {
+      "connectedUtilities": {
+        "mainsElectricity": {
           "maintenanceAgreements": {
             "yesNo": "No"
           },
           "yesNo": "Yes",
           "supplier": "Octopus Energy"
         },
-        "gas": {
+        "mainsGas": {
           "maintenanceAgreements": {
             "yesNo": "No"
           },
@@ -356,11 +362,6 @@
           "yesNo": "No"
         }
       },
-      "greenDealLoan": {
-        "hasGreenDealLoan": {
-          "yesNo": "No"
-        }
-      },
       "centralHeating": {
         "hasCentralHeating": "Yes",
         "centralHeatingDetails": {
@@ -374,7 +375,8 @@
           },
           "centralHeatingFuel": { "centralHeatingFuelType": "Gas" },
           "centralHeatingInstalled": "2016-04-20",
-          "heatingLastServiced": "2021-03-26"
+          "heatingLastServicedDate": "2021-03-26",
+          "heatingLastServicedReport": "To follow"
         }
       },
       "insurance": {
@@ -437,21 +439,11 @@
           "hasBeenFlooded": "Yes",
           "details": "Minor basement flood",
           "typeOfFlooding": {
-            "groundWater": {
-              "yesNo": "No"
-            },
-            "sewer": {
-              "yesNo": "Yes"
-            },
-            "surfaceWater": {
-              "yesNo": "No"
-            },
-            "coastal": {
-              "yesNo": "No"
-            },
-            "river": {
-              "yesNo": "No"
-            },
+            "groundWater": "No",
+            "sewer": "Yes",
+            "surfaceWater": "No",
+            "coastal": "No",
+            "river": "No",
             "other": {
               "yesNo": "No"
             }
@@ -528,10 +520,15 @@
       "energyAndMeters": {
         "testedByQualifiedElectrician": {
           "yesNo": "Yes",
-          "details": "2015",
+          "yearTested": 2015,
+          "attachments": "To follow"
+        },
+        "electricalWorkSince2005": {
+          "yesNo": "Yes",
+          "yearWorkCarriedOut": 2016,
+          "details": "New fuse box",
           "attachments": "To follow"
         },
-        "electricalWorkSince2005": { "yesNo": "No" },
         "solarPanels": { "hasSolarPanels": "No" }
       },
       "smartHomeSystems": { "hasSmartHomeSystems": "No" },
@@ -555,16 +552,18 @@
         "willRemoveAllRubbish": true,
         "otherPropertyInChain": { "yesNo": "No" },
         "moveRestrictionDates": { "yesNo": "No" },
-        "digitalPropertyLogbook": { "yesNo": "No" }
+        "digitalPropertyLogbook": {
+          "yesNo": "Yes",
+          "logbookProvider": "someone",
+          "willHandoverLogbook": true
+        },
+        "sufficientToRepayAllMortgages": { "yesNo": "Yes" }
       },
       "confirmationOfAccuracyByOwners": {
         "confirmWillProvideAdditionalDocumentation": true,
         "confirmInformationIsAccurate": true
       }
     },
-    "energyPerformanceCertificate": {
-      "certificate": { "currentEnergyRating": "B" }
-    },
     "titlesToBeSold": [
       {
         "titleNumber": "HD221222",