@izara_project/izara-core-library-asynchronous-flow 1.0.47 → 1.0.49

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.47",
+  "version": "1.0.49",
   "description": "Shared asynchronous flow logic",
   "type": "module",
   "main": "index.js",
@@ -16,8 +16,8 @@
   },
   "devDependencies": {
     "@izara_project/izara-core-library-core": "^1.0.32",
-    "@izara_project/izara-core-library-dynamodb": "^1.0.21",
-    "@izara_project/izara-core-library-external-request": "^1.0.30",
+    "@izara_project/izara-core-library-dynamodb": "^1.0.22",
+    "@izara_project/izara-core-library-external-request": "^1.0.32",
     "@izara_project/izara-core-library-logger": "^1.0.11",
     "@izara_project/izara-core-library-sns": "^1.0.8",
     "@izara_project/izara-core-library-sqs": "^1.0.7",

package/src/awaitingMultipleSteps.js

@@ -55,7 +55,14 @@ async function _putAwaitingMultipleStepRecords(
         ...sharedAttributes
       };
       if (additionalAttributes) {
-        itemPending.additionalAttributes = additionalAttributes;
+        if (sharedAttributes.additionalAttributes) {
+          itemPending.additionalAttributes = {
+            ...sharedAttributes.additionalAttributes,
+            ...additionalAttributes
+          };
+        } else {
+          itemPending.additionalAttributes = additionalAttributes;
+        }
       }
 
       return [
@@ -168,7 +175,7 @@ export async function createAwaitingMultipleSteps(
 
       return {
         awaitingStepId,
-        additionalAttributes,
+        additionalAttributes: record.additionalAttributes,
         message: {
           ...record.message,
           parentFlowId: awaitingStepId
@@ -194,10 +201,7 @@ export async function createAwaitingMultipleSteps(
       }
 
       return {
-        awaitingStepId: createAwaitingStepId(
-          awaitingStepId,
-          prefix
-        ),
+        awaitingStepId: createAwaitingStepId(awaitingStepId, prefix),
         additionalAttributes: mergedAttributes
       };
     }
@@ -373,6 +377,17 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   _assertPendingStepId(pendingStepId);
 
   if (currentAwaitingStepId) {
+    _izContext.logger.debug(
+      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Updating awaitingStepItem in DB',
+      {
+        pendingStepId,
+        awaitingStepId: currentAwaitingStepId,
+        complete: true,
+        errorsFound,
+        returnValues
+      }
+    );
+
     await dynamodbSharedLib.updateItem(
       _izContext,
       dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
@@ -386,6 +401,16 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
         returnValues
       }
     );
+
+    _izContext.logger.debug(
+      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] After updating awaitingStepItems',
+      {
+        pendingStepId,
+        awaitingStepId: currentAwaitingStepId,
+        errorsFound,
+        returnValues
+      }
+    );
   }
 
   const awaitingStepItems = await _queryAwaitingStepsByPendingStepId(
@@ -394,10 +419,30 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   );
 
   _izContext.logger.debug(
-    '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] awaitingStepItems',
-    { awaitingStepItems }
+    '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Queried awaitingStepItems',
+    {
+      pendingStepId,
+      itemsCount: awaitingStepItems ? awaitingStepItems.length : 0,
+      awaitingStepItems
+    }
   );
 
+  if (!awaitingStepItems || awaitingStepItems.length === 0) {
+    _izContext.logger.warn(
+      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] No awaiting steps found for pendingStepId',
+      { pendingStepId, currentAwaitingStepId }
+    );
+    return {
+      isComplete: false,
+      collectedReturnValueByAwaitingStepId: null,
+      collectedErrors: [
+        `No awaiting steps found for pendingStepId: ${pendingStepId}`
+      ],
+      returnValues: null,
+      additionalAttributes: null
+    };
+  }
+
   const hasIncomplete = awaitingStepItems.some(
     item => item.awaitingStepId !== currentAwaitingStepId && !item.complete
   );
@@ -407,7 +452,64 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
     defaultAttrs = awaitingStepItems[0].additionalAttributes;
   }
 
