@izara_project/izara-core-generate-service-code 1.0.73 → 1.0.75

package/src/emit/relationship/templates/CreateRelationshipComplete_Main.ejs

@@ -19,7 +19,7 @@ import { objectHash as hash } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 
 import { sns } from '@izara_project/izara-core-library-external-request';
@@ -36,123 +36,122 @@ const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
 
 export default async function createRelationshipComplete(
   _izContext,
-  returnValue,
-  status,
-  errorsFound,
-  graphServiceTag,
+  requestParams,
   passBackProperties = {}
 ) {
   try {
+    const {
+      returnValue,
+      parentFlowId,
+      status,
+      errorsFound,
+      graphServiceTag
+    } = requestParams;
+
     _izContext.logger.debug('Function:createRelationshipComplete', {
       returnValue: returnValue,
+      parentFlowId: parentFlowId,
       status: status,
       errorsFound: errorsFound,
       graphServiceTag: graphServiceTag,
       passBackProperties: passBackProperties
     });
 
-    // start create awaitingStepId
-    const linkTypeId = createLinkTypeId(
-      _izContext,
-      returnValue.requestParams.firstObject.objType,
-      returnValue.requestParams.secondObject.objType,
-      returnValue.requestParams.relType,
-      returnValue.requestParams.relationshipDirection
-    );
-
-    let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      returnValue.parentFlowId, // hash id
+    const awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
+      parentFlowId || returnValue?.parentFlowId, // hash id
       PREFIX.createRel // prefix, use constant further
     );
 
-    let createRelPendingObjects = await dynamodbSharedLib.query(
-      _izContext,
-      await dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
+    const pending =
+      await asyncFlowSharedLib.findPendingStepAwaitingMultipleSteps(
+        _izContext,
+        awaitingStepId
+      );
+    _izContext.logger.debug('[CreateRelationshipComplete] awaiting step', {
+      awaitingStepId,
+      pending
+    });
+
+    if (!pending) {
+      _izContext.logger.warn(
+        `No pending step found for awaitingStepId: ${awaitingStepId}`
+      );
+      return { returnValue, status, errorsFound };
+    }
+
+    const result =
+      await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
+        _izContext,
+        pending.pendingStepId,
+        awaitingStepId,
+        errorsFound
+      );
+    _izContext.logger.debug(
+      '[CreateRelationshipComplete] all awaiting steps result',
       {
-        awaitingStepId: awaitingStepId
+        isComplete: result.isComplete,
+        awaitingStepId,
+        pendingStepId: pending.pendingStepId
       }
     );
-    _izContext.logger.debug(
-      'record of createRelPendingObjects ::',
-      createRelPendingObjects
-    );
 
-    await Promise.all(
-      createRelPendingObjects.Items.map(async ({ pendingStepId }) => {
-        if (
-          await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-            _izContext,
-            pendingStepId, // task waiting
-            awaitingStepId,
-            errorsFound
-          )
-        ) {
-          _izContext.logger.debug('finished all awaitingStep');
-
-          let createCompleteMsg = {
-            firstObject: returnValue.requestParams.firstObject,
-            secondObject: returnValue.requestParams.secondObject,
-            relType: returnValue.requestParams.relType,
-            relationshipProperties:
-              returnValue.requestParams.relationshipProperties,
-            parentFlowId: returnValue.parentFlowId,
-            status: status,
-            errorsFound: errorsFound
-          };
-
-          createCompleteMsg =
-            callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-              passBackProperties,
-              createCompleteMsg
-            );
-          _izContext.logger.debug(
-            'After addCallingFlowToSnsResponseMessageObject',
-            createCompleteMsg
-          );
-
-          let messageAttributes =
-            callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-              passBackProperties,
-              {}
-            );
-          _izContext.logger.debug(
-            'After addCallingFlowToSnsResponseMessageAttributes',
-            createCompleteMsg
-          );
-
-          let sendMessageToOutCreateRelationshipComplete = {
-            Message: JSON.stringify(createCompleteMsg),
-            MessageAttributes: sns.createStringMessageAttributes(
-              _izContext,
-              messageAttributes
-            ),
-            TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-              _izContext,
-              TOPIC_NAME_GENERATE_CODE.outCreateRelComplete
-            )
-          };
-          _izContext.logger.debug(
-            'Send message to OutCreateRelationshipComplete :::>',
-            sendMessageToOutCreateRelationshipComplete
-          );
-          await sns.publishAsync(
-            _izContext,
-            sendMessageToOutCreateRelationshipComplete
-          );
-
-          //(<afterCheckAwaitingStep>)
-          //(</afterCheckAwaitingStep>)
-        } // check pendingStepId finished
-
-        // remove awaitingMultipleStep after finished
-        await asyncFlowSharedLib.removeAwaitingMultipleStep(
-          _izContext,
-          awaitingStepId,
-          pendingStepId,
-          errorsFound
+    if (result.isComplete) {
+      _izContext.logger.debug('finished all awaitingStep');
+
+      let createCompleteMsg = {
+        firstObject: returnValue.requestParams.firstObject,
+        secondObject: returnValue.requestParams.secondObject,
+        relType: returnValue.requestParams.relType,
+        relationshipProperties:
+          returnValue.requestParams.relationshipProperties,
+        parentFlowId: parentFlowId || returnValue?.parentFlowId,
+        status: status,
+        errorsFound: errorsFound
+      };
+
+      createCompleteMsg =
+        callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
+          passBackProperties,
+          createCompleteMsg
         );
-      }) // end per pendingStep
-    );
+      _izContext.logger.debug(
+        'After addCallingFlowToSnsResponseMessageObject',
+        createCompleteMsg
+      );
+
+      let messageAttributes =
+        callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
+          passBackProperties,
+          {}
+        );
+      _izContext.logger.debug(
+        'After addCallingFlowToSnsResponseMessageAttributes',
+        createCompleteMsg
+      );
+
+      let sendMessageToOutCreateRelationshipComplete = {
+        Message: JSON.stringify(createCompleteMsg),
+        MessageAttributes: sns.createStringMessageAttributes(
+          _izContext,
+          messageAttributes
+        ),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outCreateRelComplete
+        )
+      };
+      _izContext.logger.debug(
+        'Send message to OutCreateRelationshipComplete :::>',
+        sendMessageToOutCreateRelationshipComplete
+      );
+      await sns.publishAsync(
+        _izContext,
+        sendMessageToOutCreateRelationshipComplete
+      );
+
+      //(<afterCheckAwaitingStep>)
+      //(</afterCheckAwaitingStep>)
+    } // check isComplete finished
 
     //(<afterCheckAllAwaitingStep>)
     //(</afterCheckAllAwaitingStep>)

