@pdtf/schemas 3.0.0-24 → 3.0.0-26

package/src/schemas/v3/skeleton.json

@@ -646,18 +646,20 @@
               "collectsbuildingInsurancePremiums": {},
               "dealsWithDayToDayMaintenanceOfManagedArea": {},
               "organisesBuildingInsurance": {},
-              "dealsWithDayToDayMaintenanceOfBuilding": {},
-              "lesseeInCharge": {
-                "nameOrOrganisation": {},
-                "address": {
-                  "line1": {},
-                  "line2": {},
-                  "line3": {},
-                  "town": {},
-                  "postcode": {}
-                },
-                "telephone": {},
-                "emailAddress": {}
+              "dealsWithDayToDayMaintenanceOfBuilding": {
+                "assignedContact": {},
+                "lesseeInCharge": {
+                  "nameOrOrganisation": {},
+                  "address": {
+                    "line1": {},
+                    "line2": {},
+                    "line3": {},
+                    "town": {},
+                    "postcode": {}
+                  },
+                  "telephone": {},
+                  "emailAddress": {}
+                }
               }
             }
           },
@@ -799,13 +801,6 @@
             "allPropertiesContribute": {
               "yesNo": {},
               "details": {}
-            },
-            "deedOfCertificateServed": {
-              "yesNoNotApplicable": {},
-              "sellerCompletedDeedOfCertificate": {}
-            },
-            "landlordsCertificateServed": {
-              "yesNoNotApplicable": {}
             }
           },
           "buildingsInsurance": {
@@ -875,6 +870,19 @@
               "details": {}
             }
           },