+  _izContext.logger.debug(
+    '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Completion check status',
+    {
+      pendingStepId,
+      currentAwaitingStepId,
+      hasIncomplete,
+      defaultAttrs
+    }
+  );
+
   if (hasIncomplete) {
+    _izContext.logger.debug(
+      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Incomplete steps remaining',
+      {
+        pendingStepId,
+        incompleteSteps: awaitingStepItems
+          .filter(
+            item =>
+              item.awaitingStepId !== currentAwaitingStepId && !item.complete
+          )
+          .map(item => item.awaitingStepId)
+      }
+    );
+    return {
+      isComplete: false,
+      collectedReturnValueByAwaitingStepId: null,
+      collectedErrors: [],
+      returnValues: null,
+      additionalAttributes: defaultAttrs
+    };
+  }
+
+  // ── Atomic completion claim to prevent concurrent duplicate execution ─────
+  const primaryStep = awaitingStepItems[0];
+  try {
+    await dynamodbSharedLib.updateItem(
+      _izContext,
+      dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
+      {
+        pendingStepId,
+        awaitingStepId: primaryStep.awaitingStepId
+      },
+      { isFinalized: true },
+      {
+        conditionExpression: 'attribute_not_exists(isFinalized)'
+      },
+      {
+        errorOnConditionalExpNotPass: true
+      }
+    );
+  } catch (err) {
+    _izContext.logger.debug(
+      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Completion already claimed by another process',
+      {
+        pendingStepId,
+        error: err.message
+      }
+    );
     return {
       isComplete: false,
       collectedReturnValueByAwaitingStepId: null,
@@ -456,6 +558,14 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
     );
   }
 
+  _izContext.logger.debug(
+    '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Completed. Returning result:',
+    {
+      pendingStepId,
+      result
+    }
+  );
+
   return result;
 }
 
@@ -526,7 +636,7 @@ export async function removeAwaitingMultipleStep(
   if (!awaitingStepId || !pendingStepId) {
     throw new NoRetryError(
       '[Lib:removeAwaitingMultipleStep]' +
-      ' awaitingStepId or pendingStepId required'
+        ' awaitingStepId or pendingStepId required'
     );
   }
 
@@ -568,23 +678,19 @@ export async function completeAction(
   prefix = '',
   returnValue = {},
   errorsFound = []
-){
- _izContext.logger.debug('[Lib:CompleteAction] Input parameters', {
-  parentFlowId,
-  prefix
+) {
+  _izContext.logger.debug('[Lib:CompleteAction] Input parameters', {
+    parentFlowId,
+    prefix
   });
 
   try {
-
     const { pendingStepId } = await findPendingStepAwaitingMultipleSteps(
       _izContext,
-      createAwaitingStepId(
-        parentFlowId,
-        prefix
-      )
+      createAwaitingStepId(parentFlowId, prefix)
     );
 
-     if (!pendingStepId) {
+    if (!pendingStepId) {
       _izContext.logger.warn(
         `No pending step found for awaitingStepId: ${awaitingStepId}`
       );
@@ -600,29 +706,26 @@ export async function completeAction(
     } = await checkAllAwaitingStepsFinishedWithReturnParams(
       _izContext,
       pendingStepId,
-      createAwaitingStepId(
-        parentFlowId,
-        prefix
-      )
+      createAwaitingStepId(parentFlowId, prefix)
     );
 
     let status = true;
 
     if (!isComplete) {
-      status =  false
-    };
+      status = false;
+    }
 
     if (collectedErrors.length > 0 || errorsFound.length > 0) {
-      status =false
-    };
+      status = false;
+    }
 
     if (status) {
-        await Promise.all(
-          (pendingStepId.listOfRecords ?? []).flatMap((records) =>
-            Object.values(records).map(async (record) =>
-              dynamodbSharedLib.putItem(
-                _izContext,
-                await dynamodbSharedLib.tableName(
+      await Promise.all(
+        (pendingStepId.listOfRecords ?? []).flatMap(records =>
+          Object.values(records).map(async record =>
+            dynamodbSharedLib.putItem(
+              _izContext,
+              await dynamodbSharedLib.tableName(
                 _izContext,
                 record.tableName,
                 record.serviceTag
@@ -644,9 +747,8 @@ export async function completeAction(
       collectedErrors,
       returnValues,
       additionalAttributes
-    }
-
+    };
   } catch (err) {
-    _izContext.logger.error(err)
+    _izContext.logger.error(err);
   }
-}
+}