package/src/emit/relationship/templates/CreateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function createRelationship(
       relationshipDirection,
       relationshipProperties,
       deepPathConditional,
-      settings
+      settings = {}
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)
     } = requestParams;
@@ -376,15 +376,6 @@ export default async function createRelationship(
       return createRelCompleteMsg;
     }
 
-    // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(
-      _izContext,
-      firstObject.objType,
-      secondObject.objType,
-      relType,
-      relationshipDirection
-    );
-
     let usedGraphServiceTag = []; // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
     let awaitingStepIds = [];
@@ -398,12 +389,12 @@ export default async function createRelationship(
         targetGraphStorageResources.push(targetStorageResource);
 
         // awaitingStepId per graphServiceTag
-        awaitingStepIds.push(
-          asyncFlowSharedLib.createAwaitingStepId(
+        awaitingStepIds.push({
+          awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
             parentFlowId, // hash id
             PREFIX.createRel // prefix, use constant further
           )
-        );
+        });
       }
 
       // if have storageResource.storageType === "dynamoDB" will create relationship here
@@ -453,12 +444,12 @@ export default async function createRelationship(
       // save awaiting
       await asyncFlowSharedLib.createAwaitingMultipleSteps(
         _izContext,
-        awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId(
-          // pendingStepId
           _izContext.uniqueRequestId, // hash id
           PREFIX.createRel // prefix, use constant further
-        )
+        ),
+        awaitingStepIds,
+        {}
       );
 
       // prepare message body

package/src/emit/relationship/templates/DeleteRelationshipComplete_HdrSqs.ejs

