@izara_project/izara-core-library-asynchronous-flow 1.0.11 → 1.0.13

package/index.js

@@ -39,7 +39,7 @@ module.exports = {
   findPendingStepIdsAwaitingStep: asyncFlowSharedLib.findPendingStepIdsAwaitingStep,
   findPendingStepsAwaitingStep: asyncFlowSharedLib.findPendingStepsAwaitingStep,
   findPendingStepAwaitingStep: asyncFlowSharedLib.findPendingStepAwaitingStep,
-
+  findPendingStepAwaitingStepWithCallingFlow: asyncFlowSharedLib.findPendingStepAwaitingStepWithCallingFlow,
   // Checking and clearing steps
   checkAllAwaitingStepsFinished: asyncFlowSharedLib.checkAllAwaitingStepsFinished,
   clearAllAwaitingSteps: asyncFlowSharedLib.clearAllAwaitingSteps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-asynchronous-flow",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Shared asynchronous flow logic",
   "main": "index.js",
   "scripts": {

package/src/AsyncFlowSharedLib.js

@@ -101,15 +101,11 @@ function createFieldNameStatus(prefix = 'cache') {
 async function createAwaitingMultipleStepsWithAdditionalAttributes(
   _izContext,
   records, // array of object including properties: awaitingStepId / (optional) additionalAttributes
-  pendingStepId,
-  tableName = "AwaitingMultipleSteps",
-  byPendingTableName = "AwaitingMultipleStepByPending"
+  pendingStepId
 ) {
   _izContext.logger.debug("Lib:createAwaitingMultipleStepsWithAdditionalAttributes", {
     records: records,
-    pendingStepId: pendingStepId,
-    tableName: tableName,
-    byPendingTableName: byPendingTableName
+    pendingStepId: pendingStepId
   });
   let promiseArray = []
 
@@ -125,14 +121,14 @@ async function createAwaitingMultipleStepsWithAdditionalAttributes(
     promiseArray.push(
       dynamodbSharedLib.putItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, tableName),
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
         attributesWhenCreate
       )
     );
     promiseArray.push(
       dynamodbSharedLib.putItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
         {
           pendingStepId: pendingStepId,
           awaitingStepId: record.awaitingStepId,
@@ -149,15 +145,11 @@ async function createAwaitingMultipleStepsWithAdditionalAttributes(
 async function createAwaitingMultipleSteps(
   _izContext,
   records, // array of awaitingStepIds
-  pendingStepId,
-  tableName = "AwaitingMultipleSteps",
-  byPendingTableName = "AwaitingMultipleStepByPending"
+  pendingStepId
 ) {
   _izContext.logger.debug("Lib:createAwaitingMultipleSteps", {
     records: records,
-    pendingStepId: pendingStepId,
-    tableName: tableName,
-    byPendingTableName: byPendingTableName
+    pendingStepId: pendingStepId
   });
 
   // // 0001 ORG.
@@ -174,7 +166,7 @@ async function createAwaitingMultipleSteps(
     promiseArray.push(
       dynamodbSharedLib.putItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, tableName),
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
         attributesWhenCreate
       )
     );
@@ -184,7 +176,7 @@ async function createAwaitingMultipleSteps(
     promiseArray.push(
       dynamodbSharedLib.putItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
         attributesWhenCreate
       )
     );
@@ -205,9 +197,15 @@ async function createAwaitingStep(
   _izContext,
   awaitingStepId,
   pendingStepId,
-  tableName = "AwaitingStep",
-  additionalAttributes = {} // save in top level
+  additionalAttributes = {}, // save in top level
+  callingFlowConfig = {} // optional
 ) {
+  console.log("Lib createAwaitingStep:", {
+    awaitingStepId,
+    pendingStepId,
+    additionalAttributes,
+    callingFlowConfig
+  });
 
   let attributesWhenCreate = {
     awaitingStepId: awaitingStepId,
@@ -217,30 +215,30 @@ async function createAwaitingStep(
   }
   // loop if not empty
   for (let additionalAttribute in additionalAttributes) {
-    attributesWhenCreate[additionalAttribute] = additionalAttributes[additionalAttribute]
+    attributesWhenCreate[additionalAttribute] = additionalAttributes[additionalAttribute] // each  additionalAttributes
   }
+  if (Object.keys(callingFlowConfig).length > 0) {
+    Object.assign(attributesWhenCreate, { callingFlowConfig })
+  };
 
   await dynamodbSharedLib.putItem(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     attributesWhenCreate
   );
 }
 
 
-
-
 async function findPendingStepIdsAwaitingStep(
   _izContext,
-  awaitingStepId,
-  tableName = "AwaitingStep"
+  awaitingStepId
 ) {
 
   let pendingStepIds = [];
 
   let listPendingStepIds = await dynamodbSharedLib.query(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     {
       awaitingStepId: awaitingStepId
     }
@@ -255,61 +253,75 @@ async function findPendingStepIdsAwaitingStep(
 
 async function findPendingStepsAwaitingStep(
   _izContext,
-  awaitingStepId,
-  tableName = "AwaitingStep"
+  awaitingStepId
 ) {
 
   let listPendingSteps = await dynamodbSharedLib.query(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     {
       awaitingStepId: awaitingStepId
     }
   );
-  _izContext.logger.debug("Record of awaitingStepId", listPendingSteps)
+  _izContext.logger.debug("Record of awaitingStepId", listPendingSteps);
   return listPendingSteps.Items;
 }
+
 async function findPendingStepAwaitingStep(
   _izContext,
-  awaitingStepId,
-  tableName = "AwaitingStep"
+  awaitingStepId
 ) {
 
   let listPendingSteps = await dynamodbSharedLib.query(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     {
       awaitingStepId: awaitingStepId
     }
   );
   _izContext.logger.debug("Record of awaitingStepId", listPendingSteps)
 
-  if (listPendingSteps.length !== 1) {
+  if (listPendingSteps.Items.length !== 1) {
     throw new NoRetryError("listPendingSteps not equals 1")
-  }
-
+  };
   return listPendingSteps.Items[0];
 }
 
+//  for get callingFlow save in awaitingStpe and remove property callingFlow in awaitingStpe
+async function findPendingStepAwaitingStepWithCallingFlow(
+  _izContext,
+  awaitingStepId,
+) {
 
+  let callingFlowConfig = null;
+  let awaitingStep = await findPendingStepAwaitingStep(
+    _izContext,
+    awaitingStepId
+  );
+
+  // callingFlowConfig.
+  // cleaning object awaitingStep not have callingFlowComfig after return.
+  if (awaitingStep.hasOwnProperty("callingFlowConfig")) {
+    callingFlowConfig = awaitingStep.callingFlowConfig
+    delete awaitingStep.callingFlowConfig
+    console.log("after delete awaitingStep", awaitingStep);
+  };
+
+  return [awaitingStep, callingFlowConfig]
+}
 
 async function checkAllAwaitingStepsFinished(
   _izContext,
   pendingStepId,
   currentAwaitingStepId = null,
-  errorsFound = [],
-  tableName = 'AwaitingMultipleSteps',
-  byPendingTableName = "AwaitingMultipleStepByPending"
-  // indexName = ''
+  errorsFound = []
 ) {
 
   let remaining = await checkAllAwaitingStepsFinishedWithError(
     _izContext,
     pendingStepId,
     currentAwaitingStepId,
-    errorsFound,
-    tableName,
-    byPendingTableName
+    errorsFound
   );
   return remaining;
 }
@@ -320,37 +332,18 @@ async function checkAllAwaitingStepsFinishedWithError(
   _izContext,
   pendingStepId,
   currentAwaitingStepId = null,
-  errorsFound = [],
-  tableName = 'AwaitingMultipleSteps',
-  byPendingTableName = "AwaitingMultipleStepByPending"
-  // indexName = ''
+  errorsFound = []
 ) {
   _izContext.logger.debug("Lib:checkAllAwaitingStepsFinishedWithError", {
     pendingStepId: pendingStepId,
     currentAwaitingStepId: currentAwaitingStepId,
-    tableName: tableName,
-    byPendingTableName: byPendingTableName
+    errorsFound: errorsFound
   });
 
   if (currentAwaitingStepId) {
-
-    //* not need to save complete in AwaitingMultipleSteps Table but save in AwaitingMultipleStepByPending
-    // await dynamodbSharedLib.updateItem(
-    //   _izContext,
-    //   dynamodbSharedLib.tableName(tableName),
-    //   {
-    //     awaitingStepId: currentAwaitingStepId,
-    //     pendingStepId: pendingStepId
-    //   },
-    //   {
-    //     complete: true
-    //   },
-    // )
-
-    _izContext.logger.debug(`---- update ${byPendingTableName} table ----`);
     await dynamodbSharedLib.updateItem(
       _izContext,
-      await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+      await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
       {
         pendingStepId: pendingStepId,
         awaitingStepId: currentAwaitingStepId
@@ -364,7 +357,7 @@ async function checkAllAwaitingStepsFinishedWithError(
   }
   let listPendingStepIds = await dynamodbSharedLib.query(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
     {
       pendingStepId: pendingStepId
     },
@@ -437,52 +430,42 @@ async function checkAllAwaitingStepsFinishedWithError(
 
 async function clearAllAwaitingSteps(
   _izContext,
-  pendingStepId,
-  tableName = 'AwaitingMultipleSteps',
-  byPendingTableName = "AwaitingMultipleStepByPending"
+  pendingStepId
 ) {
-  _izContext.logger.debug("Lib:clearAllAwaitingSteps", {
-    pendingStepId: pendingStepId,
-    tableName: tableName,
-    byPendingTableName: byPendingTableName
-  })
-
-  tableName = await dynamodbSharedLib.tableName(_izContext, tableName)
-
   // ----- query items from GSI table
   let listPendingStepIds = await dynamodbSharedLib.query(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
     {
       pendingStepId: pendingStepId
     },
   );
   _izContext.logger.debug('listPendingStepIds', listPendingStepIds);
 
-
   let promiseArray = []
 
   for (let idx = 0; idx < listPendingStepIds.Items.length; idx++) {
 
-    let keyValues = {
-      awaitingStepId: listPendingStepIds.Items[idx].awaitingStepId,
-      pendingStepId: listPendingStepIds.Items[idx].pendingStepId
-    }
-    _izContext.logger.debug('deleting ... ', keyValues);
-
-    _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleSteps ==> awaitingStepId:${keyValues.awaitingStepId}`)
+    _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleSteps`)
     promiseArray.push(
       dynamodbSharedLib.deleteItem(
         _izContext,
-        tableName,
-        keyValues
+        "AwaitingMultipleSteps",
+        {
+          awaitingStepId: listPendingStepIds.Items[idx].awaitingStepId,
+          pendingStepId: listPendingStepIds.Items[idx].pendingStepId
+        }
       ));
-    _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleStepByPending ==> awaitingStepId:${keyValues.awaitingStepId}`)
+
+    _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleStepByPending`)
     promiseArray.push(
       dynamodbSharedLib.deleteItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
-        keyValues
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
+        {
+          pendingStepId: listPendingStepIds.Items[idx].pendingStepId,
+          awaitingStepId: listPendingStepIds.Items[idx].awaitingStepId
+        }
       ));
 
   }
@@ -496,13 +479,12 @@ async function clearAllAwaitingSteps(
 async function removeAwaitingStep(
   _izContext,
   awaitingStepId,
-  pendingStepId,
-  tableName = "AwaitingStep"
+  pendingStepId
 ) {
 
   await dynamodbSharedLib.deleteItem(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     {
       awaitingStepId: awaitingStepId,
       pendingStepId: pendingStepId
@@ -514,15 +496,11 @@ async function removeAwaitingMultipleStep(
   _izContext,
   awaitingStepId,
   pendingStepId,
-  errorsFound = [],
-  tableName = "AwaitingMultipleSteps",
-  byPendingTableName = "AwaitingMultipleStepByPending"
+  errorsFound = []
 ) {
   _izContext.logger.debug("Lib:removeAwaitingMultipleStep", {
     awaitingStepId: awaitingStepId,
-    pendingStepId: pendingStepId,
-    tableName: tableName,
-    byPendingTableName: byPendingTableName
+    pendingStepId: pendingStepId
   })
 
   let promiseArray = []
@@ -546,15 +524,16 @@ async function removeAwaitingMultipleStep(
   promiseArray.push(
     dynamodbSharedLib.deleteItem(
       _izContext,
-      await dynamodbSharedLib.tableName(_izContext, tableName),
+      await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
       keyValues
     ));
+
   if (errorsFound.length == 0) {
     _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleStepByPending ==> awaitingStepId:${keyValues.awaitingStepId}`)
     promiseArray.push(
       dynamodbSharedLib.deleteItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
         keyValuesForByPending
       ));
   }
@@ -568,8 +547,7 @@ async function removeAwaitingStepWithCheckUniqueRequestId(
   awaitingStepId,
   pendingStepId,
   checkUniqueRequestId,
-  prefix = "",
-  tableName = "AwaitingStep"
+  prefix = ""
 ) {
 
   // if logicalElements add queryElements.logicalElements
@@ -590,7 +568,7 @@ async function removeAwaitingStepWithCheckUniqueRequestId(
 
   await dynamodbSharedLib.deleteItem(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     {
       awaitingStepId: awaitingStepId,
       pendingStepId: pendingStepId
@@ -966,6 +944,7 @@ module.exports = {
   findPendingStepIdsAwaitingStep,
   findPendingStepAwaitingStep,
   findPendingStepsAwaitingStep,
+  findPendingStepAwaitingStepWithCallingFlow,
   removeAwaitingStep,
   removeAwaitingStepWithCheckUniqueRequestId,