@pdtf/schemas 0.7.0 → 0.7.3

package/src/schemas/pdtf-verified-claims.json

@@ -345,6 +345,9 @@
         "expires_in": {
           "type": "integer",
           "minimum": 1
+        },
+        "pdtfSchemaPath": {
+          "type": "string"
         }
       },
       "required": ["digest", "url"]
@@ -401,17 +404,10 @@
   "required": ["verified_claims"],
   "properties": {
     "verified_claims": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/verified_claims_def"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/verified_claims_def"
-          }
-        }
-      ]
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/verified_claims_def"
+      }
     }
   },
   "additionalProperties": false

package/src/tests/pdtfVerifiedClaims.test.js

@@ -15,38 +15,38 @@ addFormats(ajv);
 const validator = ajv.compile(verifiedClaimsSchema);
 
 test("valid vouch sample is valid", () => {
-  const isValid = validator({ verified_claims: exampleVouch });
+  const isValid = validator({ verified_claims: [exampleVouch] });
   expect(isValid).toBe(true);
 });
 
 test("valid electronic record sample is valid", () => {
-  const isValid = validator({ verified_claims: exampleElectronicRecord });
+  const isValid = validator({ verified_claims: [exampleElectronicRecord] });
   expect(isValid).toBe(true);
 });
 
 test("valid documented vouch sample is valid", () => {
-  const isValid = validator({ verified_claims: exampleDocumentedVouch });
+  const isValid = validator({ verified_claims: [exampleDocumentedVouch] });
   expect(isValid).toBe(true);
 });
 
 test("sample with primitive claims value is valid", () => {
   const clonedVouch = JSON.parse(JSON.stringify(exampleVouch));
   clonedVouch.claims = { "/propertyPack/uprn": 123456 };
-  const isValid = validator({ verified_claims: clonedVouch });
+  const isValid = validator({ verified_claims: [clonedVouch] });
   expect(isValid).toBe(true);
 });
 
 test("sample with undefined claims value is also valid, but this would fail when the payload is validated", () => {
   const clonedVouch = JSON.parse(JSON.stringify(exampleVouch));
   clonedVouch.claims = { "/propertyPack/uprn": undefined };
-  const isValid = validator({ verified_claims: clonedVouch });
+  const isValid = validator({ verified_claims: [clonedVouch] });
   expect(isValid).toBe(true);
 });
 
 test("claim with missing claims is invalid", () => {
   const clonedVouch = JSON.parse(JSON.stringify(exampleVouch));
   delete clonedVouch.claims;
-  const isValid = validator({ verified_claims: clonedVouch });
+  const isValid = validator({ verified_claims: [clonedVouch] });
   expect(isValid).toBe(false);
 });
 
@@ -55,20 +55,20 @@ test("claim with invalid claims path is invalid", () => {
   const originalPath = Object.keys(clonedVouch.claims)[0];
   const data = clonedVouch.claims[originalPath];
   clonedVouch.claims = { "invalidPath//of?someKind": data };
-  const isValid = validator({ verified_claims: clonedVouch });
+  const isValid = validator({ verified_claims: [clonedVouch] });
   expect(isValid).toBe(false);
 });
 
 test("verification with invalid evidence type is invalid", () => {
   const clonedVouch = JSON.parse(JSON.stringify(exampleVouch));
   clonedVouch.verification.evidence[0].type = "something invalid";
-  const isValid = validator({ verified_claims: clonedVouch });
+  const isValid = validator({ verified_claims: [clonedVouch] });
   expect(isValid).toBe(false);
 });
 
 test("verification with no framework type is invalid", () => {
   const clonedVouch = JSON.parse(JSON.stringify(exampleVouch));
   delete clonedVouch.verification.trust_framework;
-  const isValid = validator({ verified_claims: clonedVouch });
+  const isValid = validator({ verified_claims: [clonedVouch] });
   expect(isValid).toBe(false);
 });

package/src/tests/transactionSchema.test.js

@@ -90,14 +90,14 @@ test("correctly gets a subschema through a dependency", () => {
 
 test("correctly gets another subschema through a dependency", () => {
   const subschema = getSubschema(
-    "/propertyPack/materialFacts/ownership/leaseholdDetails/lengthOfLeaseInYears"
+    "/propertyPack/materialFacts/ownership/lengthOfLeaseInYears"
   );
   expect(subschema.title).toBe("Length of lease (years)");
 });
 
 test("correctly gets yet another subschema through a dependency", () => {
   const subschema = getSubschema(
-    "/propertyPack/materialFacts/ownership/leaseholdDetails/rentIncrease/details"
+    "/propertyPack/materialFacts/ownership/rentIncrease/details"
   );
   expect(subschema.title).toBe("Details");
 });
@@ -143,13 +143,13 @@ test("correctly gets titles across schemas, arrays and non-existient title prope
   expect(
     getTitleAtPath(
       transactionSchema,
-      "/propertyPack/materialFacts/ownership/leaseholdDetails/lengthOfLeaseInYears"
+      "/propertyPack/materialFacts/ownership/lengthOfLeaseInYears"
     )
   ).toBe("Length of lease (years)");
   expect(
     getTitleAtPath(
       transactionSchema,
-      "/propertyPack/materialFacts/ownership/managedFreeholdOrCommonhold/annualServiceCharge"
+      "/propertyPack/materialFacts/ownership/annualServiceCharge"
     )
   ).toBe(
     "Amount of current annual service charge/estate rentcharge/maintenance contribution (£)"

package/src/tests/verifiedClaimsValidator.test.js

@@ -4,7 +4,7 @@ const exampleVouch = require("../examples/exampleVouch.json");
 const exampleDocumentedVouch = require("../examples/exampleDocumentedVouch.json");
 
 test("returns an empty array for a valid claim", () => {
-  expect(validateVerifiedClaims(exampleVouch)).toEqual([]);
+  expect(validateVerifiedClaims([exampleVouch])).toEqual([]);
 });
 
 test("returns an empty array for a valid array of claims", () => {
@@ -19,7 +19,7 @@ test("returns an array with an error stating if path is incorrect", () => {
   clonedVouch.claims = {
     "/propertyPack/INVALID/materialFacts/councilTax": data,
   };
-  expect(validateVerifiedClaims(clonedVouch)).toEqual([
+  expect(validateVerifiedClaims([clonedVouch])).toEqual([
     "Path /propertyPack/INVALID/materialFacts/councilTax is not a valid PDTF schema path",
   ]);
 });
@@ -36,7 +36,7 @@ test("returns an array of errors if data in the path is in invalid format", () =
       },
     },
   };
-  expect(validateVerifiedClaims(clonedVouch)).toEqual([
+  expect(validateVerifiedClaims([clonedVouch])).toEqual([
     {
       instancePath: "",
       schemaPath: "#/required",
@@ -67,7 +67,7 @@ test("returns an array of errors for verified claim with multiple paths", () =>
       },
     },
   };
-  expect(validateVerifiedClaims(clonedVouch)).toEqual([
+  expect(validateVerifiedClaims([clonedVouch])).toEqual([
     "Path /propertyPack/materialFacts/cousncilTaxBad is not a valid PDTF schema path",
     "Path /propertyPack/materialFacts/councilTaxBadTwo is not a valid PDTF schema path",
   ]);
@@ -92,5 +92,5 @@ test("returns an empty array of errors for verified claim with multiple valid pa
       postcode: "property.postcode",
     },
   };
-  expect(validateVerifiedClaims(clonedVouch)).toEqual([]);
+  expect(validateVerifiedClaims([clonedVouch])).toEqual([]);
 });