@pdtf/schemas 2.0.0-0 → 2.0.0-2

package/index.js

@@ -105,7 +105,8 @@ const getValidator = (schemaId, overlay = "baspiV4") => {
 };
 
 // common functions for v1 and v2
-const getSubschema = (path, sourceSchema = transactionSchema) => {
+const getSubschema = (path, schemaId, overlay) => {
+  const sourceSchema = getTransactionSchema(schemaId, overlay);
   const pathArray = path.split("/").slice(1);
   if (pathArray.length < 1) return sourceSchema;
   return pathArray.reduce((schema, pathElement) => {
@@ -127,23 +128,25 @@ const getSubschema = (path, sourceSchema = transactionSchema) => {
   }, sourceSchema);
 };
 
-const isPathValid = (path, schema = transactionSchema) => {
+const isPathValid = (path, schemaId, overlay) => {
+  const schema = getTransactionSchema(schemaId, overlay);
   try {
-    return getSubschema(path, schema) !== undefined;
+    return getSubschema(path, schemaId, overlay) !== undefined;
   } catch (err) {
     return false;
   }
 };
 
-const getSubschemaValidator = (path, schema = transactionSchema) => {
-  const subSchema = getSubschema(path, schema);
+const getSubschemaValidator = (path, schemaId, overlay) => {
+  const subSchema = getSubschema(path, schemaId, overlay);
   // see if we can retrieve the schema by path
-  let validator = ajv.getSchema(path);
+  const cacheKey = `${path}-${schemaId}`;
+  let validator = ajv.getSchema(cacheKey);
   // retrieve whole schema by $id if available
-  if (!validator && subSchema.$id) validator = ajv.getSchema(subSchema.$id);
+  if (!validator && subSchema.$id) validator = ajv.getSchema(cacheKey);
   if (!validator) {
-    ajv.addSchema(subSchema, path);
-    validator = ajv.getSchema(path);
+    ajv.addSchema(subSchema, cacheKey);
+    validator = ajv.getSchema(cacheKey);
   }
   return validator;
 };

package/package.json

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

package/src/examples/v2/exampleTransaction.json

@@ -25,7 +25,6 @@
         "county": "Herts",
         "postcode": "AL3 5AF"
       },
-
       "delayFactors": {
         "hasDelayFactors": { "yesNo": "No" }
       },
@@ -34,21 +33,66 @@
           {
             "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" }
+            "leaseholdInformation": {
+              "contactDetails": {
+                "contacts": {
+                  "landlord": {
+                    "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"
+                  }
+                }
+              },
+              "groundRent": {
+                "isGroundRentPayable": "Yes",
+                "annualGroundRent": 1750,
+                "rentSubjectToIncrease": {
+                  "yesNo": "Yes",
+                  "rentReviewFrequency": "Annually",
+                  "rentIncreaseCalculated": "RPI"
+                }
+              },
+              "transferAndRegistration": {
+                "requirementsToBeMemberOfManagementCompany": {
+                  "yesNoNotApplicable": "No"
+                }
+              },
+              "serviceCharge": {
+                "sellerContributesToServiceCharge": "Yes",
+                "annualServiceCharge": 250.23,
+                "largeAdditionalExpense": { "yesNo": "No" },
+                "reserveFund": {
+                  "yesNo": "Yes",
+                  "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
+            }
           }
         ]
       },
@@ -75,12 +119,15 @@
         "isStandardForm": {
           "yesNo": "Yes"
         },
-        "hasFlammableExternalWallSystem": { "yesNo": "No" }
+        "buildingSafetyRemediation": { "yesNo": "No" },
+        "sprayFoamInsulation": {
+          "hasSprayFoamInstalled": "No"
+        }
       },
       "energyEfficiency": {
-        "energyEfficiencyRating": "A",
-        "hasSprayFoamInstalled": {
-          "yesNo": "No"
+        "certificate": {
+          "certificateNumber": "12345",
+          "currentEnergyRating": "A"
         }
       },
       "councilTax": {
@@ -384,7 +431,7 @@
           }
         }
       },
-      "otherIssues": {
+      "environmentalIssues": {
         "flooding": {
           "floodRiskReport": { "yesNo": "No" },
           "hasBeenFlooded": "Yes",
@@ -416,7 +463,9 @@
         },
         "otherEnvironmental": {
           "yesNo": "No"
-        },
+        }
+      },
+      "otherIssues": {
         "excessiveNoise": {
           "yesNo": "No"
         },
@@ -449,6 +498,12 @@
             "ownerType": "Private individual",
             "firstName": "Peter",
             "lastName": "Hetherington-Smythe"
+          },
+          {
+            "ownerType": "Private individual",
+            "firstName": "Clarissa",
+            "middleNames": "Jane",
+            "lastName": "Hetherington-Smythe"
           }
         ]
       },