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

package/package.json

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

package/src/AsyncFlowSharedLib.js

@@ -302,8 +302,8 @@ async function checkAllAwaitingStepsFinished(
   byPendingTableName = "AwaitingMultipleStepByPending"
   // indexName = ''
 ) {
-  let remaining;
-  [remaining, errorsFound] = await this.checkAllAwaitingStepsFinishedWithError(
+
+  let remaining = await checkAllAwaitingStepsFinishedWithError(
     _izContext,
     pendingStepId,
     currentAwaitingStepId,
@@ -315,7 +315,8 @@ async function checkAllAwaitingStepsFinished(
 }
 
 
-module.exports.checkAllAwaitingStepsFinishedWithError = async (
+
+async function checkAllAwaitingStepsFinishedWithError(
   _izContext,
   pendingStepId,
   currentAwaitingStepId = null,
@@ -323,7 +324,7 @@ module.exports.checkAllAwaitingStepsFinishedWithError = async (
   tableName = 'AwaitingMultipleSteps',
   byPendingTableName = "AwaitingMultipleStepByPending"
   // indexName = ''
-) => {
+) {
   _izContext.logger.debug("Lib:checkAllAwaitingStepsFinishedWithError", {
     pendingStepId: pendingStepId,
     currentAwaitingStepId: currentAwaitingStepId,
@@ -381,11 +382,11 @@ module.exports.checkAllAwaitingStepsFinishedWithError = async (
     }
     // if any record found not set to complete then there are steps not yet finished
     if (!listPendingStepIds.Items[idx].complete) {
-      return [false, errorsFound];
+      return false;
     }
   }
 
-  return [true, errorsFound]; // all passed
+  return true; // all passed
 
 
   // // mark currentAwaitingStepId as complete, this is done to protect against race condition in between checking all complete
@@ -513,6 +514,7 @@ async function removeAwaitingMultipleStep(
   _izContext,
   awaitingStepId,
   pendingStepId,
+  errorsFound = [],
   tableName = "AwaitingMultipleSteps",
   byPendingTableName = "AwaitingMultipleStepByPending"
 ) {
@@ -525,11 +527,20 @@ async function removeAwaitingMultipleStep(
 
   let promiseArray = []
 
+
   let keyValues = {
     awaitingStepId: awaitingStepId,
     pendingStepId: pendingStepId
   }
-  _izContext.logger.debug('deleting ... ', keyValues);
+
+  let keyValuesForByPending = {
+    pendingStepId: pendingStepId,
+    awaitingStepId: awaitingStepId
+  }
+  _izContext.logger.debug('deleting ... ', {
+    keyValues,
+    keyValuesForByPending
+  });
 
   _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleSteps ==> awaitingStepId:${keyValues.awaitingStepId}`)
   promiseArray.push(
@@ -538,15 +549,15 @@ async function removeAwaitingMultipleStep(
       await dynamodbSharedLib.tableName(_izContext, tableName),
       keyValues
     ));
-
-  _izContext.logger.debug(`delete item in dynamodb AwaitingMultipleStepByPending ==> awaitingStepId:${keyValues.awaitingStepId}`)
-  promiseArray.push(
-    dynamodbSharedLib.deleteItem(
-      _izContext,
-      await dynamodbSharedLib.tableName(_izContext, byPendingTableName),
-      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),
+        keyValuesForByPending
+      ));
+  }
   await Promise.all(promiseArray);
 
 }
@@ -571,7 +582,7 @@ async function removeAwaitingStepWithCheckUniqueRequestId(
       {
         type: "logical",
         comparison: "equals",
-        lhsAttribute: this.createFieldNameUniqueRequestId(prefix),
+        lhsAttribute: createFieldNameUniqueRequestId(prefix),
         rhsReference: "checkUniqueRequestId"
       },
     ]
@@ -629,7 +640,7 @@ async function checkUniqueRequestProcessing(
     }
 
     // add prefix
-    uniqueRequestIdFieldName = this.createFieldNameUniqueRequestId(
+    uniqueRequestIdFieldName = createFieldNameUniqueRequestId(
       prefix,
       uniqueRequestIdFieldName
     );
@@ -723,7 +734,7 @@ async function checkTimeCacheComplete(
   timeCacheComplete,
   prefix
 ) {
-  let [returnValue, newTimeCacheComplete, uniqueRequestId] = await this.checkAndGetTimeCacheComplete(
+  let [returnValue, newTimeCacheComplete, uniqueRequestId] = await checkAndGetTimeCacheComplete(
     _izContext,
     fullMainTableName,
     keyValues,
@@ -746,9 +757,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,
@@ -945,6 +956,7 @@ module.exports = {
   // AwaitingMultipleSteps functions
   createAwaitingMultipleStepsWithAdditionalAttributes,
   createAwaitingMultipleSteps,
+  checkAllAwaitingStepsFinishedWithError,
   checkAllAwaitingStepsFinished,
   clearAllAwaitingSteps,
   removeAwaitingMultipleStep,