@izara_project/izara-core-generate-service-code 1.0.36 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/recievePlugIn/mainFunction/template.ejs

@@ -70,7 +70,7 @@ export default async function <%- functionName %> (
 
 
   } catch (err) {
-    _izContext.logger.error('error WebSocketInvoke: ', err)
+    _izContext.logger.error('error recievePlugInRequest: ', err)
     throw (err)
  }
 }

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/sendPlugIn/mainFunction/template.ejs

@@ -76,7 +76,7 @@ export default async function <%- functionName %>(
     <% } -%>
 
   } catch (err) {
-    _izContext.logger.error('error AFlowStepsMain: ', err)
+    _izContext.logger.error('error <%- functionName %>Main: ', err)
     throw (err)
   }
 }

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/template.ejs

@@ -76,7 +76,7 @@ export default async function <%- functionName %>(
     <% } -%>
 
   } catch (err) {
-    _izContext.logger.error('error AFlowStepsMain: ', err)
+    _izContext.logger.error('error <%- functionName %>Main: ', err)
     throw (err)
   }
 }

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/beforeLogical/template.ejs

@@ -135,6 +135,16 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
       })
     );
 
+    if (callingFlowConfig.callingFlow === `${process.env.iz_resourcePrefix}CreateBeforeLogical`) {
+      callingFlowConfig =
+        callingFlowConfig.callingFlowProperties.parentPassBackProperties;
+    }
+
+    _izContext.logger.debug(
+      '[createBeforeLogicalMain] callingFlowConfig',
+      callingFlowConfig
+    );
+
     //(<beforeLogicalMain>)
     //(</beforeLogicalMain>)
 

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/create/main/template.ejs