+          "buildingSafety": {
+            "isLeaseQualifying": {},
+            "deedOfCertificateServed": {
+              "yesNoNotApplicable": {},
+              "sellerCompletedDeedOfCertificate": {},
+              "attachments": {}
+            },
+            "landlordNotifiedOfSale": {},
+            "landlordsCertificateServed": {
+              "yesNoNotApplicable": {},
+              "attachments": {}
+            }
+          },
           "general": {
             "sellerAwareOfAlterations": {
               "yesNo": {},
@@ -885,7 +893,6 @@
             "sellerServedNoticeOnLandlord": {},
             "sellerAwareOfNoticeOfCollectivePurchase": {},
             "sellerAwareOfResponse": {},
-            "isLeaseQualifying": {},
             "otherPropertiesInManagedArea": {},
             "leasedOnSimilarTerms": {
               "yesNo": {},
@@ -905,9 +912,8 @@
             }
           },
           "requiredDocuments": {
-            "noticeOfSale": {},
-            "noticeOfBuildingCondition": {},
-            "landlordNotifiedOfSale": {},
+            "lease": {},
+            "deedsOfVariation": {},
             "copyOfcorrespondence": {},
             "serviceChargeAccounts": {},
             "groundRent": {},
@@ -915,13 +921,14 @@
               "arrangedBySeller": {},
               "arrangedByLandlord": {}
             },
+            "noticeOfSale": {},
+            "noticeOfBuildingCondition": {},
             "managedAreasBuildingsInsurancePolicy": {},
             "serviceChargeEstimatesCurrent": {},
             "serviceChargeEstimatesPrevious": {},
             "proposedWorksNotices": {},
             "forfeitureDocumentation": {},
             "additionalRegulationsNotInLease": {},
-            "deedsOfVariation": {},
             "deedOfCovenant": {},
             "certificateOfCompliance": {},
             "certificateOfComplianceFee": {},
@@ -930,12 +937,12 @@
             "noticesServedOnLessee": {},
             "asbestosSurvey": {},
             "managedAreaFireRiskAssessment": {},
-            "memorandumAndArticles": {},
-            "shareOrMembershipCertificate": {},
-            "companyAccounts": {},
+            "managementCompanyDocuments": {
+              "memorandumAndArticles": {},
+              "shareOrMembershipCertificate": {},
+              "companyAccounts": {}
+            },
             "managementCompanyAGMMinutes": {},
-            "deedOfCertificate": {},
-            "landlordsCertificate": {},
             "enforcementNotices": {}
           },
           "confirmation": {
@@ -1983,8 +1990,8 @@
         "mainsFoulDrainage": {
           "yesNo": {},
           "details": {},
-          "dateToBeConnected": {},
           "supplier": {},
+          "dateToBeConnected": {},
           "offMainsDrainageSystem": {
             "offMainsDrainageSystemType": {},
             "otherConnectedProperties": {
@@ -2104,14 +2111,14 @@
       "broadband": {
         "typeOfConnection": {},
         "predictedSpeed": {
-          "MaxBbPredictedDown": {},
-          "MaxBbPredictedUp": {},
-          "MaxSfbbPredictedDown": {},
-          "MaxSfbbPredictedUp": {},
-          "MaxUfbbPredictedDown": {},
-          "MaxUfbbPredictedUp": {},
-          "MaxPredictedDown": {},
-          "MaxPredictedUp": {}
+          "maxBbPredictedDown": {},
+          "maxBbPredictedUp": {},
+          "maxSfbbPredictedDown": {},
+          "maxSfbbPredictedUp": {},
+          "maxUfbbPredictedDown": {},
+          "maxUfbbPredictedUp": {},
+          "maxPredictedDown": {},
+          "maxPredictedUp": {}
         }
       },
       "mobilePhone": {
@@ -2182,25 +2189,6 @@
         "details": {}
       }
     },
-    "boundaries": {
-      "partOutsideLegalOwnership": {
-        "yesNo": {},
-        "details": {}
-      },
-      "partOnSeparateSiteOrDeed": {
-        "yesNo": {},
-        "details": {}
-      },
-      "boundariesDifferFromTitlePlan": {
-        "yesNo": {},
-        "details": {},
-        "attachments": {}
-      },
-      "boundaryAlterationProposal": {
-        "yesNo": {},
-        "details": {}
-      }
-    },
     "rightsAndInformalArrangements": {
       "sharedContributions": {
         "yesNo": {},
@@ -2548,6 +2536,23 @@
       "attachments": {}
     },
     "legalBoundaries": {
+      "partOutsideLegalOwnership": {
+        "yesNo": {},
+        "details": {}
+      },
+      "partOnSeparateSiteOrDeed": {
+        "yesNo": {},
+        "details": {}
+      },
+      "boundariesDifferFromTitlePlan": {
+        "yesNo": {},
+        "details": {},
+        "attachments": {}
+      },
+      "boundaryAlterationProposal": {
+        "yesNo": {},
+        "details": {}
+      },
       "ownership": {
         "areBoundariesUniform": {},
         "uniformBoundaries": {
@@ -2599,9 +2604,10 @@
         "yesNo": {},
         "yearWorkCarriedOut": {},
         "details": {},
-        "electricalSafetyCertificate": {},
-        "buildingRegulationsComplianceCertificate": {},
-        "buildingControlCompletionCertificate": {}
+        "suppliedCertificate": {
+          "certificateType": {},
+          "attachments": {}
+        }
       }
     },
     "smartHomeSystems": {

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

@@ -30,7 +30,7 @@ test("exports a property pack schema, v3 with no overlay by default", () => {
 test("sample is valid BASPI", () => {
   const testSchema = getTransactionSchema(schemaId, ["baspiV4"]);
   expect(testSchema.properties.propertyPack.baspiRef).toEqual("0");
-  const validator = getValidator(schemaId);
+  const validator = getValidator(schemaId, ["baspiV4"]);
   const isValid = validator(exampleTransaction);
   if (!isValid) console.log(validator.errors);
   expect(isValid).toBe(true);

package/src/utils/extractOverlay.js

@@ -116,6 +116,11 @@ const extractOverlay = (sourceSchema, ref) => {
       jp.set(returnSchema, `${path}/title`, element[refTitle]);
     }
 
+    const refDescription = `${ref}Description`;
+    if (element[refDescription]) {
+      jp.set(returnSchema, `${path}/description`, element[refDescription]);
+    }
+
     const refEnum = `${ref}Enum`;
     if (element[refEnum]) {
       jp.set(returnSchema, `${path}/enum`, element[refEnum]);