@pdtf/schemas 2.0.0-22 → 2.0.0-24

package/src/schemas/v2/skeleton.json

@@ -1962,9 +1962,24 @@
       "insurance": {
         "isInsured": {},
         "details": {},
+        "landlordInsuresIfFlat": {},
         "difficultiesObtainingInsurance": {
-          "yesNo": {},
-          "details": {}
+          "abnormalRiseInPremiums": {
+            "yesNo": {},
+            "details": {}
+          },
+          "subjectToHighExcesses": {
+            "yesNo": {},
+            "details": {}
+          },
+          "subjectToUnusualConditions": {
+            "yesNo": {},
+            "details": {}
+          },
+          "refused": {
+            "yesNo": {},
+            "details": {}
+          }
         },
         "insuranceClaims": {
           "yesNo": {},
@@ -2099,6 +2114,10 @@
           "yesNo": {},
           "details": {},
           "attachments": {}
+        },
+        "otherCharges": {
+          "yesNo": {},
+          "details": {}
         }
       },
       "consumerProtectionRegulationsDeclaration": {
@@ -2237,34 +2256,42 @@
           "attachments": {}
         },
         "roofingWork": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "dampProofingTreatment": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "timberRotOrInfestationTreatment": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "centralHeatingAndorPlumbing": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "doubleGlazing": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "electricalRepairOrInstallation": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "subsidenceWork": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "solarPanels": {
-          "yesNo": {}
+          "yesNo": {},
+          "attachments": {}
         },
         "otherGuarantees": {
           "yesNo": {},
-          "details": {}
+          "details": {},
+          "attachments": {}
         },
-        "willLeaveGuaranteePaperwork": {},
         "outstandingClaimsOrApplications": {
           "yesNo": {},
           "details": {},
@@ -2316,7 +2343,7 @@
         },
         "moveRestrictionDates": {
           "yesNo": {},
-          "restrictedDates": {}
+          "details": {}
         },
         "digitalPropertyLogbook": {
           "yesNo": {},

package/src/tests/v2/transactionSchema.test.js

@@ -111,7 +111,7 @@ test("correctly gets a subschema through a dependency", () => {
     schemaId
   );
   expect(subschema.title).toBe(
-    "Provide details and likely timescale for delay (if known)"
+    "Provide details and likely timescale for delay"
   );
 });
 
@@ -167,6 +167,16 @@ test("correctly gets yes another subschema but through a non-baspi oneOf structu
   expect(subschema).toEqual({ type: "string" });
 });
 
+test("correctly gets a subschema with multiple overlays", () => {
+  const subschema = getSubschema(
+    "/propertyPack/materialFacts/parking/parkingArrangements",
+    schemaId,
+    ["baspiV4", "ta6ed4"]
+  );
+  expect(subschema.baspiRef).toBe("A1.6.0");
+  expect(subschema.ta6Ref).toBe("9.1");
+});
+
 test("correctly gets a subschema validator which is already cached", () => {
   const validator = getSubschemaValidator(
     "/propertyPack/materialFacts/energyEfficiency/certificate"
@@ -178,6 +188,32 @@ test("correctly gets a subschema validator which is already cached", () => {
   expect(anotherValidator).not.toBeNull();
 });
 
+test("correctly gets a subschema validator for a TA6 overlay", () => {
+  const path = "/propertyPack";
+  const data = jp.get(exampleTransaction, path);
+  const validator = getSubschemaValidator(path, exampleTransaction.$schema, [
+    "ta6ed4",
+  ]);
+  let isValid = validator(data);
+  // console.log(validator.errors);
+  expect(isValid).toBe(true);
+});
+
+test("correctly gets a subschema validator for a TA6 overlay which validates", () => {
+  const path =
+    "/propertyPack/additionalLegalInfo/guaranteesWarrantiesAndIndemnityInsurances/subsidenceWork";
+  const subSchema = getSubschema(path, exampleTransaction.$schema, ["ta6ed4"]);
+  const data = { yesNo: "Yes" };
+  const validator = getSubschemaValidator(path, exampleTransaction.$schema, [
+    "ta6ed4",
+  ]);
+  let isValid = validator(data);
+  expect(isValid).toBe(false);
+  expect(validator.errors[0].message).toBe(
+    "must have required property 'attachments'"
+  );
+});
+
 test("correctly gets a subschema validator which validates", () => {
   const path = "/propertyPack/materialFacts/notices";
   const validator = getSubschemaValidator(path);

package/src/utils/extractOverlay.js

@@ -71,7 +71,6 @@ const flattenSkeleton = (schema) => {
 
 const extractOverlay = (sourceSchema, ref) => {
   const refName = `${ref}Ref`;
-  const refRequired = `${ref}Required`;
   const returnSchema = {
     $schema: "http://json-schema.org/draft-07/schema#",
     $id: `https://trust.propdata.org.uk/schemas/v2/overlays/${ref}.json`,
@@ -100,6 +99,7 @@ const extractOverlay = (sourceSchema, ref) => {
         });
       }
     }
+    const refRequired = `${ref}Required`;
     if (element[refRequired]) {
       jp.set(returnSchema, `${path}/required`, element[refRequired]);
     }