@pdtf/schemas 0.6.12 → 0.6.13

package/index.js

@@ -120,8 +120,7 @@ const getTitleAtPath = (schema, path, rootPath = path) => {
 };
 
 const validateVerifiedClaims = (verifiedClaimsArray) => {
-
-const validatorVClaims = ajv.compile(verifiedClaimsSchema);
+  const validatorVClaims = ajv.compile(verifiedClaimsSchema);
 
   const validationErrorsArr = [];
   const vClaimSchValidation = validatorVClaims({
@@ -133,17 +132,21 @@ const validatorVClaims = ajv.compile(verifiedClaimsSchema);
   }
 
   verifiedClaimsArray.forEach((claim) => {
-    const [path] = Object.keys(claim.claims);
-
-    const validPath = isPathValid(path);
-    if (validPath) {
-      const subValidator = getSubschemaValidator(path);
-      const isValid = subValidator(claim.claims[path]);
-      if (!isValid) {
-        validationErrorsArr.push(...subValidator.errors);
+    const paths = Object.keys(claim.claims);
+
+    for (const path of paths) {
+      const validPath = isPathValid(path);
+      if (validPath) {
+        const subValidator = getSubschemaValidator(path);
+        const isValid = subValidator(claim.claims[path]);
+        if (!isValid) {
+          validationErrorsArr.push(...subValidator.errors);
+        }
+      } else {
+        validationErrorsArr.push(
+          `Path ${path} is not a valid PDTF schema path`
+        );
       }
-    } else {
-      validationErrorsArr.push(`Path ${path} is not a valid PDTF schema path`);
     }
   });
 
@@ -151,6 +154,7 @@ const validatorVClaims = ajv.compile(verifiedClaimsSchema);
 };
 
 
+
 module.exports = {
   transactionSchema,
   validator,

package/package.json

@@ -1,36 +1,36 @@
 {
-  "name": "@pdtf/schemas",
-  "version": "0.6.12",
-  "description": "Property Data Trust Framework Schemas and Utilities",
-  "main": "index.js",
-  "directories": {
-    "doc": "docs"
-  },
-  "scripts": {
-    "test": "jest",
-    "test:watch": "jest --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Property-Data-Trust-Framework/schemas.git"
-  },
-  "keywords": [
-    "PDTF",
-    "Schemas"
-  ],
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Property-Data-Trust-Framework/schemas/issues"
-  },
-  "homepage": "https://github.com/Property-Data-Trust-Framework/schemas#readme",
-  "dependencies": {
-    "@jdw/jst": "^2.0.0-beta.15",
-    "ajv": "^8.10.0",
-    "ajv-formats": "^2.1.1",
-    "jsonpointer": "^5.0.0"
-  },
-  "devDependencies": {
-    "jest": "^27.5.1"
-  }
-}
+	"name": "@pdtf/schemas",
+	"version": "0.6.13",
+	"description": "Property Data Trust Framework Schemas and Utilities",
+	"main": "index.js",
+	"directories": {
+		"doc": "docs"
+	},
+	"scripts": {
+		"test": "jest",
+		"test:watch": "jest --watch"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Property-Data-Trust-Framework/schemas.git"
+	},
+	"keywords": [
+		"PDTF",
+		"Schemas"
+	],
+	"author": "",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/Property-Data-Trust-Framework/schemas/issues"
+	},
+	"homepage": "https://github.com/Property-Data-Trust-Framework/schemas#readme",
+	"dependencies": {
+		"@jdw/jst": "^2.0.0-beta.15",
+		"ajv": "^8.10.0",
+		"ajv-formats": "^2.1.1",
+		"jsonpointer": "^5.0.0"
+	},
+	"devDependencies": {
+		"jest": "^27.5.1"
+	}
+}

package/src/examples/exampleDocumentedVouch.json

@@ -4,19 +4,7 @@
     "time": "2022-01-25T13:16:44.527Z",
     "evidence": [
       {
-        "verification_method": {
-          "type": "auth"
-        },
         "type": "vouch",
-        "attestation": {
-          "voucher": {
-            "name": "Maria Harris"
-          },
-          "type": "digital_attestation"
-        }
-      },
-      {
-        "type": "document",
         "attachments": [
           {
             "digest": {
@@ -26,7 +14,16 @@
             "url": "https://fakeFileStore.com/some/kind/of/file",
             "desc": "proofOfAddress.pdf"
           }
-        ]
+        ],
+        "verification_method": {
+          "type": "auth"
+        },
+        "attestation": {
+          "voucher": {
+            "name": "Maria Harris"
+          },
+          "type": "digital_attestation"
+        }
       }
     ]
   },

package/src/tests/transactionSchema.test.js

@@ -341,7 +341,65 @@ test("returns an array of errors if data in the path is in invalid format", () =
   ]);
 });
 
-test("returns an empty array of errors if data in the path is in valid format", () => {
+test("returns an array of errors for verified claim with multiple paths", () => {
+  const vClaims = [
+    {
+      verification: {
+        trust_framework: "uk_pdtf",
+        time: "2022-01-25T13:16:44.527Z",
+        evidence: [
+          {
+            verification_method: {
+              type: "auth",
+            },
+            type: "vouch",
+            attestation: {
+              voucher: {
+                name: "Maria Harris",
+              },
+              type: "digital_attestation",
+            },
+          },
+          {
+            type: "document",
+            attachments: [
+              {
+                digest: {
+                  alg: "md5",
+                  value: "randomHashValue",
+                },
+                url: "https://fakeFileStore.com/some/kind/of/file",
+                desc: "proofOfAddress.pdf",
+              },
+            ],
+          },
+        ],
+      },
+      claims: {
+        "/propertyPack/materialFacts/cousncilTaxBad": {
+          councilTaxBand: "D",
+          councilTaxAffectingAlterations: {
+            yesNo: "Yes",
+            details:
+              "Extension added in 2005 to add bedroom with ensuite shower room. Certificate of Compliance issued 17th Feb 2006 and council tax updated",
+          },
+        },
+        "/propertyPack/materialFacts/councilTaxBadTwo": {
+          councilTaxBand: "D",
+          councilTaxAffectingAlterations: {
+            yesNo: "Yes",
+            details:
+              "Extension added in 2005 to add bedroom with ensuite shower room. Certificate of Compliance issued 17th Feb 2006 and council tax updated",
+          },
+        },
+      },
+    },
+  ];
+  expect(validateVerifiedClaims(vClaims)).toEqual(["Path /propertyPack/materialFacts/cousncilTaxBad is not a valid PDTF schema path",
+	"Path /propertyPack/materialFacts/councilTaxBadTwo is not a valid PDTF schema path"]);
+});
+
+test("returns an empty array of errors for verified claim with multiple paths", () => {
   const vClaims = [
     {
       verification: {
@@ -384,6 +442,13 @@ test("returns an empty array of errors if data in the path is in valid format",
               "Extension added in 2005 to add bedroom with ensuite shower room. Certificate of Compliance issued 17th Feb 2006 and council tax updated",
           },
         },
+	    "/propertyPack/materialFacts/address": {
+              line1: "property.line1",
+              line2: "property.line2",
+              town: "property.city",
+              county: "property.province",
+              postcode: "property.postcode",
+            },
       },
     },
   ];