@@ -0,0 +1,99 @@
+import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
+import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import DeleteRelationshipComplete from './DeleteRelationshipComplete_Main.js';
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+// validate event properties in body.Message of sqs event
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {
+    returnValue: {
+      type: 'object'
+    },
+    parentFlowId: {
+      type: 'string'
+    },
+    status: {
+      type: 'string'
+    },
+    errorsFound: {
+      type: 'array'
+    },
+    graphServiceTag: {
+      type: 'string'
+    }
+  },
+  required: [
+    'returnValue',
+    'parentFlowId',
+    'status',
+    'errorsFound',
+    'graphServiceTag'
+  ]
+  //(<validatorSchema>)
+  //(</validatorSchema>)
+};
+
+let messageAttributeValidatorSchema = null;
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+export const main = middleware.wrap(async (event, context) => {
+  try {
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(
+      event.Records.map(async (record) => {
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        //validate message (and MessageAttributes)
+        await recordHandlerSharedLib.validateRecord(
+          record, // one record will send to mainFunction
+          'DeleteRelationshipCompleteHdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema, // schema for record.Message
+          messageAttributeValidatorSchema
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
+          callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(
+            record.body.Message
+          )
+        );
+        //(<additionalParams>)
+        //(</additionalParams>)
+        record._izContext.logger.debug(
+          'passOnProperties in handler',
+          passOnProperties
+        );
+
+        // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+        let recordPromise = recordHandlerSharedLib.recordHandler(
+          record, // one record will send to mainFunction
+          DeleteRelationshipComplete, // mainFunction that need to invoke.
+          'DeleteRelationshipCompleteHdrSqs', // queue name that need to retry or send to dlq
+          passOnProperties // all parameters that mainFunction needed.
+        );
+        record._izContext.logger.debug('after recordPromise in handler');
+        recordPromises.push(recordPromise); // push promise to recordPromises
+      })
+    );
+    try {
+      await Promise.all(recordPromises);
+      return event.Records;
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
+      );
+    }
+  } catch (error) {
+    Logger.error('Unhandled Error, DeleteRelationshipComplete_HdrSqs: ', error);
+    throw error;
+  }
+});

package/src/emit/relationship/templates/DeleteRelationshipComplete_Main.ejs

@@ -19,7 +19,7 @@ import { objectHash as hash } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 
 import { sns } from '@izara_project/izara-core-library-external-request';
