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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.91",
+  "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/UploadObjSchema.js

@@ -275,58 +275,58 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     );
 
 
-    // case create
-    let createFieldSchema = generateObjectSchemaForCreate(_izContext, objSchema);
-    uploadList.push(
-      uploadObjectToS3(
-        _izContext,
-        UPLOAD_PATH_S3.objectSchemaCreate(
-          _izContext,
-          {
-            serviceTag: process.env.iz_serviceTag,
-            objectType: createFieldSchema.objectType
-          }
-        ),
-        createFieldSchema
-      )
-    );
-
-    objectTypesForCreate.push(createFieldSchema.objectType);
-
-
-    // case update and display
-    let updateFieldSchema = generateObjectSchemaForUpdate(_izContext, objSchema);
-    uploadList.push(
-      uploadObjectToS3(
-        _izContext,
-        UPLOAD_PATH_S3.objectSchemaDisplay(
-          _izContext,
-          {
-            serviceTag: process.env.iz_serviceTag,
-            objectType: createFieldSchema.objectType
-          }
-        ),
-        updateFieldSchema
-      )
-    );
-
-
-    // case schema combine fieldNames
-    let combineFieldNamesObjectSchema = generateObjectSchemaForCombineFieldNames(_izContext, objSchema);
-    // console.log("combineFieldNamesObjectSchema", combineFieldNamesObjectSchema)
-    uploadList.push(
-      uploadObjectToS3(
-        _izContext,
-        UPLOAD_PATH_S3.objectSchemaCombineFieldNames(
-          _izContext,
-          {
-            serviceTag: process.env.iz_serviceTag,
-            objectType: combineFieldNamesObjectSchema.objectType
-          }
-        ),
-        combineFieldNamesObjectSchema
-      )
-    );
+    // // case create
+    // let createFieldSchema = generateObjectSchemaForCreate(_izContext, objSchema);
+    // uploadList.push(
+    //   uploadObjectToS3(
+    //     _izContext,
+    //     UPLOAD_PATH_S3.objectSchemaCreate(
+    //       _izContext,
+    //       {
+    //         serviceTag: process.env.iz_serviceTag,
+    //         objectType: createFieldSchema.objectType
+    //       }
+    //     ),
+    //     createFieldSchema
+    //   )
+    // );
+
+    // objectTypesForCreate.push(createFieldSchema.objectType);
+
+
+    // // case update and display
+    // let updateFieldSchema = generateObjectSchemaForUpdate(_izContext, objSchema);
+    // uploadList.push(
+    //   uploadObjectToS3(
+    //     _izContext,
+    //     UPLOAD_PATH_S3.objectSchemaDisplay(
+    //       _izContext,
+    //       {
+    //         serviceTag: process.env.iz_serviceTag,
+    //         objectType: createFieldSchema.objectType
+    //       }
+    //     ),
+    //     updateFieldSchema
+    //   )
+    // );
+
+
+    // // case schema combine fieldNames
+    // let combineFieldNamesObjectSchema = generateObjectSchemaForCombineFieldNames(_izContext, objSchema);
+    // // console.log("combineFieldNamesObjectSchema", combineFieldNamesObjectSchema)
+    // uploadList.push(
+    //   uploadObjectToS3(
+    //     _izContext,
+    //     UPLOAD_PATH_S3.objectSchemaCombineFieldNames(
+    //       _izContext,
+    //       {
+    //         serviceTag: process.env.iz_serviceTag,
+    //         objectType: combineFieldNamesObjectSchema.objectType
+    //       }
+    //     ),
+    //     combineFieldNamesObjectSchema
+    //   )
+    // );
 
     // upload to refObjectRelationships for each objectType that have createBy at UserAccount Service and belongTo
     let existsRefObjectRel = refRelationshipPerObjectType[objSchema.objectType];

package/src/ValidatorSchema.js

@@ -533,7 +533,7 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
   })
   // const objType = createObjType(objectType);
   const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
-  _izContext.logger.debug("objectSchema", objectSchema)
+  // _izContext.logger.debug("objectSchema", objectSchema)
 
   const objectSchemas = await uploadUseCase.generateObjectSchemaForCombineFieldNames(_izContext, objectSchema)
   _izContext.logger.debug("objectSchemas", objectSchemas)
@@ -573,7 +573,7 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
     }
   }
 
-  _izContext.logger.debug("canUpdate::::", { canUpdateFieldNames, canUpdateProperties });
+  // _izContext.logger.debug("canUpdate::::", { canUpdateFieldNames, canUpdateProperties });
 
   // collect usedFieldNames
   if (settings?.specificFieldNames) {
@@ -594,10 +594,10 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
 
   let defaultFieldNames = usedFieldNames.filter(fieldName => !identifiersFieldNames.includes(fieldName));
 
-  _izContext.logger.debug('identifiersFieldNames : ', identifiersFieldNames);
-  _izContext.logger.debug('usedFieldNames : ', usedFieldNames); // all fieldName
-  _izContext.logger.debug("defaultFieldNames :", defaultFieldNames);
-  _izContext.logger.debug("versionedDataFieldNames :", versionedDataFieldNames);
+  // _izContext.logger.debug('identifiersFieldNames : ', identifiersFieldNames);
+  // _izContext.logger.debug('usedFieldNames : ', usedFieldNames); // all fieldName
+  // _izContext.logger.debug("defaultFieldNames :", defaultFieldNames);
+  // _izContext.logger.debug("versionedDataFieldNames :", versionedDataFieldNames);
 
   let initialValidatorSchemaForUpdate = {
     type: "object",
@@ -658,8 +658,8 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
     }
   }
 
-  console.debug("versionedDataReturnInFieldsObjInstanceFull::::", versionedDataReturnInFieldsObjInstanceFull);
-  console.debug("initialValidatorSchemaForUpdate:::::", initialValidatorSchemaForUpdate);
+  // console.debug("versionedDataReturnInFieldsObjInstanceFull::::", versionedDataReturnInFieldsObjInstanceFull);
+  // console.debug("initialValidatorSchemaForUpdate:::::", initialValidatorSchemaForUpdate);
   Object.assign(
     initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields.properties,
     {
@@ -668,7 +668,7 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
     }
   );
 
-  _izContext.logger.debug("validatorSchema-update::", initialValidatorSchemaForUpdate);
+  // _izContext.logger.debug("validatorSchema-update::", initialValidatorSchemaForUpdate);
   return initialValidatorSchemaForUpdate;
 }
 
@@ -983,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: [],
@@ -1174,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) {
@@ -1255,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;
@@ -1300,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;