@izara_project/izara-core-library-service-schemas 1.0.93 → 1.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.93",
+  "version": "1.0.94",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -25,9 +25,9 @@
     "@aws-sdk/client-lambda": "^3.862.0",
     "@aws-sdk/client-s3": "^3.862.0",
     "@aws-sdk/crc64-nvme-crt": "^3.862.0",
-    "@izara_project/izara-core-library-core": "^1.0.20",
-    "@izara_project/izara-core-library-external-request": "^1.0.20",
-    "@izara_project/izara-core-library-lambda": "^1.0.4",
+    "@izara_project/izara-core-library-core": "^1.0.24",
+    "@izara_project/izara-core-library-external-request": "^1.0.21",
+    "@izara_project/izara-core-library-lambda": "^1.0.5",
     "@izara_project/izara-core-library-logger": "^1.0.7",
     "@izara_project/izara-shared-core": "^1.0.2",
     "@izara_project/izara-shared-service-schemas": "^1.0.30",

package/src/ValidatorSchema.js

@@ -658,9 +658,17 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
     }
   }
 
-  console.debug("initialValidatorSchemaForUpdate:::::", initialValidatorSchemaForUpdate);
-
+  // console.debug("versionedDataReturnInFieldsObjInstanceFull::::", versionedDataReturnInFieldsObjInstanceFull);
+  // console.debug("initialValidatorSchemaForUpdate:::::", initialValidatorSchemaForUpdate);
+  Object.assign(
+    initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields.properties,
+    {
+      ...versionedDataReturnInFieldsObjInstanceFull,
+      ...canUpdateProperties
+    }
+  );
 
+  // _izContext.logger.debug("validatorSchema-update::", initialValidatorSchemaForUpdate);
   return initialValidatorSchemaForUpdate;
 }
 
@@ -975,6 +983,26 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
     console.log("schemasPath", schemasPath);
     console.log("serviceConfigPath", serviceConfigPath)
 
+    // helper function for getObjectSchema function in s3 or local
+    async function getLocalOrS3ObjectSchema(objType) {
+      let objSchema
+      let errorMessage
+      if (objType.serviceTag === iz_serviceTag) {
+        objSchema = await getLocalObjectSchemasWithHierarchy(_izContext, objType.objectType, schemasPath)
+          .then(res => {
+            return res.records[0]
+          })
+
+        if (!objSchema) {
+          errorMessage = "local not exists"
+        }
+      } else {
+        objSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
+        errorMessage = "s3 not exists"
+      }
+      return [objSchema, errorMessage]
+    }
+
     let validateStatus = {
       status: true,
       validateErrors: [],
@@ -1166,29 +1194,19 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
         // validate objType of each link
         await Promise.all(
           relData.links.map(async (link, linkIdx) => {
+            const [fromObjectSchema, fromErrorMessage] = await getLocalOrS3ObjectSchema(link.from.objType);
 
-            const fromObjectSchema = (link.from.objType.serviceTag === iz_serviceTag)
-              ? await getLocalObjectSchemasWithHierarchy(_izContext, link.from.objType.objectType, schemasPath)
-                .then(res => {
-                  if (!res.records[0]) {
-                    validateStatus.status = false;
-                    validateStatus.validateErrors.push(`Relationship:${relTagName} /links/${linkIdx} /from/objType > Not found objectSchema of objectType:${link.from.objType.objectType} in local service`);
-                  }
-                  return res.records[0]
-                })
-              : await getObjSchemaS3WithHierarchy(_izContext, link.from.objType);
-
-            const toObjectSchema = (link.to.objType.serviceTag === iz_serviceTag)
-              ? await getLocalObjectSchemasWithHierarchy(_izContext, link.to.objType.objectType, schemasPath)
-                .then(res => {
-                  if (!res.records[0]) {
-                    validateStatus.status = false;
-                    validateStatus.validateErrors.push(`Relationship:${relTagName} /links/${linkIdx} /to/objType > Not found objectSchema of objectType:${link.to.objType.objectType} in local service`);
-                  }
-                  return res.records[0]
-                })
-              : await getObjSchemaS3WithHierarchy(_izContext, link.to.objType);
+            if (!fromObjectSchema && fromErrorMessage === "local not exists") {
+              validateStatus.status = false;
+              validateStatus.validateErrors.push(`Relationship:${relTagName} /links/${linkIdx} /from/objType > Not found objectSchema of objectType:${link.from.objType.objectType} in local service`);
+            }
 
+            const [toObjectSchema, toErrorMessage] = await getLocalOrS3ObjectSchema(link.to.objType);
+
+            if (!fromObjectSchema && toErrorMessage === "local not exists") {
+              validateStatus.status = false;
+              validateStatus.validateErrors.push(`Relationship:${relTagName} /links/${linkIdx} /to/objType > Not found objectSchema of objectType:${link.to.objType.objectType} in local service`);
+            }
 
             if (!validateStatus.validateErrors.length) {
               if (!fromObjectSchema) {
@@ -1247,10 +1265,10 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             validateStatus.status = false;
             validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
           } else {
-            let objSchema = await getObjSchemaS3WithHierarchy(_izContext, {
-              objectType: flowSchema.objType.objectType,
-              serviceTag: flowSchema.objType.serviceTag
-            })
+
+            let [objSchema] = await getLocalOrS3ObjectSchema(flowSchema.objType);
+
+            console.log("objSchema: ", objSchema)
 
             if (!objSchema) {
               validateStatus.status = false;
@@ -1292,10 +1310,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             validateStatus.status = false;
             validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
           } else {
-            let objSchema = await getObjSchemaS3WithHierarchy(_izContext, {
-              objectType: flowSchema.objType.objectType,
-              serviceTag: flowSchema.objType.serviceTag
-            })
+            let [objSchema] = await getLocalOrS3ObjectSchema(flowSchema.objType);
 
             if (!objSchema) {
               validateStatus.status = false;