@@ -240,6 +240,7 @@ const PREFIX = {
           messageObject = {
             objType,
             objInstanceFull: objectForCreate.objInstanceFull,
+            deepPathConditional: requestParams.deepPathConditional || [],
             setFieldConditionals: requestParams.setFieldConditionals || [],
             relationships: requestParams.relationships || []
           };

package/src/generateCode/generateSchema/relationshipPerActionComponent/create/action/mainFunction/template.ejs

@@ -129,6 +129,9 @@ export default async function createRelationship(
     const relationshipSchema = await getRelationshipSchemaWithCache(_izContext, relType);
     _izContext.logger.debug("relationshipSchema: ", relationshipSchema);
 
+    const firstObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, firstObject.objType);
+    const secondObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, secondObject.objType);
+
     const links = await findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], relationshipSchema.links)
     _izContext.logger.debug("links", links)
     if (!links.length) {
@@ -140,8 +143,8 @@ export default async function createRelationship(
       const { serviceTag: fromServiceTag, objectType: fromObjectType } = link.from.objType;
       const { serviceTag: toServiceTag, objectType: toObjType } = link.to.objType;
 
-      const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType
-      const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType
+      const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
+      const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
 
       const matchFromTo = fromServiceTag === firstServiceTag && fromObjectType === firstObjectType &&
         toServiceTag === secondServiceTag && toObjType === secondObjectType;
@@ -169,8 +172,8 @@ export default async function createRelationship(
           const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
           const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
 
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
+          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObjectHie.extendObjType || firstObject.objType;
+          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObjectHie.extendObjType || secondObject.objType;
 
           // find exists link
           if (

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/action/handler/templateByHandler/apiTemplate.ejs

@@ -28,7 +28,7 @@ import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Mai
 // validate event params in middleware before into function
 let validator = {
   type: "object",
-  required: ["firstObject", "relType", "relId", "relationshipDirection"],
+  required: ["relType", "relId"],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/action/handler/templateByHandler/dsqTemplate.ejs

@@ -46,7 +46,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middlewware before into function.
 let validatorSchema = {
   type: "object",
-  required: ["firstObject", "relType", "relId", "relationshipDirection"],
+  required: ["relType", "relId"],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/action/handler/templateByHandler/invTemplate.ejs

@@ -29,7 +29,7 @@ import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Mai
 // validate event params in middlewware before into function.
 let validator = {
   type: "object",
- required: ["firstObject", "relType", "relId", "relationshipDirection"],
+  required: ["relType", "relId"],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/action/handler/templateByHandler/sqsTemplate.ejs

@@ -33,7 +33,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 // validate event params in middleware before into function
 let validator = {
   type: "object",
- required: ["firstObject", "relType", "relId", "relationshipDirection"],
+  required: ["relType", "relId"],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/handler/templateByHandler/apiTemplate.ejs

@@ -28,7 +28,7 @@ import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Mai
 // validate event params in middlewareHandler before into function
 let basicValidatorSchema =  {
   type: "object",
-  required: ["firstObject", "secondObject", "relType", 'relId'],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/handler/templateByHandler/dsqTemplate.ejs

@@ -43,7 +43,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middlewware before into function.
 let validator = {
   type: "object",
-  required: ["firstObject", "secondObject", "relType", 'relId'],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/handler/templateByHandler/invTemplate.ejs

@@ -28,7 +28,7 @@ import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Mai
 // validate event params in middlewware before into function.
 let validator = {
   type: "object",
-  required: ["firstObject", "secondObject", "relType", 'relId'],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/handler/templateByHandler/sqsTemplate.ejs

@@ -32,7 +32,7 @@ middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middlewareHandler before into function
 let basicValidatorSchema = {
   type: "object",
-  required: ["firstObject", "secondObject", "relType", 'relId'],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/mainFunction/template.ejs

@@ -143,54 +143,67 @@ export default async function getRelationship(
     let targetStorageResources = [];
 
     if (relationshipSchema) {
-      // find targetStorageResources and validate each storageResources
-      await Promise.all(
-        relationshipSchema.links.map(async ({ from, to, storageResourceTags }) => {
-          const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
-          const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
-
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
-
-          // find exists link
-          if (
-            (
-              (firstServiceTag === fromServiceTag && firstObjectType === fromObjectType) &&
-              (secondServiceTag === toServiceTag && secondObjectType === toObjectType)
-            ) ||
-            (
-              (firstServiceTag === toServiceTag && firstObjectType === toObjectType) &&
-              (secondServiceTag === fromServiceTag && secondObjectType === fromObjectType)
-            )
-          ) {
-
-            // check founded storageResource of link and collect used storageResources
-            await Promise.all(storageResourceTags.map(async storageResourceTag => {
-              const usedStorageResource = relationshipSchema.storageResources[storageResourceTag];
-
-              if (usedStorageResource.storageType === consts.STORAGE_TYPES.graph) {
-                const graphServiceTag = await getGraphServiceTagWithCache(_izContext, usedStorageResource.graphServerTag);
-                if (!graphServiceTag) {
-                  errorsFound.push(`storageResourceTag: ${storageResourceTag} invalid, not found graph serviceTag from graphServerTag: ${usedStorageResource.graphServerTag}`)
-                }
+      let firstObjectHie;
+      let secondObjectHie;
 
-                targetStorageResources.push({
-                  ...usedStorageResource,
-                  graphServiceTag: graphServiceTag
-                });
-              } else {
-                targetStorageResources.push(usedStorageResource);
-              }
-            }));
-          }
-        })
-      );
-      //(<afterGetRelCreateRel>)
-      //(</afterGetRelCreateRel>)
-      _izContext.logger.debug("targetStorageResources: ", targetStorageResources);
-
-      if (!targetStorageResources.length) {
-        errorsFound.push(`Not found link from relationship schema`);
+      if (firstObject && Object.values(firstObject).length > 0) {
+        firstObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, firstObject.objType);
+      };
+
+      if (secondObject && Object.values(secondObject).length > 0) {
+        secondObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, secondObject.objType);
+      };
+
+      if (firstObjectHie || firstObject || secondObjectHie || secondObject) {
+        // find targetStorageResources and validate each storageResources
+        await Promise.all(
+          relationshipSchema.links.map(async ({ from, to, storageResourceTags }) => {
+            const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
+            const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
+
+            const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObjectHie.extendObjType || firstObject.objType;
+            const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObjectHie.extendObjType || secondObject.objType;
+
+            // find exists link
+            if (
+              (
+                (firstServiceTag === fromServiceTag && firstObjectType === fromObjectType) &&
+                (secondServiceTag === toServiceTag && secondObjectType === toObjectType)
+              ) ||
+              (
+                (firstServiceTag === toServiceTag && firstObjectType === toObjectType) &&
+                (secondServiceTag === fromServiceTag && secondObjectType === fromObjectType)
+              )
+            ) {
+
+              // check founded storageResource of link and collect used storageResources
+              await Promise.all(storageResourceTags.map(async storageResourceTag => {
+                const usedStorageResource = relationshipSchema.storageResources[storageResourceTag];
+
+                if (usedStorageResource.storageType === consts.STORAGE_TYPES.graph) {
+                  const graphServiceTag = await getGraphServiceTagWithCache(_izContext, usedStorageResource.graphServerTag);
+                  if (!graphServiceTag) {
+                    errorsFound.push(`storageResourceTag: ${storageResourceTag} invalid, not found graph serviceTag from graphServerTag: ${usedStorageResource.graphServerTag}`)
+                  }
+
+                  targetStorageResources.push({
+                    ...usedStorageResource,
+                    graphServiceTag: graphServiceTag
+                  });
+                } else {
+                  targetStorageResources.push(usedStorageResource);
+                }
+              }));
+            }
+          })
+        );
+        //(<afterGetRelCreateRel>)
+        //(</afterGetRelCreateRel>)
+        _izContext.logger.debug("targetStorageResources: ", targetStorageResources);
+
+        if (!targetStorageResources.length) {
+          errorsFound.push(`Not found link from relationship schema`);
+        }
       }
     } else {
       errorsFound.push(`relationshipSchema not exists`);

package/src/generateCode/generateSchema/relationshipPerActionComponent/moveRelationship/action/mainFunction/template.ejs

@@ -64,7 +64,7 @@ import { consts as coreConsts } from '@izara_project/izara-core-library-core';
  *
  * @returns {object} description of return value
  */
-export default async function <%- functionName %> (
+export default async function moveRelationship(
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -72,9 +72,9 @@ export default async function <%- functionName %> (
   //(</additionalParams>)
 ) {
   try {
-    _izContext.logger.debug('<%- functionName %> _izContext: ', _izContext);
-    _izContext.logger.debug('<%- functionName %> requestParams: ', requestParams);
-    _izContext.logger.debug('<%- functionName %> callingFlowConfig: ', callingFlowConfig);
+    _izContext.logger.debug('moveRelationship _izContext: ', _izContext);
+    _izContext.logger.debug('moveRelationship requestParams: ', requestParams);
+    _izContext.logger.debug('moveRelationship callingFlowConfig: ', callingFlowConfig);
 
     const {
       firstObject,
@@ -140,6 +140,10 @@ export default async function <%- functionName %> (
 
     const links = await findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], relationshipSchema.links)
     _izContext.logger.debug("links", links)
+
+    const firstObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, firstObject.objType);
+    const secondObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, secondObject.objType);
+
     if (!links.length) {
       errorsFound.push(`not found link between ${JSON.stringify({ firstObject: firstObject.objType })} ${JSON.stringify({ secondObject: secondObject.objType })}`)
     };
@@ -149,8 +153,8 @@ export default async function <%- functionName %> (
       const { serviceTag: fromServiceTag, objectType: fromObjectType } = link.from.objType;
       const { serviceTag: toServiceTag, objectType: toObjType } = link.to.objType;
 
-      const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType
-      const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType
+      const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObjectHie.extendObjType || firstObject.objType
+      const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObjectHie.extendObjType || secondObject.objType
 
       const matchFromTo = fromServiceTag === firstServiceTag && fromObjectType === firstObjectType &&
         toServiceTag === secondServiceTag && toObjType === secondObjectType;
@@ -178,8 +182,8 @@ export default async function <%- functionName %> (
           const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
           const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
 
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
+          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObjectHie.extendObjType || firstObject.objType;
+          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObjectHie.extendObjType || secondObject.objType;
 
           // find exists link
           if (

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/handler/templateByHandler/apiTemplate.ejs

@@ -25,7 +25,7 @@ import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Mai
 // validate event params in middlewareHandler before into function
 let basicValidatorSchema = {
   type: "object",
-  required: ["firstObject", "relType", "relationshipProperties", "relationshipDirection", "relId"],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/handler/templateByHandler/dsqTemplate.ejs

@@ -43,7 +43,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middlewware before into function.
 let basicValidatorSchema = {
   type: "object",
-  required: ["firstObject", "relType", "relationshipProperties", "relationshipDirection", "relId"],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/handler/templateByHandler/invTemplate.ejs

@@ -28,7 +28,7 @@ import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Mai
 // validate event params in middleware before into function.
 let basicValidatorSchema = {
   type: "object",
-  required: ["firstObject", "relType", "relationshipProperties", "relationshipDirection", "relId"],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/handler/templateByHandler/sqsTemplate.ejs

@@ -33,7 +33,7 @@ middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middlewareHandler before into function
 let basicValidatorSchema = {
   type: "object",
-  required: ["firstObject", "relType", "relationshipProperties", "relationshipDirection", "relId"],
+  required: ["relType", 'relId'],
   properties: {
     firstObject: {
       type: "object",

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/mainFunction/template.ejs

@@ -117,12 +117,15 @@ export default async function updateRelationship(
           }
         }
       }
-    }
+    };
+
+    if (firstObject && Object.values(firstObject).length > 0) {
+      await validateIdentifiersExists(_izContext, firstObject.objType, firstObject.identifiers);
+    };
 
-    await validateIdentifiersExists(_izContext, firstObject.objType, firstObject.identifiers);
     if (secondObject && Object.values(secondObject).length > 0) {
       await validateIdentifiersExists(_izContext, secondObject.objType, secondObject.identifiers);
-    }
+    };
     // finished validate object and identifiers
 
     //(<afterValidateUpdateRel>)
@@ -136,48 +139,61 @@ export default async function updateRelationship(
     let targetStorageResources = [];
 
     if (relationshipSchema) {
-      // find targetStorageResources and validate each storageResources
-      await Promise.all(
-        relationshipSchema.links.map(async ({ from, to, storageResourceTags }) => {
-          const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
-          const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
+      let firstObjectHie;
+      let secondObjectHie;
 
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
+      if (firstObject && Object.values(firstObject).length > 0) {
+        firstObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, firstObject.objType);
+      };
 
-          // find exists link
-          if (
-            (
-              (firstServiceTag === fromServiceTag && firstObjectType === fromObjectType) &&
-              (secondServiceTag === toServiceTag && secondObjectType === toObjectType)
-            ) ||
-            (
-              (firstServiceTag === toServiceTag && firstObjectType === toObjectType) &&
-              (secondServiceTag === fromServiceTag && secondObjectType === fromObjectType)
-            )
-          ) {
+      if (secondObject && Object.values(secondObject).length > 0) {
+        secondObjectHie = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, secondObject.objType);
+      };
 
-            // check founded storageResource of link and collect used storageResources
-            await Promise.all(storageResourceTags.map(async storageResourceTag => {
-              const usedStorageResource = relationshipSchema.storageResources[storageResourceTag];
+      if (firstObjectHie || firstObject || secondObjectHie || secondObject) {
+        // find targetStorageResources and validate each storageResources
+        await Promise.all(
+          relationshipSchema.links.map(async ({ from, to, storageResourceTags }) => {
+            const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
+            const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
+
+            const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObjectHie.extendObjType || firstObject.objType;
+            const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObjectHie.extendObjType || secondObject.objType;
+
+            // find exists link
+            if (
+              (
+                (firstServiceTag === fromServiceTag && firstObjectType === fromObjectType) &&
+                (secondServiceTag === toServiceTag && secondObjectType === toObjectType)
+              ) ||
+              (
+                (firstServiceTag === toServiceTag && firstObjectType === toObjectType) &&
+                (secondServiceTag === fromServiceTag && secondObjectType === fromObjectType)
+              )
+            ) {
 
-              if (usedStorageResource.storageType === consts.STORAGE_TYPES.graph) {
-                const graphServiceTag = await getGraphServiceTagWithCache(_izContext, usedStorageResource.graphServerTag);
-                if (!graphServiceTag) {
-                  errorsFound.push(`storageResourceTag:${storageResourceTag} invalid, not found graph serviceTag from graphServerTag:${usedStorageResource.graphServerTag}`)
-                }
+              // check founded storageResource of link and collect used storageResources
+              await Promise.all(storageResourceTags.map(async storageResourceTag => {
+                const usedStorageResource = relationshipSchema.storageResources[storageResourceTag];
 
-                targetStorageResources.push({
-                  ...usedStorageResource,
-                  graphServiceTag: graphServiceTag
-                });
-              } else {
-                targetStorageResources.push(usedStorageResource);
-              }
-            }));
-          }
-        })
-      );
+                if (usedStorageResource.storageType === consts.STORAGE_TYPES.graph) {
+                  const graphServiceTag = await getGraphServiceTagWithCache(_izContext, usedStorageResource.graphServerTag);
+                  if (!graphServiceTag) {
+                    errorsFound.push(`storageResourceTag:${storageResourceTag} invalid, not found graph serviceTag from graphServerTag:${usedStorageResource.graphServerTag}`)
+                  }
+
+                  targetStorageResources.push({
+                    ...usedStorageResource,
+                    graphServiceTag: graphServiceTag
+                  });
+                } else {
+                  targetStorageResources.push(usedStorageResource);
+                }
+              }));
+            }
+          })
+        );
+      }
       //(<afterGetRelUpdateRel>)
       //(</afterGetRelUpdateRel>)
       _izContext.logger.debug("targetStorageResources: ", targetStorageResources);
@@ -206,179 +222,179 @@ export default async function updateRelationship(
       }
 
 
-    // if found errors will stop processing
-    if (errorsFound.length) {
+      // if found errors will stop processing
+      if (errorsFound.length) {
 
-      let updateCompleteMsg = {
-        firstObject: firstObject,
-        secondObject: secondObject,
-        relId: relId,
-        relType: relType,
-        relationshipDirection,
-        status: 'error',
-        errorsFound: errorsFound
-        //(<inUpdateCompleteMsgUpdateRel>)
-        //(</inUpdateCompleteMsgUpdateRel>)
-      };
+        let updateCompleteMsg = {
+          firstObject: firstObject,
+          secondObject: secondObject,
+          relId: relId,
+          relType: relType,
+          relationshipDirection,
+          status: 'error',
+          errorsFound: errorsFound
+          //(<inUpdateCompleteMsgUpdateRel>)
+          //(</inUpdateCompleteMsgUpdateRel>)
+        };
 
-      // if have callingFlow will send to message complete
-      if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
-        _izContext.logger.debug("HAVE CallingFlow");
+        // if have callingFlow will send to message complete
+        if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
+          _izContext.logger.debug("HAVE CallingFlow");
 
-        updateCompleteMsg = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, updateCompleteMsg);
-        let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
+          updateCompleteMsg = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, updateCompleteMsg);
+          let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
 
-        let messageParams = {
-          Message: JSON.stringify(updateCompleteMsg),
-          MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-          TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateRelComplete),
-        };
+          let messageParams = {
+            Message: JSON.stringify(updateCompleteMsg),
+            MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateRelComplete),
+          };
 
-        _izContext.logger.debug("messageParams OutUpdateRelationshipComplete ::::::: ", messageParams);
-        await sns.publishAsync(_izContext, messageParams);
+          _izContext.logger.debug("messageParams OutUpdateRelationshipComplete ::::::: ", messageParams);
+          await sns.publishAsync(_izContext, messageParams);
+        }
+
+        return updateCompleteMsg;
       }
 
-      return updateCompleteMsg;
-    }
 
+      // before create awaitingStepId per graph storageResource
+      const linkTypeId = createLinkTypeId(_izContext, firstObject.objType, secondObject.objType, relType, relationshipDirection);
 
-    // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(_izContext, firstObject.objType, secondObject.objType, relType, relationshipDirection);
+      let usedGraphServiceTag = []; // collect used graph serviceName, use to check duplicate graph serviceName across graph serverTag
+      let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
+      let awaitingStepIds = [];
 
-    let usedGraphServiceTag = []; // collect used graph serviceName, use to check duplicate graph serviceName across graph serverTag
-    let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
-    let awaitingStepIds = [];
+      for (const targetStorageResource of targetStorageResources) {
+        if (targetStorageResource.storageType === consts.STORAGE_TYPES.graph &&
+          !usedGraphServiceTag.includes(targetStorageResource.graphServiceTag)
+        ) {
+          usedGraphServiceTag.push(targetStorageResource.graphServiceTag);
+          targetGraphStorageResources.push(targetStorageResource);
 
-    for (const targetStorageResource of targetStorageResources) {
-      if (targetStorageResource.storageType === consts.STORAGE_TYPES.graph &&
-        !usedGraphServiceTag.includes(targetStorageResource.graphServiceTag)
-      ) {
-        usedGraphServiceTag.push(targetStorageResource.graphServiceTag);
-        targetGraphStorageResources.push(targetStorageResource);
+          // awaitingStepId per graphServiceTag
+          awaitingStepIds.push(
+            asyncFlowSharedLib.createAwaitingStepId(
+              hash({ linkTypeId, relId, relationshipProperties, graphServiceTag: targetStorageResource.graphServiceTag }), // hash id
+              PREFIX.updateRel // prefix, use constant further
+            )
+          );
+        } else if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
+          let tableNameFrom = `${firstObject.objType.serviceTag}_${firstObject.objType.objectType}__${relType.relationshipTag}__${secondObject.objType.serviceTag}_${secondObject.objType.objectType}`;
+          let tableNameTo = `${secondObject.objType.serviceTag}_${secondObject.objType.objectType}__${relType.relationshipTag}__${firstObject.objType.serviceTag}_${firstObject.objType.objectType}`;
+
+          let identifiersConcatFirstObject = await identifiersObject.identifiersConcatFromIdentifiers(_izContext, firstObject.objType, firstObject.identifiers);
+          let identifiersConcatSecondObject = await identifiersObject.identifiersConcatFromIdentifiers(_izContext, secondObject.objType, secondObject.identifiers);
+          const firstObjectIdentifiersConcat = `${firstObject.objType.serviceTag}_${firstObject.objType.objectType}__identifiersConcat`;
+          const secondObjectIdentifiersConcat = `${secondObject.objType.serviceTag}_${secondObject.objType.objectType}__identifiersConcat`;
+
+          await dynamodbSharedLib.updateItem(_izContext,
+            await dynamodbSharedLib.tableName(_izContext, tableNameFrom),
+            {
+              [identifiersConcatFirstObject]: firstObjectIdentifiersConcat,
+              [identifiersConcatSecondObject]: secondObjectIdentifiersConcat
+            }
+          )
 
-        // awaitingStepId per graphServiceTag
-        awaitingStepIds.push(
-          asyncFlowSharedLib.createAwaitingStepId(
-            hash({ linkTypeId, relId, relationshipProperties, graphServiceTag: targetStorageResource.graphServiceTag }), // hash id
+          await dynamodbSharedLib.updateItem(_izContext,
+            await dynamodbSharedLib.tableName(_izContext, tableNameTo),
+            {
+              [identifiersConcatSecondObject]: secondObjectIdentifiersConcat,
+              [identifiersConcatFirstObject]: firstObjectIdentifiersConcat
+            }
+          )
+        }
+      }
+
+      if (awaitingStepIds.length) {
+        // save awaiting
+        await asyncFlowSharedLib.createAwaitingMultipleSteps(
+          _izContext,
+          awaitingStepIds, // awaitingStepIds
+          asyncFlowSharedLib.createPendingStepId( // pendingStepId
+            hash({ linkTypeId, relId, relationshipProperties, correlationId: _izContext.correlationIds.get("id") }), // hash id
             PREFIX.updateRel // prefix, use constant further
           )
         );
-      } else if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
-        let tableNameFrom = `${firstObject.objType.serviceTag}_${firstObject.objType.objectType}__${relType.relationshipTag}__${secondObject.objType.serviceTag}_${secondObject.objType.objectType}`;
-        let tableNameTo = `${secondObject.objType.serviceTag}_${secondObject.objType.objectType}__${relType.relationshipTag}__${firstObject.objType.serviceTag}_${firstObject.objType.objectType}`;
-
-        let identifiersConcatFirstObject = await identifiersObject.identifiersConcatFromIdentifiers(_izContext, firstObject.objType, firstObject.identifiers);
-        let identifiersConcatSecondObject = await identifiersObject.identifiersConcatFromIdentifiers(_izContext, secondObject.objType, secondObject.identifiers);
-        const firstObjectIdentifiersConcat = `${firstObject.objType.serviceTag}_${firstObject.objType.objectType}__identifiersConcat`;
-        const secondObjectIdentifiersConcat = `${secondObject.objType.serviceTag}_${secondObject.objType.objectType}__identifiersConcat`;
-
-        await dynamodbSharedLib.updateItem(_izContext,
-          await dynamodbSharedLib.tableName(_izContext, tableNameFrom),
-          {
-            [identifiersConcatFirstObject]: firstObjectIdentifiersConcat,
-            [identifiersConcatSecondObject]: secondObjectIdentifiersConcat
-          }
+
+        // prepare message body
+        let updateRelMessageBody = {
+          firstObject,
+          secondObject,
+          relId,
+          relType: relType,
+          relationshipProperties,
+          relationshipDirection
+          //(<inUpdateRelMessageBodyUpdateRel>)
+          //(</inUpdateRelMessageBodyUpdateRel>)
+        }
+        _izContext.logger.debug('updateRelMessageBody: ', updateRelMessageBody);
+
+        await Promise.all(
+          targetGraphStorageResources.map(async (storageResource) => {
+            if (storageResource.storageType === consts.STORAGE_TYPES.graph) {
+
+              updateRelMessageBody = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+                updateRelMessageBody,
+                callingFlowSharedLib.addParentCallingFlowConfig(
+                  callingFlowConfig, // receive parent callingFlowConfig.
+                  callingFlowSharedLib.createCallingFlowConfig( // callingFlow own service
+                    //(<callingFlowProperties>)
+                    await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.updateRelComplete),
+                    //(</callingFlowProperties>)
+                    {
+                      graphServiceTag: storageResource.graphServiceTag
+                    }
+                  )
+                )
+              );
+              _izContext.logger.debug("messageObject before send message:", updateRelMessageBody)
+
+              let messageToInUpdateRelationship = {
+                Message: JSON.stringify(updateRelMessageBody),
+                TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateRel, storageResource.graphServiceTag),
+              };
+              _izContext.logger.debug("RequestParams before send to sqs messageToInUpdateRelationship ::::::: ", messageToInUpdateRelationship);
+              await sns.publishAsync(_izContext, messageToInUpdateRelationship);
+            }
+          })
         )
 
-        await dynamodbSharedLib.updateItem(_izContext,
-          await dynamodbSharedLib.tableName(_izContext, tableNameTo),
-          {
-            [identifiersConcatSecondObject]: secondObjectIdentifiersConcat,
-            [identifiersConcatFirstObject]: firstObjectIdentifiersConcat
+      } else if (!awaitingStepIds.length) {
+        _izContext.logger.debug("dynamoDb storageResourceTag")
+        let messageObject = {
+          firstObject: firstObject,
+          secondObject: secondObject,
+          relType: relType,
+          relationshipDirection,
+          relationshipProperties
+        };
+
+        if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
+          _izContext.logger.debug("have callingFlow");
+          messageObject = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, messageObject);
+
+          let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
+          let sendMessageToOutCreateRelComplete = {
+            Message: JSON.stringify(messageObject),
+            MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
           }
-        )
-      }
-    }
+          _izContext.logger.debug("send Message to outCreateRelationshipComplete :::", sendMessageToOutCreateRelComplete);
+          await sns.publishAsync(_izContext, sendMessageToOutCreateRelComplete);
+        }
 
-    if (awaitingStepIds.length) {
-      // save awaiting
-      await asyncFlowSharedLib.createAwaitingMultipleSteps(
-        _izContext,
-        awaitingStepIds, // awaitingStepIds
-        asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({ linkTypeId, relId, relationshipProperties, correlationId: _izContext.correlationIds.get("id") }), // hash id
-          PREFIX.updateRel // prefix, use constant further
-        )
-      );
+      }
 
-      // prepare message body
-      let updateRelMessageBody = {
+      return {
         firstObject,
         secondObject,
-        relId,
-        relType: relType,
-        relationshipProperties,
-        relationshipDirection
-        //(<inUpdateRelMessageBodyUpdateRel>)
-        //(</inUpdateRelMessageBodyUpdateRel>)
-      }
-      _izContext.logger.debug('updateRelMessageBody: ', updateRelMessageBody);
-
-      await Promise.all(
-        targetGraphStorageResources.map(async (storageResource) => {
-          if (storageResource.storageType === consts.STORAGE_TYPES.graph) {
-
-            updateRelMessageBody = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-              updateRelMessageBody,
-              callingFlowSharedLib.addParentCallingFlowConfig(
-                callingFlowConfig, // receive parent callingFlowConfig.
-                callingFlowSharedLib.createCallingFlowConfig( // callingFlow own service
-                  //(<callingFlowProperties>)
-                  await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.updateRelComplete),
-                  //(</callingFlowProperties>)
-                  {
-                    graphServiceTag: storageResource.graphServiceTag
-                  }
-                )
-              )
-            );
-            _izContext.logger.debug("messageObject before send message:", updateRelMessageBody)
-
-            let messageToInUpdateRelationship = {
-              Message: JSON.stringify(updateRelMessageBody),
-              TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateRel, storageResource.graphServiceTag),
-            };
-            _izContext.logger.debug("RequestParams before send to sqs messageToInUpdateRelationship ::::::: ", messageToInUpdateRelationship);
-            await sns.publishAsync(_izContext, messageToInUpdateRelationship);
-          }
-        })
-      )
-
-    } else if (!awaitingStepIds.length) {
-      _izContext.logger.debug("dynamoDb storageResourceTag")
-      let messageObject = {
-        firstObject: firstObject,
-        secondObject: secondObject,
+        relId: relId,
         relType: relType,
         relationshipDirection,
-        relationshipProperties
+        errorsFound
       };
-
-      if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
-        _izContext.logger.debug("have callingFlow");
-        messageObject = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, messageObject);
-
-        let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
-        let sendMessageToOutCreateRelComplete = {
-          Message: JSON.stringify(messageObject),
-          MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-          TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
-        }
-        _izContext.logger.debug("send Message to outCreateRelationshipComplete :::", sendMessageToOutCreateRelComplete);
-        await sns.publishAsync(_izContext, sendMessageToOutCreateRelComplete);
-      }
-
     }
-
-    return {
-      firstObject,
-      secondObject,
-      relId: relId,
-      relType: relType,
-      relationshipDirection,
-      errorsFound
-    };
-
   } catch (err) {
     _izContext.logger.error('error updateRelationship: ', err)
     throw (err)

package/src/libs/Consts.js

@@ -161,7 +161,7 @@ const SAVE_FILE_NAME = {
   refObjectRelationship: 'RefObjectRelationships',
   objectSchema: 'ObjectFieldSchema',
   roleNameConfig: 'RoleNameConfig',
-  systemTextSchema: 'SystemTextSchema'
+  systemTextSchema: 'SystemTextSchemas'
 };
 
 const FUNCTION_NAME = {