@izara_project/izara-core-library-service-schemas 1.0.65 → 1.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "@izara_project/izara-core-library-lambda": "^1.0.4",
     "@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.13",
+    "@izara_project/izara-shared-service-schemas": "^1.0.15",
     "glob": "^11.0.2",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",

package/src/UploadObjSchema.js

@@ -256,76 +256,75 @@ async function uploadObjectSchemaByUseCase(_izContext) {
 
   for (let objSchema of allObjectSchema) {
     // ignore objSchema that not has properties in fieldNames
-    if (objSchema.hasOwnProperty("fieldNames") && Object.keys(objSchema.fieldNames).length) {
 
-      // case All
-      uploadList.push(
-        uploadObjectToS3(
+    // case All
+    uploadList.push(
+      uploadObjectToS3(
+        _izContext,
+        UPLOAD_PATH_S3.objectSchemaAll(
           _izContext,
-          UPLOAD_PATH_S3.objectSchemaAll(
-            _izContext,
-            {
-              serviceTag: process.env.iz_serviceTag,
-              objectType: objSchema.objectType
-            }
-          ),
-          objSchema
-        )
-      );
+          {
+            serviceTag: process.env.iz_serviceTag,
+            objectType: objSchema.objectType
+          }
+        ),
+        objSchema
+      )
+    );
 
 
-      // case create
-      let createFieldSchema = generateObjectSchemaForCreate(_izContext, objSchema);
-      uploadList.push(
-        uploadObjectToS3(
+    // case create
+    let createFieldSchema = generateObjectSchemaForCreate(_izContext, objSchema);
+    uploadList.push(
+      uploadObjectToS3(
+        _izContext,
+        UPLOAD_PATH_S3.objectSchemaCreate(
           _izContext,
-          UPLOAD_PATH_S3.objectSchemaCreate(
-            _izContext,
-            {
-              serviceTag: process.env.iz_serviceTag,
-              objectType: createFieldSchema.objectType
-            }
-          ),
-          createFieldSchema
-        )
-      );
+          {
+            serviceTag: process.env.iz_serviceTag,
+            objectType: createFieldSchema.objectType
+          }
+        ),
+        createFieldSchema
+      )
+    );
 
-      objectTypesForCreate.push(createFieldSchema.objectType);
+    objectTypesForCreate.push(createFieldSchema.objectType);
 
 
-      // case update and display
-      let updateFieldSchema = generateObjectSchemaForUpdate(_izContext, objSchema);
-      uploadList.push(
-        uploadObjectToS3(
+    // case update and display
+    let updateFieldSchema = generateObjectSchemaForUpdate(_izContext, objSchema);
+    uploadList.push(
+      uploadObjectToS3(
+        _izContext,
+        UPLOAD_PATH_S3.objectSchemaDisplay(
           _izContext,
-          UPLOAD_PATH_S3.objectSchemaDisplay(
-            _izContext,
-            {
-              serviceTag: process.env.iz_serviceTag,
-              objectType: createFieldSchema.objectType
-            }
-          ),
-          updateFieldSchema
-        )
-      );
+          {
+            serviceTag: process.env.iz_serviceTag,
+            objectType: createFieldSchema.objectType
+          }
+        ),
+        updateFieldSchema
+      )
+    );
 
 
-      // case schema combine fieldNames
-      let combineFieldNamesObjectSchema = generateObjectSchemaForCombineFieldNames(_izContext, objSchema);
-      uploadList.push(
-        uploadObjectToS3(
+    // case schema combine fieldNames
+    let combineFieldNamesObjectSchema = generateObjectSchemaForCombineFieldNames(_izContext, objSchema);
+    uploadList.push(
+      uploadObjectToS3(
+        _izContext,
+        UPLOAD_PATH_S3.objectSchemaCombineFieldNames(
           _izContext,
-          UPLOAD_PATH_S3.objectSchemaCombineFieldNames(
-            _izContext,
-            {
-              serviceTag: process.env.iz_serviceTag,
-              objectType: combineFieldNamesObjectSchema.objectType
-            }
-          ),
-          combineFieldNamesObjectSchema
-        )
-      );
-    }
+          {
+            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];
@@ -392,11 +391,12 @@ async function uploadObjectSchemaByUseCase(_izContext) {
       }
     }
 
+    let serviceTag = objectSchema.extendObjType ? objectSchema.extendObjType.serviceTag : process.env.iz_serviceTag;
     if (graphServerTags.size) {
       createdBys.push({
         objType: {
           objectType: objectSchema.objectType,
-          serviceTag: process.env.iz_serviceTag
+          serviceTag: serviceTag
         },
         graphServerTags: [...graphServerTags]
       })

package/src/Utils.js

@@ -339,6 +339,16 @@ function validateFieldNamesWithStorageResources(_izContext, objectSchema) {
  * @returns {[boolean, string[]]}   - [status, errors], errors will return when status=false
  */
 function validateObjectSchema(_izContext, objectSchema) {
+
+  for (const storageResourceTag in objectSchema.storageResources) {
+    let storageResource = objectSchema.storageResources[storageResourceTag]
+    if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
+      if (!storageResource.serviceTag) {
+        Object.assign(objectSchema.storageResources[storageResourceTag], { serviceTag: process.env.iz_serviceTag })
+      }
+    }
+  }
+
   if (objectSchema.hasOwnProperty("extendObjType")) {
     return validateExtendObjectSchema(_izContext, objectSchema)
   } else {

package/src/ValidatorSchema.js

@@ -976,7 +976,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
         }
         for (const [fieldName, fieldNameSetting] of Object.entries(objSchema.fieldNames)) {
           if (fieldNameSetting.type === "string" || fieldNameSetting.type === "object" || fieldNameSetting.type === "number") {
-            if (fieldNameSetting.validation.hasOwnProperty("itemValidation")) {
+            if (fieldNameSetting?.validation?.hasOwnProperty("itemValidation")) {
               validateStatus.status = false;
               validateStatus.validateErrors.push(`fieldName: ${fieldName} should not have itemValidation for ${fieldNameSetting.type} type`);
             }
@@ -1048,32 +1048,33 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
           }
         }
 
-        if (relData.canChangeToRelType) {
-          let canChangeToRelSchema = null
-          if (relData.canChangeToRelType.serviceTag === iz_serviceTag) {
-            let canChangeRelSchemaLocal = await getLocalRelationshipSchemas(_izContext, [relData.canChangeToRelType.relationshipTag], schemasPath)
-            if (Object.keys(canChangeRelSchemaLocal).length) {
-              canChangeToRelSchema = canChangeRelSchemaLocal[relData.canChangeToRelType.relationshipTag]
-            }
-          } else {
-            canChangeToRelSchema = await getRelationshipSchema(_izContext, { relationshipTag: relData.canChangeToRelType.relationshipTag, serviceTag: relData.canChangeToRelType.serviceTag }) // return {}
-          }
-
-          if (!canChangeToRelSchema || !Object.keys(canChangeToRelSchema).length) {
-            validateStatus.status = false;
-            validateStatus.validateErrors.push(`Relationship:${relTagName}/canChangeToRelType targetRelType ${JSON.stringify(relData.canChangeToRelType)} not exist`);
-          } else {
-            if (!canChangeToRelSchema.hasOwnProperty("canChangeToRelType")) {
-              validateStatus.status = false;
-              validateStatus.validateErrors.push(`RelType:${JSON.stringify(relData.canChangeToRelType)} not have setting canChangeToRelType`);
-            } else {
-              if (canChangeToRelSchema.canChangeToRelType.serviceTag !== iz_serviceTag || canChangeToRelSchema.canChangeToRelType.relationshipTag !== relTagName) {
-                validateStatus.status = false;
-                validateStatus.validateErrors.push(`RelType:${JSON.stringify(relData.canChangeToRelType)} not have reference to RelType:${JSON.stringify({ serviceTag: iz_serviceTag, relationshipTag: relTagName })} `);
-              }
-            }
-          }
-        }
+        //! reject no more cross check
+        // if (relData.canChangeToRelType) {
+        //   let canChangeToRelSchema = null
+        //   if (relData.canChangeToRelType.serviceTag === iz_serviceTag) {
+        //     let canChangeRelSchemaLocal = await getLocalRelationshipSchemas(_izContext, [relData.canChangeToRelType.relationshipTag], schemasPath)
+        //     if (Object.keys(canChangeRelSchemaLocal).length) {
+        //       canChangeToRelSchema = canChangeRelSchemaLocal[relData.canChangeToRelType.relationshipTag]
+        //     }
+        //   } else {
+        //     canChangeToRelSchema = await getRelationshipSchema(_izContext, { relationshipTag: relData.canChangeToRelType.relationshipTag, serviceTag: relData.canChangeToRelType.serviceTag }) // return {}
+        //   }
+
+        //   if (!canChangeToRelSchema || !Object.keys(canChangeToRelSchema).length) {
+        //     validateStatus.status = false;
+        //     validateStatus.validateErrors.push(`Relationship:${relTagName}/canChangeToRelType targetRelType ${JSON.stringify(relData.canChangeToRelType)} not exist`);
+        //   } else {
+        //     if (!canChangeToRelSchema.hasOwnProperty("canChangeToRelType")) {
+        //       validateStatus.status = false;
+        //       validateStatus.validateErrors.push(`RelType:${JSON.stringify(relData.canChangeToRelType)} not have setting canChangeToRelType`);
+        //     } else {
+        //       if (canChangeToRelSchema.canChangeToRelType.serviceTag !== iz_serviceTag || canChangeToRelSchema.canChangeToRelType.relationshipTag !== relTagName) {
+        //         validateStatus.status = false;
+        //         validateStatus.validateErrors.push(`RelType:${JSON.stringify(relData.canChangeToRelType)} not have reference to RelType:${JSON.stringify({ serviceTag: iz_serviceTag, relationshipTag: relTagName })} `);
+        //       }
+        //     }
+        //   }
+        // }
 
 
         /*
@@ -1150,83 +1151,21 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
     if (allFlowSchemas) {
       for (const flowSchema of allFlowSchemas) {
         const [status, errors] = validateBasicFlowSchema(_izContext, flowSchema)
-        if (flowSchema.hasOwnProperty("uploadS3") && flowSchema.uploadS3 === true) {
-          if (!flowSchema.hasOwnProperty("objType")) {
-            validateStatus.status = false;
-            validateStatus.validateErrors.push(
-              `${flowSchema.flowTag} have uploadS3 case must have objType`
-            )
-          }
-          if (!flowSchema.hasOwnProperty("uploadType")) {
-            validateStatus.status = false;
-            validateStatus.validateErrors.push(
-              `${flowSchema.flowTag} must have upload type`
-            )
-          }
-        }
 
-        if (flowSchema.hasOwnProperty("flowType")) {
-          if (flowSchema.flowType === "oneOff" || flowSchema.flowType === "storedCache") {
-            if (!flowSchema.hasOwnProperty("tableName")) {
-              validateStatus.status = false;
-              validateStatus.validateErrors.push(
-                `${flowSchema.flowTag} must have storageResource to get result`
-              )
-            }
+        if (flowSchema.handleObj === "multi") {
+          if (flowSchema.outputTopic === true) {
+            validateStatus.status = false;
+            validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} should not have outputTopic if handleObj === true`)
           }
         }
 
-        if (flowSchema.hasOwnProperty("uploadType")) {
-          if (S3_UPLOAD_TYPE.includes(flowSchema.uploadType)) {
-            if (!flowSchema.hasOwnProperty("uploadS3")) {
-              validateStatus.status = false;
-              validateStatus.validateErrors.push(
-                `${flowSchema.flowTag} must have uploadS3 setting true to select uploadType`
-              )
-            }
+        if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "statusField" || flowSchema.statusType === "triggerCache") {
+          if (!flowSchema.hasOwnProperty("objType")) {
+            validateStatus.status = false;
+            validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
           }
         }
 
-        if (flowSchema.hook) {
-          await Promise.all(
-            Object.entries(flowSchema.hook).map(async ([hookName, hookProperties]) => {
-              if (!(Object.values(FLOW_SCHEMA_HOOK_STATE).includes(hookName))) {
-                validateStatus.status = false;
-                validateStatus.validateErrors.push(
-                  `${hookName} is invalid`
-                );
-              }
-
-              await Promise.all(
-                hookProperties.functionList.map(async (hookFunction) => {
-                  if (hookFunction.event.handlerType === HANDLER.hdrSqs) {
-                    if (!hookFunction.event.hasOwnProperty("topicName")) {
-                      validateStatus.status = false;
-                      validateStatus.validateErrors.push(
-                        `${hookName}.${hookFunction.functionName} must have topicName`
-                      );
-                    }
-                  } else if (hookFunction.event.handlerType === HANDLER.hdrDsq) {
-                    if (!hookFunction.event.hasOwnProperty("queueName")) {
-                      validateStatus.status = false;
-                      validateStatus.validateErrors.push(
-                        `${hookName}.${hookFunction.functionName} must have queueName`
-                      );
-                    }
-                  }
-
-                  if (hookFunction.event.hasOwnProperty("topicName") && hookFunction.event.hasOwnProperty("queueName")) {
-                    validateStatus.status = false;
-                    validateStatus.validateErrors.push(
-                      `${hookName}.${hookFunction.functionName} must have only one of topicName or queueName`
-                    );
-                  }
-                })
-              );
-            })
-          );
-        }
-
         if (!status) {
           validateStatus.status = false;
           validateStatus.validateErrors.push(errors);

package/src/libs/CreateNodeLib.js

@@ -20,9 +20,21 @@ const { createRelTypeConcat, createLinkTypeId } = require('../Utils');
 const getObjectSchema = require('../GetObjectSchema');
 const serviceConfig = require('../ServiceConfig');
 const { STORAGE_TYPES } = require('../Consts')
+const { createObjTypeHierarchy } = require('../libs/RelSchemaLib')
 
 async function validateRequiredOnCreateLinks(_izContext, objType, relationships, settings = {}) {
   _izContext.logger.debug("validateRequiredOnCreateLinks:::", { objType, relationships, settings })
+
+
+  let objectHie = await createObjTypeHierarchy(_izContext, objType);
+  _izContext.logger.debug("objectHierarchy::", objectHie)
+
+  if (relationships.length) {
+    let targetHierarchy = await createObjTypeHierarchy(_izContext, relationships[0].targetObjType);
+    _izContext.logger.debug("targetHierarchy::", targetHierarchy)
+  }
+
+
   let errorFound = [];
 
   let requiredOnCreateLinks = await getObjectSchema.getRequiredOnCreateLinksWithCache(_izContext, objType)
@@ -78,7 +90,13 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships,
 
     for (let link of usedLinkGroup) {
       // check other with targetObjType, check linkType of other should be 'one',
-      if (link.other.objType.objectType === relationship.targetObjType.objectType) {
+      let targetObjTypeHierarchy = await createObjTypeHierarchy(_izContext, relationship.targetObjType);
+      _izContext.logger.debug(" ::", targetObjTypeHierarchy)
+
+      // if (link.other.objType.objectType === relationship.targetObjType.objectType) {
+      if (targetObjTypeHierarchy.some(objType =>
+        objType.objectType === link.other.objType.objectType && objType.serviceTag === link.other.objType.serviceTag)
+      ) {
         if (link.other.linkType === "one") {
           if (!validateOnCreateRelationships.has(`${relTypeConcat}_${relationship.relationshipDirection}`)) {
             validateOnCreateRelationships.add(`${relTypeConcat}_${relationship.relationshipDirection}`)