@izara_project/izara-core-library-asynchronous-flow 1.0.27 → 1.0.28

package/package.json

@@ -3,7 +3,7 @@
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",
   "homepage": "https://bitbucket.org/izara-core-libraries/izara-core-library-asynchronous-flow#readme",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Shared asynchronous flow logic",
   "type": "module",
   "main": "index.js",

package/src/awaitingMultipleSteps.js

@@ -348,42 +348,27 @@ export async function checkAllAwaitingStepsFinished(
   errorsFound = [],
   additionalAttributes = {}
 ) {
-
   await checkAllAwaitingStepsFinishedShared(
     _izContext,
     pendingStepId,
-    currentAwaitingStepId = null,
-    errorsFound = [],
-    additionalAttributes = {}
+    currentAwaitingStepId,
+    errorsFound,
+    additionalAttributes
   );
 
-  let listPendingStepIds = await dynamodbSharedLib.query(
+  const items = await dynamodbSharedLib.query(
     _izContext,
     dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
-    {
-      pendingStepId: pendingStepId
-    },
-    {
-      limit: 50 // arbitrary limit so not pull too many results, need >2 because some others might be marked as "complete" = true
-    }
+    { pendingStepId },
+    { limit: 50 }
   );
-  for (let idx = 0; idx < listPendingStepIds.Items.length; idx++) {
-    // if have error found return errorsFound
-    // wrap function
-
-    if (
-      currentAwaitingStepId &&
-      listPendingStepIds.Items[idx].awaitingStepId == currentAwaitingStepId
-    ) {
-      continue;
-    }
-    // if any record found not set to complete then there are steps not yet finished
-    if (!listPendingStepIds.Items[idx].complete) {
-      return false;
-    }
+
+  for (const item of items.Items) {
+    if (item.awaitingStepId === currentAwaitingStepId) continue;
+    if (!item.complete) return false;
   }
 
-  return true; // all passed
+  return true;
 }
 
 
@@ -406,22 +391,26 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   errorsFound = [],
   additionalAttributes = {}
 ) {
+  _izContext.logger.debug('Lib:checkAllAwaitingStepsFinishedWithReturnParams', {
+    pendingStepId,
+    currentAwaitingStepId,
+    errorsFound,
+    additionalAttributes
+  });
 
   await checkAllAwaitingStepsFinishedShared(
     _izContext,
     pendingStepId,
-    currentAwaitingStepId = null,
-    errorsFound = [],
-    additionalAttributes = {}
+    currentAwaitingStepId,
+    errorsFound,
+    additionalAttributes
   );
 
   const awaitingStepItems = await dynamodbSharedLib.query(
     _izContext,
     dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
     { pendingStepId },
-    {
-      limit: 50
-    }
+    { limit: 50 }
   );
 
   _izContext.logger.debug('awaitingStepItems:::', awaitingStepItems);
@@ -431,7 +420,7 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
 
   for (const item of awaitingStepItems.Items) {
     if (item.awaitingStepId !== currentAwaitingStepId && !item.complete) {
-      return [false, null, []];
+      return [false, null, collectedErrors];
     }
 
     if (item.errorsFound?.length > 0) {