@pdtf/schemas 3.6.0-32 → 3.6.0-33

package/src/schemas/v3/skeleton.json

@@ -166,13 +166,7 @@
       },
       "yearOfBuild": "integer",
       "isNewBuild": {
-        "yesNo": "variant",
-        "newBuildDetails": {
-          "snaggingCompletion": "string",
-          "adoptionStatus": "string",
-          "conversionConsent": "boolean",
-          "conversionQuality": "string"
-        }
+        "yesNo": "string"
       },
       "isHMO": "string",
       "isStudentAccommodation": "string",

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

@@ -494,7 +494,7 @@ describe("Extension Overlays", () => {
       const noBranch = mainsWater.oneOf[0];
       const cost = noBranch?.properties?.associatedCost;
       expect(cost).toBeDefined();
-      expect(cost.sef25Ref).toBe("U1.1");
+      expect(cost.ntsRef).toBe("U1.1");
       expect(cost.required).toEqual(["hasCost"]);
       expect(cost.properties.hasCost.type).toBe("string");
       expect(cost.oneOf).toHaveLength(2);
@@ -517,7 +517,7 @@ describe("Extension Overlays", () => {
       const noBranch = mainsFoul.oneOf[2];
       const cost = noBranch?.properties?.associatedCost;
       expect(cost).toBeDefined();
-      expect(cost.sef25Ref).toBe("U1.2");
+      expect(cost.ntsRef).toBe("U1.2");
       expect(cost.required).toEqual(["hasCost"]);
     });
 
@@ -533,12 +533,12 @@ describe("Extension Overlays", () => {
       const yesBranch = controlled.oneOf[1];
       const cost = yesBranch?.properties?.costOfPermit;
       expect(cost).toBeDefined();
-      expect(cost.sef25Ref).toBe("P1.1");
+      expect(cost.ntsRef).toBe("P1.1");
       expect(cost.type).toBe("number");
 
       const freq = yesBranch?.properties?.costOfPermitFrequency;
       expect(freq).toBeDefined();
-      expect(freq.sef25Ref).toBe("P1.2");
+      expect(freq.ntsRef).toBe("P1.2");
       expect(freq.type).toBe("string");
     });
 
@@ -557,7 +557,7 @@ describe("Extension Overlays", () => {
 
       expectedFields.forEach(({ key, ref }) => {
         expect(si[key]).toBeDefined();
-        expect(si[key].sef25Ref).toBe(ref);
+        expect(si[key].ntsRef).toBe(ref);
         expect(si[key].required).toContain("yesNo");
         expect(si[key].discriminator?.propertyName).toBe("yesNo");
         expect(si[key].oneOf).toHaveLength(2);
@@ -988,8 +988,8 @@ describe("Extension Overlays", () => {
         expect(si?.required).toContain("ongoingHealthOrSafetyIssue");
 
         // SEF25 hazards also present
-        expect(si?.properties?.wellsDitchesShaft?.sef25Ref).toBe("H1.1");
-        expect(si?.properties?.knownAreasInPoorCondition?.sef25Ref).toBe(
+        expect(si?.properties?.wellsDitchesShaft?.ntsRef).toBe("H1.1");
+        expect(si?.properties?.knownAreasInPoorCondition?.ntsRef).toBe(
           "H1.4"
         );
       });
@@ -1187,8 +1187,8 @@ describe("Extension Overlays", () => {
         { path: "otherGuarantees", ref: "W1.7" },
       ];
 
-      test("should have sef25Ref on all warranty categories in base schema", () => {
-        const schema = getTransactionSchema(schemaId, ["baspiV5"]);
+      test("should have ntsRef on all warranty categories when wg overlay loaded", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5", "wg"]);
         const warranties =
           schema.properties?.propertyPack?.properties?.guaranteesWarrantiesAndIndemnityInsurances;
 
@@ -1196,7 +1196,7 @@ describe("Extension Overlays", () => {
         const yesBranch = warranties.oneOf[1];
 
         warrantyCategoryPaths.forEach(({ path, ref }) => {
-          expect(yesBranch.properties[path]?.sef25Ref).toBe(ref);
+          expect(yesBranch.properties[path]?.ntsRef).toBe(ref);
         });
       });
 
@@ -1252,11 +1252,11 @@ describe("Extension Overlays", () => {
     });
 
     describe("Neighbour development (nd)", () => {
-      test("should add sef25Ref to neighbourDevelopment", () => {
+      test("should add ntsRef to neighbourDevelopment", () => {
         const schema = getTransactionSchema(schemaId, ["nd"]);
         const nd = schema.properties?.propertyPack?.properties?.notices
           ?.properties?.neighbourDevelopment;
-        expect(nd?.sef25Ref).toBe("N1.1");
+        expect(nd?.ntsRef).toBe("N1.1");
       });
 
       test("should add ntsRef via nd overlay", () => {
@@ -1326,7 +1326,7 @@ describe("Extension Overlays", () => {
         expect(freeholdBranch?.required || []).not.toContain("titleRestrictions");
       });
 
-      test("should have correct sef25Ref", () => {
+      test("should have correct ntsRef", () => {
         const schema = getTransactionSchema(schemaId, ["tr"]);
         const items = schema.properties?.propertyPack?.properties?.ownership
           ?.properties?.ownershipsToBeTransferred?.items;
@@ -1349,7 +1349,7 @@ describe("Extension Overlays", () => {
 
         // NTS2 fields still work
         const si = schema.properties?.propertyPack?.properties?.specialistIssues;
-        expect(si?.properties?.wellsDitchesShaft?.sef25Ref).toBe("H1.1");
+        expect(si?.properties?.wellsDitchesShaft?.ntsRef).toBe("H1.1");
 
         // New SEF25 fields present
         const parking = schema.properties?.propertyPack?.properties?.parking?.properties;

package/src/utils/extractOverlay.js

@@ -42,6 +42,7 @@ const extractFields = [
   "rds",
   "oc1",
   "sr24",
+  "sef25",
 ];
 
 const flattenSkeleton = (schema) => {