@@ -36,109 +36,117 @@ const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
 
 export default async function deleteRelationshipComplete(
   _izContext,
-  returnValue,
-  status,
-  errorsFound,
-  graphServiceTag,
+  requestParams,
   passBackProperties = {}
 ) {
   try {
+    const {
+      returnValue,
+      parentFlowId,
+      status,
+      errorsFound,
+      graphServiceTag
+    } = requestParams;
+
     _izContext.logger.debug('Function:deleteRelationshipComplete', {
       returnValue: returnValue,
+      parentFlowId: parentFlowId,
       status: status,
       errorsFound: errorsFound,
       graphServiceTag: graphServiceTag,
       passBackProperties: passBackProperties
     });
 
-    let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      returnValue.parentFlowId, // hash id
+    const awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
+      parentFlowId || returnValue?.parentFlowId, // hash id
       PREFIX.deleteRel // prefix, use constant further
     );
 
-    let deleteRelPendingObjects = await dynamodbSharedLib.query(
-      _izContext,
-      await dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
+    const pending =
+      await asyncFlowSharedLib.findPendingStepAwaitingMultipleSteps(
+        _izContext,
+        awaitingStepId
+      );
+    _izContext.logger.debug('[DeleteRelationshipComplete] awaiting step', {
+      awaitingStepId,
+      pending
+    });
+
+    if (!pending) {
+      _izContext.logger.warn(
+        `No pending step found for awaitingStepId: ${awaitingStepId}`
+      );
+      return { returnValue, status, errorsFound };
+    }
+
+    const result =
+      await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
+        _izContext,
+        pending.pendingStepId,
+        awaitingStepId,
+        errorsFound
+      );
+    _izContext.logger.debug(
+      '[DeleteRelationshipComplete] all awaiting steps result',
       {
-        awaitingStepId: awaitingStepId
+        isComplete: result.isComplete,
+        awaitingStepId,
+        pendingStepId: pending.pendingStepId
       }
     );
-    _izContext.logger.debug(
-      'record of deleteRelPendingObjects ::',
-      deleteRelPendingObjects
-    );
 
-    await Promise.all(
-      deleteRelPendingObjects.Items.map(async ({ pendingStepId }) => {
-        if (
-          await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-            _izContext,
-            pendingStepId, // task waiting
-            awaitingStepId,
-            errorsFound
-          )
-        ) {
-          _izContext.logger.debug('finished all awaitingStep');
-
-          let deleteRelComp = {
-            firstObject: returnValue.requestParams.firstObject,
-            secondObject: returnValue.requestParams.secondObject,
-            relType: returnValue.requestParams.relType,
-            parentFlowId: returnValue.parentFlowId,
-            status: status,
-            errorsFound: errorsFound
-          };
-
-          deleteRelComp =
-            callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-              passBackProperties,
-              deleteRelComp
-            );
-          _izContext.logger.debug(
-            'After addCallingFlowToSnsResponseMessageObject',
-            deleteRelComp
-          );
-
-          let messageAttributes =
-            callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-              passBackProperties,
-              {}
-            );
-          _izContext.logger.debug(
-            'After addCallingFlowToSnsResponseMessageAttributes',
-            deleteRelComp
-          );
-
-          let sendMessageToOutDeleteRelationshipComplete = {
-            Message: JSON.stringify(deleteRelComp),
-            MessageAttributes: sns.createStringMessageAttributes(
-              _izContext,
-              messageAttributes
-            ),
-            TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-              _izContext,
-              TOPIC_NAME_GENERATE_CODE.outDeleteRelComplete
-            )
-          };
-          _izContext.logger.debug(
-            'Send message to OutDeleteRelationshipComplete :::>',
-            sendMessageToOutDeleteRelationshipComplete
-          );
-          await sns.publishAsync(
-            _izContext,
-            sendMessageToOutDeleteRelationshipComplete
-          );
-        } // check pendingStepId finished
-
-        // remove awaitingMultipleStep after finished
-        await asyncFlowSharedLib.removeAwaitingMultipleStep(
-          _izContext,
-          awaitingStepId,
-          pendingStepId,
-          errorsFound
+    if (result.isComplete) {
+      _izContext.logger.debug('finished all awaitingStep');
+
+      let deleteRelComp = {
+        firstObject: returnValue.requestParams.firstObject,
+        secondObject: returnValue.requestParams.secondObject,
+        relType: returnValue.requestParams.relType,
+        parentFlowId: parentFlowId || returnValue?.parentFlowId,
+        status: status,
+        errorsFound: errorsFound
+      };
+
+      deleteRelComp =
+        callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
+          passBackProperties,
+          deleteRelComp
         );
-      }) // end per pendingStep
-    );
+      _izContext.logger.debug(
+        'After addCallingFlowToSnsResponseMessageObject',
+        deleteRelComp
+      );
+
+      let messageAttributes =
+        callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
+          passBackProperties,
+          {}
+        );
+      _izContext.logger.debug(
+        'After addCallingFlowToSnsResponseMessageAttributes',
+        deleteRelComp
+      );
+
+      let sendMessageToOutDeleteRelationshipComplete = {
+        Message: JSON.stringify(deleteRelComp),
+        MessageAttributes: sns.createStringMessageAttributes(
+          _izContext,
+          messageAttributes
+        ),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outDeleteRelComplete
+        )
+      };
+      _izContext.logger.debug(
+        'Send message to OutDeleteRelationshipComplete :::>',
+        sendMessageToOutDeleteRelationshipComplete
+      );
+      await sns.publishAsync(
+        _izContext,
+        sendMessageToOutDeleteRelationshipComplete
+      );
+    } // check isComplete finished
 
     return {
       returnValue,

package/src/emit/relationship/templates/DeleteRelationship_Main.ejs

@@ -262,24 +262,6 @@ export default async function deleteRelationship(
       return deleteRelCompleteMsg;
     }
 
-    // before create awaitingStepId per graph storageResource
-    let linkTypeId;
-    if (
-      secondObject &&
-      secondObject.hasOwnProperty('objType') &&
-      Object.values(secondObject.objType).length > 0
-    ) {
-      linkTypeId = createLinkTypeId(
-        _izContext,
-        firstObject.objType,
-        secondObject.objType,
-        relType,
-        relationshipDirection
-      );
-    } else {
-      linkTypeId = hash({ objType: firstObject.objType, relType: relType });
-    }
-
     let usedGraphServiceTag = []; // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
     let awaitingStepIds = [];
@@ -293,12 +275,12 @@ export default async function deleteRelationship(
         targetGraphStorageResources.push(targetStorageResource);
 
         // awaitingStepId per graphServiceTag
-        awaitingStepIds.push(
-          asyncFlowSharedLib.createAwaitingStepId(
+        awaitingStepIds.push({
+          awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
             parentFlowId, // hash id
             PREFIX.deleteRel // prefix, use constant further
           )
-        );
+        });
       } else if (
         targetStorageResource.storageType === consts.STORAGE_TYPES.dynamoDB
       ) {
@@ -345,12 +327,12 @@ export default async function deleteRelationship(
       // save awaiting
       await asyncFlowSharedLib.createAwaitingMultipleSteps(
         _izContext,
-        awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId(
-          // pendingStepId
           _izContext.uniqueRequestId, // hash id
           PREFIX.deleteRel // prefix, use constant further
-        )
+        ),
+        awaitingStepIds,
+        {}
       );
 
       // prepare message body