@izara_project/izara-core-library-asynchronous-flow 1.0.10 → 1.0.12

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.10",
+  "version": "1.0.12",
   "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("ssss", {
+    awaitingStepId,
+    pendingStepId,
+    additionalAttributes,
+    callingFlowConfig
+  });
 
   let attributesWhenCreate = {
     awaitingStepId: awaitingStepId,
@@ -217,12 +215,16 @@ 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 })
+  };
 
+  console.log("000");
   await dynamodbSharedLib.putItem(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     attributesWhenCreate
   );
 }
@@ -232,15 +234,14 @@ async function createAwaitingStep(
 
 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,13 +256,12 @@ 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
     }
@@ -271,35 +271,58 @@ async function findPendingStepsAwaitingStep(
 }
 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,
+) {
+  _izContext.logger.debug("findPendingStepAwaitingStepWithCallingFlow:::", awaitingStepId)
 
+  let callingFlowConfig = null;
+  let awaitingStep = await findPendingStepAwaitingStep(
+    _izContext,
+    awaitingStepId
+  );
+  _izContext.logger.debug("awaitingStep:::", awaitingStep)
+  // 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"
+  // tableName = 'AwaitingMultipleSteps',
+  // byPendingTableName = "AwaitingMultipleStepByPending"
   // indexName = ''
 ) {
 
@@ -307,9 +330,7 @@ async function checkAllAwaitingStepsFinished(
     _izContext,
     pendingStepId,
     currentAwaitingStepId,
-    errorsFound,
-    tableName,
-    byPendingTableName
+    errorsFound
   );
   return remaining;
 }
@@ -320,16 +341,11 @@ 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
+    currentAwaitingStepId: currentAwaitingStepId
   });
 
   if (currentAwaitingStepId) {
@@ -350,7 +366,7 @@ async function checkAllAwaitingStepsFinishedWithError(
     _izContext.logger.debug(`---- update ${byPendingTableName} table ----`);
     await dynamodbSharedLib.updateItem(
       _izContext,
-      await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+      await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
       {
         pendingStepId: pendingStepId,
         awaitingStepId: currentAwaitingStepId
@@ -364,7 +380,7 @@ async function checkAllAwaitingStepsFinishedWithError(
   }
   let listPendingStepIds = await dynamodbSharedLib.query(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
     {
       pendingStepId: pendingStepId
     },
@@ -437,29 +453,24 @@ async function checkAllAwaitingStepsFinishedWithError(
 
 async function clearAllAwaitingSteps(
   _izContext,
-  pendingStepId,
-  tableName = 'AwaitingMultipleSteps',
-  byPendingTableName = "AwaitingMultipleStepByPending"
+  pendingStepId
 ) {
   _izContext.logger.debug("Lib:clearAllAwaitingSteps", {
-    pendingStepId: pendingStepId,
-    tableName: tableName,
-    byPendingTableName: byPendingTableName
+    pendingStepId: pendingStepId
   })
 
-  tableName = await dynamodbSharedLib.tableName(_izContext, tableName)
+  tableName = await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps")
 
   // ----- 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++) {
@@ -474,14 +485,14 @@ async function clearAllAwaitingSteps(
     promiseArray.push(
       dynamodbSharedLib.deleteItem(
         _izContext,
-        tableName,
+        "AwaitingMultipleSteps",
         keyValues
       ));
     _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"),
         keyValues
       ));
 
@@ -496,13 +507,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 +524,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,7 +552,7 @@ async function removeAwaitingMultipleStep(
   promiseArray.push(
     dynamodbSharedLib.deleteItem(
       _izContext,
-      await dynamodbSharedLib.tableName(_izContext, tableName),
+      await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
       keyValues
     ));
   if (errorsFound.length == 0) {
@@ -554,7 +560,7 @@ async function removeAwaitingMultipleStep(
     promiseArray.push(
       dynamodbSharedLib.deleteItem(
         _izContext,
-        await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
+        await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
         keyValuesForByPending
       ));
   }
@@ -568,8 +574,7 @@ async function removeAwaitingStepWithCheckUniqueRequestId(
   awaitingStepId,
   pendingStepId,
   checkUniqueRequestId,
-  prefix = "",
-  tableName = "AwaitingStep"
+  prefix = ""
 ) {
 
   // if logicalElements add queryElements.logicalElements
@@ -582,7 +587,7 @@ async function removeAwaitingStepWithCheckUniqueRequestId(
       {
         type: "logical",
         comparison: "equals",
-        lhsAttribute: this.createFieldNameUniqueRequestId(prefix),
+        lhsAttribute: createFieldNameUniqueRequestId(prefix),
         rhsReference: "checkUniqueRequestId"
       },
     ]
@@ -590,7 +595,7 @@ async function removeAwaitingStepWithCheckUniqueRequestId(
 
   await dynamodbSharedLib.deleteItem(
     _izContext,
-    await dynamodbSharedLib.tableName(_izContext, tableName),
+    await dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     {
       awaitingStepId: awaitingStepId,
       pendingStepId: pendingStepId
@@ -640,7 +645,7 @@ async function checkUniqueRequestProcessing(
     }
 
     // add prefix
-    uniqueRequestIdFieldName = this.createFieldNameUniqueRequestId(
+    uniqueRequestIdFieldName = createFieldNameUniqueRequestId(
       prefix,
       uniqueRequestIdFieldName
     );
@@ -734,7 +739,7 @@ async function checkTimeCacheComplete(
   timeCacheComplete,
   prefix
 ) {
-  let [returnValue, newTimeCacheComplete, uniqueRequestId] = await this.checkAndGetTimeCacheComplete(
+  let [returnValue, newTimeCacheComplete, uniqueRequestId] = await checkAndGetTimeCacheComplete(
     _izContext,
     fullMainTableName,
     keyValues,
@@ -757,9 +762,9 @@ async function checkAndGetTimeCacheComplete(
     prefix: prefix
   });
 
-  let uniqueRequestIdFieldName = this.createFieldNameUniqueRequestId('cache');
-  let cacheCompleteFieldName = this.createFieldNameCacheComplete(prefix);
-  let statusFieldName = this.createFieldNameStatus(prefix);
+  let uniqueRequestIdFieldName = createFieldNameUniqueRequestId('cache');
+  let cacheCompleteFieldName = createFieldNameCacheComplete(prefix);
+  let statusFieldName = createFieldNameStatus(prefix);
 
   let getTimeCacheComplete = await dynamodbSharedLib.getItem(
     _izContext,
@@ -966,6 +971,7 @@ module.exports = {
   findPendingStepIdsAwaitingStep,
   findPendingStepAwaitingStep,
   findPendingStepsAwaitingStep,
+  findPendingStepAwaitingStepWithCallingFlow,
   removeAwaitingStep,
   removeAwaitingStepWithCheckUniqueRequestId,