@izara_project/izara-core-library-asynchronous-flow 1.0.48 → 1.0.50

package/README.md

@@ -1,15 +1,20 @@
 # izara-core-library-asynchronous-flow
 
 # update version
+
 - commit code first
-npm version patch || npm version minor || npm version major
+  npm version patch || npm version minor || npm version major
 
 # can also push to repo ..
+
 git push
+
 # make sure commits look correct
 
 # push to npm
+
 npm publish
 
 # update project that uses this package
-npm update @izara_project/izara-core-library-asynchronous-flow
+
+npm update @izara_project/izara-core-library-asynchronous-flow

package/index.js

@@ -15,12 +15,12 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import * as asyncFlowSharedLib from './src/asyncFlowSharedLib.js';
-import * as awaitingStep from './src/awaitingStep.js';
-import * as awaitingMultipleSteps from './src/awaitingMultipleSteps.js';
+import * as asyncFlowSharedLib from "./src/asyncFlowSharedLib.js";
+import * as awaitingStep from "./src/awaitingStep.js";
+import * as awaitingMultipleSteps from "./src/awaitingMultipleSteps.js";
 
 export default {
   ...asyncFlowSharedLib,
   ...awaitingStep,
-  ...awaitingMultipleSteps
+  ...awaitingMultipleSteps,
 };

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.48",
+  "version": "1.0.50",
   "description": "Shared asynchronous flow logic",
   "type": "module",
   "main": "index.js",

package/src/asyncFlowSharedLib.js

@@ -16,17 +16,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // Core libraries
-import { NoRetryError } from '@izara_project/izara-core-library-core';
-import Logger from '@izara_project/izara-core-library-logger';
+import { NoRetryError } from "@izara_project/izara-core-library-core";
+import Logger from "@izara_project/izara-core-library-logger";
 
 // Data and service interaction libraries
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import sqsSharedLib from '@izara_project/izara-core-library-sqs';
+import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
+import sqsSharedLib from "@izara_project/izara-core-library-sqs";
 
 // External service interactions
-import { sqs } from '@izara_project/izara-core-library-external-request';
+import { sqs } from "@izara_project/izara-core-library-external-request";
 
-import { identifierUuid } from '@izara_project/izara-shared-core';
+import { identifierUuid } from "@izara_project/izara-shared-core";
 
 /**
  * Helper to safely join a prefix and an ID with a single underscore.
@@ -35,18 +35,18 @@ import { identifierUuid } from '@izara_project/izara-shared-core';
  * @param {string} [prefix='']
  * @returns {string}
  */
-function _joinPrefixAndId(id, prefix = '') {
+function _joinPrefixAndId(id, prefix = "") {
   if (!prefix) {
     return id;
   }
 
   let cleanPrefix = prefix;
-  if (prefix.endsWith('_')) {
+  if (prefix.endsWith("_")) {
     cleanPrefix = prefix.slice(0, -1);
   }
 
   let cleanId = id;
-  if (id.startsWith('_')) {
+  if (id.startsWith("_")) {
     cleanId = id.slice(1);
   }
 
@@ -59,7 +59,7 @@ function _joinPrefixAndId(id, prefix = '') {
  * @param {string} [prefix='']
  * @returns {string}
  */
-function createAwaitingStepId(partitionKey, prefix = '') {
+function createAwaitingStepId(partitionKey, prefix = "") {
   return _joinPrefixAndId(partitionKey, prefix);
 }
 
@@ -69,7 +69,7 @@ function createAwaitingStepId(partitionKey, prefix = '') {
  * @param {string} [prefix='']
  * @returns {string}
  */
-function createPendingStepId(identifierId, prefix = '') {
+function createPendingStepId(identifierId, prefix = "") {
   return _joinPrefixAndId(identifierId, prefix);
 }
 
@@ -81,7 +81,7 @@ function createPendingStepId(identifierId, prefix = '') {
  */
 function createFieldNameUniqueRequestId(
   prefix,
-  uniqueRequestIdFieldName = 'UniqueRequestId'
+  uniqueRequestIdFieldName = "UniqueRequestId",
 ) {
   return prefix + uniqueRequestIdFieldName;
 }
@@ -93,8 +93,8 @@ function createFieldNameUniqueRequestId(
  * @param {string} [prefix=""]
  * @returns {string}
  */
-function createConcatenatedAwaitingStepId(partitionKey, sortId, prefix = '') {
-  return prefix + partitionKey + '_' + sortId;
+function createConcatenatedAwaitingStepId(partitionKey, sortId, prefix = "") {
+  return prefix + partitionKey + "_" + sortId;
 }
 
 /**
@@ -104,7 +104,7 @@ function createConcatenatedAwaitingStepId(partitionKey, sortId, prefix = '') {
  * @returns {string}
  */
 function createConcatenatedPendingStepId(parentId, childId) {
-  return parentId + '_' + childId;
+  return parentId + "_" + childId;
 }
 
 /**
@@ -113,7 +113,7 @@ function createConcatenatedPendingStepId(parentId, childId) {
  * @param {string} [prefix=''] - The prefix to prepend to the parent Ids.
  * @returns {string} The parent Flow Id created.
  */
-function createParentFlowId(prefix = '') {
+function createParentFlowId(prefix = "") {
   return _joinPrefixAndId(identifierUuid(), prefix);
 }
 
@@ -124,9 +124,9 @@ function createParentFlowId(prefix = '') {
  * @returns {string}
  * @throws {NoRetryError} If stripped value equals prefix (invalid)
  */
-function explodePendingStepId(pendingStepId, prefix = '') {
+function explodePendingStepId(pendingStepId, prefix = "") {
   if (!pendingStepId) {
-    throw new NoRetryError('pendingStepId is required');
+    throw new NoRetryError("pendingStepId is required");
   }
   if (!prefix) {
     return pendingStepId;
@@ -134,10 +134,10 @@ function explodePendingStepId(pendingStepId, prefix = '') {
 
   const identifierId = pendingStepId.slice(prefix.length + 1);
   if (identifierId === prefix) {
-    throw new NoRetryError('IdentifierId should not be like prefix.');
+    throw new NoRetryError("IdentifierId should not be like prefix.");
   }
 
-  Logger.debug('return explode:', { identifierId });
+  Logger.debug("return explode:", { identifierId });
   return identifierId;
 }
 
@@ -177,29 +177,29 @@ async function checkUniqueRequestProcessing(
   _izContext,
   tableName,
   primaryKey,
-  prefix = '',
+  prefix = "",
   overwriteUniqueRequestId = null,
-  uniqueRequestIdFieldName = 'UniqueRequestId' // if set will check/add this fieldname with _izContext.uniqueRequestId value
+  uniqueRequestIdFieldName = "UniqueRequestId", // if set will check/add this fieldname with _izContext.uniqueRequestId value
 ) {
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:checkUniqueRequestProcessing] Input:',
+    "[Lib:AsyncFlow:checkUniqueRequestProcessing] Input:",
     {
       _izContext,
       tableName,
       primaryKey,
       prefix,
       overwriteUniqueRequestId,
-      uniqueRequestIdFieldName
-    }
+      uniqueRequestIdFieldName,
+    },
   );
 
   if (!tableName || !primaryKey) {
-    throw new NoRetryError('tableName and primaryKey are required');
+    throw new NoRetryError("tableName and primaryKey are required");
   }
 
   try {
-    _izContext.logger.debug('[Lib:checkUniqueRequestProcessing] reqId', {
-      uniqueRequestId: _izContext.uniqueRequestId
+    _izContext.logger.debug("[Lib:checkUniqueRequestProcessing] reqId", {
+      uniqueRequestId: _izContext.uniqueRequestId,
     });
 
     let uniqueRequestId = overwriteUniqueRequestId;
@@ -209,26 +209,26 @@ async function checkUniqueRequestProcessing(
 
     uniqueRequestIdFieldName = createFieldNameUniqueRequestId(
       prefix,
-      uniqueRequestIdFieldName
+      uniqueRequestIdFieldName,
     );
 
     for (let i = 0; i < 2; i++) {
       const existingRecord = await dynamodbSharedLib.getItem(
         _izContext,
         dynamodbSharedLib.tableName(_izContext, tableName),
-        primaryKey
+        primaryKey,
       );
 
       if (!existingRecord) {
-        return ['recordNotFound', {}];
+        return ["recordNotFound", {}];
       }
 
       const currentReqId = existingRecord[uniqueRequestIdFieldName];
       if (currentReqId === uniqueRequestId) {
-        return ['process', existingRecord];
+        return ["process", existingRecord];
       }
       if (currentReqId) {
-        return ['stop', existingRecord];
+        return ["stop", existingRecord];
       }
 
       try {
@@ -239,25 +239,25 @@ async function checkUniqueRequestProcessing(
           [
             {
               attributeName: uniqueRequestIdFieldName,
-              action: 'set',
-              value: _izContext.uniqueRequestId
-            }
+              action: "set",
+              value: _izContext.uniqueRequestId,
+            },
           ],
           {
             logicalElements: [
               {
-                type: 'function',
-                function: 'attribute_not_exists',
-                attribute: uniqueRequestIdFieldName
-              }
+                type: "function",
+                function: "attribute_not_exists",
+                attribute: uniqueRequestIdFieldName,
+              },
             ],
-            returnValues: 'ALL_NEW'
+            returnValues: "ALL_NEW",
           },
-          { complexAttributes: true }
+          { complexAttributes: true },
         );
-        return ['process', updateRecord];
+        return ["process", updateRecord];
       } catch (err) {
-        if (err.name === 'ConditionalCheckFailedException') {
+        if (err.name === "ConditionalCheckFailedException") {
           continue;
         }
         throw err;
@@ -266,13 +266,12 @@ async function checkUniqueRequestProcessing(
 
     throw new NoRetryError(
       `unable to set uniqueRequestId in table ${tableName}`,
-      { primaryKey }
+      { primaryKey },
     );
   } catch (err) {
-    _izContext.logger.error(
-      '[Lib:checkUniqueRequestProcessing] Error',
-      { err }
-    );
+    _izContext.logger.error("[Lib:checkUniqueRequestProcessing] Error", {
+      err,
+    });
     throw err;
   }
 }
@@ -294,31 +293,30 @@ async function checkTimeCacheComplete(
   fullMainTableName,
   keyValues,
   timeCacheComplete,
-  prefix
+  prefix,
 ) {
-  _izContext.logger.debug('[Lib:AsyncFlow:checkTimeCacheComplete] Input:', {
+  _izContext.logger.debug("[Lib:AsyncFlow:checkTimeCacheComplete] Input:", {
     _izContext,
     fullMainTableName,
     keyValues,
     timeCacheComplete,
-    prefix
+    prefix,
   });
 
   if (!fullMainTableName || !keyValues || !timeCacheComplete || !prefix) {
     throw new NoRetryError(
-      'fullMainTableName, keyValues, timeCacheComplete' +
-      ' and prefix are required'
+      "fullMainTableName, keyValues, timeCacheComplete" +
+        " and prefix are required",
     );
   }
 
-  const [returnValue, , uniqueRequestId] =
-    await checkAndGetTimeCacheComplete(
-      _izContext,
-      fullMainTableName,
-      keyValues,
-      timeCacheComplete,
-      prefix
-    );
+  const [returnValue, , uniqueRequestId] = await checkAndGetTimeCacheComplete(
+    _izContext,
+    fullMainTableName,
+    keyValues,
+    timeCacheComplete,
+    prefix,
+  );
   return [returnValue, uniqueRequestId];
 }
 
@@ -340,34 +338,34 @@ async function checkAndGetTimeCacheComplete(
   fullMainTableName,
   keyValues,
   timeCacheComplete,
-  prefix
+  prefix,
 ) {
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:checkAndGetTimeCacheComplete] Input:',
+    "[Lib:AsyncFlow:checkAndGetTimeCacheComplete] Input:",
     {
       fullMainTableName,
       keyValues,
       timeCacheComplete,
-      prefix
-    }
+      prefix,
+    },
   );
 
-  const uniqueRequestIdFieldName = createFieldNameUniqueRequestId('cache');
-  const cacheCompleteFieldName = prefix + 'CacheComplete';
+  const uniqueRequestIdFieldName = createFieldNameUniqueRequestId("cache");
+  const cacheCompleteFieldName = prefix + "CacheComplete";
 
   const getTimeCacheComplete = await dynamodbSharedLib.getItem(
     _izContext,
     fullMainTableName,
-    keyValues
+    keyValues,
   );
   _izContext.logger.debug(
     `[Lib:checkAndGetTimeCacheComplete] ${fullMainTableName}`,
-    { getTimeCacheComplete }
+    { getTimeCacheComplete },
   );
 
   if (!getTimeCacheComplete) {
     throw new NoRetryError(
-      `cannot getTimeCacheComplete from ${fullMainTableName}`
+      `cannot getTimeCacheComplete from ${fullMainTableName}`,
     );
   }
 
@@ -393,7 +391,7 @@ async function checkAndGetTimeCacheComplete(
   return [
     true,
     getTimeCacheComplete[cacheCompleteFieldName],
-    getTimeCacheComplete[uniqueRequestIdFieldName]
+    getTimeCacheComplete[uniqueRequestIdFieldName],
   ];
 }
 
@@ -413,20 +411,18 @@ async function checkCacheUniqueRequestId(
   fullMainTableName,
   keyValues,
   checkUniqueRequestId,
-  uniqueRequestIdCompleteFieldName
+  uniqueRequestIdCompleteFieldName,
 ) {
   const cacheObject = await dynamodbSharedLib.getItem(
     _izContext,
     fullMainTableName,
-    keyValues
+    keyValues,
   );
-  _izContext.logger.debug('[Lib:checkCacheUniqueRequestId] Output', {
-    cacheObject
+  _izContext.logger.debug("[Lib:checkCacheUniqueRequestId] Output", {
+    cacheObject,
   });
 
-  return (
-    cacheObject[uniqueRequestIdCompleteFieldName] === checkUniqueRequestId
-  );
+  return cacheObject[uniqueRequestIdCompleteFieldName] === checkUniqueRequestId;
 }
 
 //====================================== end Multiple Lambda Invocations (Logic pagination of handling results)
@@ -446,12 +442,12 @@ function validateStartKeyParam(
   _izContext,
   startKey,
   partitionKeyFieldName,
-  sortKeyFieldName
+  sortKeyFieldName,
 ) {
-  _izContext.logger.debug('[Lib:AsyncFlow:validateStartKeyParam] Input:', {
+  _izContext.logger.debug("[Lib:AsyncFlow:validateStartKeyParam] Input:", {
     startKey,
     partitionKeyFieldName,
-    sortKeyFieldName
+    sortKeyFieldName,
   });
 
   const stringNotEmptyRegex = /^[A-Za-z0-9_-]+$/;
@@ -463,16 +459,16 @@ function validateStartKeyParam(
     !stringNotEmptyRegex.test(sortKeyFieldName)
   ) {
     throw new NoRetryError(
-      'validateStartKeyParam:' +
-      ' Invalid partitionKeyFieldName or sortKeyFieldName'
+      "validateStartKeyParam:" +
+        " Invalid partitionKeyFieldName or sortKeyFieldName",
     );
   }
 
   if (startKey && Object.keys(startKey).length !== 0) {
     if (!startKey[partitionKeyFieldName] || !startKey[sortKeyFieldName]) {
       throw new NoRetryError(
-        'validateStartKeyParam: Invalid startKey,' +
-        ' missing partitionKeyFieldName or sortKeyFieldName'
+        "validateStartKeyParam: Invalid startKey," +
+          " missing partitionKeyFieldName or sortKeyFieldName",
       );
     }
     return startKey;
@@ -499,48 +495,45 @@ async function validateMultipleInvocations(
   messageProperty,
   passOnStartKey = {},
   numberInvocation,
-  queueName
+  queueName,
 ) {
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:validateMultipleInvocations] Input:',
+    "[Lib:AsyncFlow:validateMultipleInvocations] Input:",
     {
       messageProperty,
       passOnStartKey,
       numberInvocation,
-      queueName
-    }
+      queueName,
+    },
   );
 
   try {
     const maxProcessInvocationCountImport = 20;
     if (numberInvocation >= maxProcessInvocationCountImport) {
       _izContext.logger.error(
-        'numberInvocation exceeds maxProcessInvocationCountImport limit'
+        "numberInvocation exceeds maxProcessInvocationCountImport limit",
       );
       throw new NoRetryError(
-        'numberInvocation exceeds maxProcessInvocationCountImport limit'
+        "numberInvocation exceeds maxProcessInvocationCountImport limit",
       );
     }
 
     if (passOnStartKey) {
-      messageProperty['startKey'] = passOnStartKey;
+      messageProperty["startKey"] = passOnStartKey;
     }
-    messageProperty['numberInvocation'] = numberInvocation;
+    messageProperty["numberInvocation"] = numberInvocation;
 
     const messageReInvokeFunction = {
       MessageBody: JSON.stringify(messageProperty),
-      QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, queueName)
+      QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, queueName),
     };
     _izContext.logger.debug(
       `[Lib:validateMultipleInvocations] Send message to Dsq:${queueName}`,
-      { messageReInvokeFunction }
+      { messageReInvokeFunction },
     );
     await sqs.sendMessage(_izContext, messageReInvokeFunction);
   } catch (err) {
-    _izContext.logger.error(
-      '[Lib:validateMultipleInvocations] Error',
-      { err }
-    );
+    _izContext.logger.error("[Lib:validateMultipleInvocations] Error", { err });
     throw err;
   }
 }
@@ -558,5 +551,5 @@ export {
   checkAndGetTimeCacheComplete,
   checkCacheUniqueRequestId,
   validateStartKeyParam,
-  validateMultipleInvocations
+  validateMultipleInvocations,
 };

package/src/awaitingMultipleSteps.js

@@ -14,20 +14,20 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { NoRetryError } from '@izara_project/izara-core-library-core';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { sns } from '@izara_project/izara-core-library-external-request';
-import snsSharedLib from '@izara_project/izara-core-library-sns';
+import { NoRetryError } from "@izara_project/izara-core-library-core";
+import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
+import { sns } from "@izara_project/izara-core-library-external-request";
+import snsSharedLib from "@izara_project/izara-core-library-sns";
 
 import {
   createParentFlowId,
   createPendingStepId,
-  createAwaitingStepId
-} from './asyncFlowSharedLib.js';
+  createAwaitingStepId,
+} from "./asyncFlowSharedLib.js";
 
 function _assertPendingStepId(pendingStepId) {
   if (!pendingStepId) {
-    throw new NoRetryError('pendingStepId required');
+    throw new NoRetryError("pendingStepId required");
   }
 }
 
@@ -35,15 +35,15 @@ async function _putAwaitingMultipleStepRecords(
   _izContext,
   records,
   pendingStepId,
-  sharedAttributes = {}
+  sharedAttributes = {},
 ) {
   const tableSteps = dynamodbSharedLib.tableName(
     _izContext,
-    'AwaitingMultipleSteps'
+    "AwaitingMultipleSteps",
   );
   const tablePending = dynamodbSharedLib.tableName(
     _izContext,
-    'AwaitingMultipleStepByPending'
+    "AwaitingMultipleStepByPending",
   );
 
   await Promise.all(
@@ -52,29 +52,36 @@ async function _putAwaitingMultipleStepRecords(
 
       const itemPending = {
         ...keys,
-        ...sharedAttributes
+        ...sharedAttributes,
       };
       if (additionalAttributes) {
-        itemPending.additionalAttributes = additionalAttributes;
+        if (sharedAttributes.additionalAttributes) {
+          itemPending.additionalAttributes = {
+            ...sharedAttributes.additionalAttributes,
+            ...additionalAttributes
+          };
+        } else {
+          itemPending.additionalAttributes = additionalAttributes;
+        }
       }
 
       return [
         dynamodbSharedLib.putItem(_izContext, tableSteps, keys),
-        dynamodbSharedLib.putItem(_izContext, tablePending, itemPending)
+        dynamodbSharedLib.putItem(_izContext, tablePending, itemPending),
       ];
-    })
+    }),
   );
 }
 
 async function _queryPendingStepsByAwaitingStepId(_izContext, awaitingStepId) {
   if (!awaitingStepId) {
-    throw new NoRetryError('awaitingStepId required');
+    throw new NoRetryError("awaitingStepId required");
   }
 
   const { Items } = await dynamodbSharedLib.query(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-    { awaitingStepId }
+    dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
+    { awaitingStepId },
   );
 
   return Items;
@@ -85,9 +92,9 @@ async function _queryAwaitingStepsByPendingStepId(_izContext, pendingStepId) {
 
   const { Items } = await dynamodbSharedLib.query(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
+    dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
     { pendingStepId },
-    { limit: 50 }
+    { limit: 50 },
   );
 
   return Items;
@@ -124,18 +131,18 @@ export async function createAwaitingMultipleSteps(
   _izContext,
   pendingStepId,
   records = [],
-  options = {}
+  options = {},
 ) {
-  const { prefix = '', additionalAttributes = {}, flowType = null } = options;
+  const { prefix = "", additionalAttributes = {}, flowType = null } = options;
 
-  _izContext.logger.debug('[Lib:AsyncFlow:createAwaitingMultipleSteps] Input', {
+  _izContext.logger.debug("[Lib:AsyncFlow:createAwaitingMultipleSteps] Input", {
     pendingStepId,
-    options
+    options,
   });
 
   const finalPendingStepId = createPendingStepId(pendingStepId, prefix);
 
-  const hasFlowPublish = flowType || records.some(r => r.flowType);
+  const hasFlowPublish = flowType || records.some((r) => r.flowType);
 
   let finalRecords = records;
 
@@ -143,13 +150,13 @@ export async function createAwaitingMultipleSteps(
     finalRecords = [
       {
         awaitingStepId: createParentFlowId(prefix),
-        additionalAttributes
-      }
+        additionalAttributes,
+      },
     ];
   }
 
   if (hasFlowPublish) {
-    finalRecords = records.map(record => {
+    finalRecords = records.map((record) => {
       const recordFlowType = record.flowType || flowType;
 
       if (
@@ -158,7 +165,7 @@ export async function createAwaitingMultipleSteps(
         !recordFlowType.serviceTag
       ) {
         throw new NoRetryError(
-          'record.flowType must have both flowTag and serviceTag'
+          "record.flowType must have both flowTag and serviceTag",
         );
       }
 
@@ -171,13 +178,13 @@ export async function createAwaitingMultipleSteps(
         additionalAttributes: record.additionalAttributes,
         message: {
           ...record.message,
-          parentFlowId: awaitingStepId
+          parentFlowId: awaitingStepId,
         },
         topicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           recordFlowType.flowTag,
-          recordFlowType.serviceTag
-        )
+          recordFlowType.serviceTag,
+        ),
       };
     });
   }
@@ -197,7 +204,7 @@ export async function createAwaitingMultipleSteps(
         awaitingStepId: createAwaitingStepId(awaitingStepId, prefix),
         additionalAttributes: mergedAttributes
       };
-    }
+    },
   );
 
   await _putAwaitingMultipleStepRecords(
@@ -206,8 +213,8 @@ export async function createAwaitingMultipleSteps(
     finalPendingStepId,
     {
       complete: false,
-      errorsFound: []
-    }
+      errorsFound: [],
+    },
   );
 
   if (hasFlowPublish) {
@@ -215,9 +222,9 @@ export async function createAwaitingMultipleSteps(
       finalRecords.map(async ({ message, topicArn }) => {
         await sns.publishAsync(_izContext, {
           TopicArn: `${topicArn}_In`,
-          Message: JSON.stringify(message)
+          Message: JSON.stringify(message),
         });
-      })
+      }),
     );
   }
 
@@ -240,23 +247,23 @@ export async function updateAwaitingMultipleStep(
   _izContext,
   awaitingStepId,
   pendingStepId,
-  data
+  data,
 ) {
   const tableSteps = dynamodbSharedLib.tableName(
     _izContext,
-    'AwaitingMultipleSteps'
+    "AwaitingMultipleSteps",
   );
 
   await dynamodbSharedLib.updateItem(
     _izContext,
     tableSteps,
     { awaitingStepId, pendingStepId },
-    data
+    data,
   );
 
-  _izContext.logger.debug('[Lib:updateAwaitingMultipleStep] Output', {
+  _izContext.logger.debug("[Lib:updateAwaitingMultipleStep] Output", {
     awaitingStepId,
-    data
+    data,
   });
 
   return { ...data, awaitingStepId };
@@ -271,15 +278,15 @@ export async function updateAwaitingMultipleStep(
  */
 export async function findPendingStepAwaitingMultipleSteps(
   _izContext,
-  awaitingStepId
+  awaitingStepId,
 ) {
-  _izContext.logger.debug('[Lib:findPendingStepAwaitingMultipleSteps] Input', {
-    awaitingStepId
+  _izContext.logger.debug("[Lib:findPendingStepAwaitingMultipleSteps] Input", {
+    awaitingStepId,
   });
 
   const items = await _queryPendingStepsByAwaitingStepId(
     _izContext,
-    awaitingStepId
+    awaitingStepId,
   );
 
   if (items && items.length > 0) {
@@ -297,7 +304,7 @@ export async function findPendingStepAwaitingMultipleSteps(
  */
 export async function findPendingStepsAwaitingMultipleSteps(
   _izContext,
-  awaitingStepId
+  awaitingStepId,
 ) {
   return _queryPendingStepsByAwaitingStepId(_izContext, awaitingStepId);
 }
@@ -311,11 +318,11 @@ export async function findPendingStepsAwaitingMultipleSteps(
  */
 export async function findPendingStepIdAwaitingMultipleSteps(
   _izContext,
-  awaitingStepId
+  awaitingStepId,
 ) {
   const items = await _queryPendingStepsByAwaitingStepId(
     _izContext,
-    awaitingStepId
+    awaitingStepId,
   );
   if (items && items[0] && items[0].pendingStepId) {
     return items[0].pendingStepId;
@@ -332,7 +339,7 @@ export async function findPendingStepIdAwaitingMultipleSteps(
  */
 export async function findAwaitingMultipleStepByPending(
   _izContext,
-  pendingStepId
+  pendingStepId,
 ) {
   return _queryAwaitingStepsByPendingStepId(_izContext, pendingStepId);
 }
@@ -355,16 +362,16 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   currentAwaitingStepId,
   errorsFound = [],
   returnValues = {},
-  settings = { checkIsAllError: false }
+  settings = { checkIsAllError: false },
 ) {
   _izContext.logger.debug(
-    '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Input parameters',
+    "[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Input parameters",
     {
       pendingStepId,
       currentAwaitingStepId,
       errorsFound,
-      returnValues
-    }
+      returnValues,
+    },
   );
 
   _assertPendingStepId(pendingStepId);
@@ -383,16 +390,26 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
 
     await dynamodbSharedLib.updateItem(
       _izContext,
-      dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
+      dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleStepByPending"),
       {
         pendingStepId,
-        awaitingStepId: currentAwaitingStepId
+        awaitingStepId: currentAwaitingStepId,
       },
       {
         complete: true,
         errorsFound,
-        returnValues
-      }
+        returnValues,
+      },
+    );
+
+    _izContext.logger.debug(
+      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] After updating awaitingStepItems',
+      {
+        pendingStepId,
+        awaitingStepId: currentAwaitingStepId,
+        errorsFound,
+        returnValues,
+      },
     );
 
     _izContext.logger.debug(
@@ -408,10 +425,12 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
 
   const awaitingStepItems = await _queryAwaitingStepsByPendingStepId(
     _izContext,
-    pendingStepId
+    pendingStepId,
   );
 
   _izContext.logger.debug(
+    "[Lib:checkAllAwaitingStepsFinishedWithReturnParams] awaitingStepItems",
+    { awaitingStepItems },
     '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Queried awaitingStepItems',
     {
       pendingStepId,
@@ -437,7 +456,7 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   }
 
   const hasIncomplete = awaitingStepItems.some(
-    item => item.awaitingStepId !== currentAwaitingStepId && !item.complete
+    (item) => item.awaitingStepId !== currentAwaitingStepId && !item.complete,
   );
 
   let defaultAttrs = null;
@@ -508,7 +527,7 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
       collectedReturnValueByAwaitingStepId: null,
       collectedErrors: [],
       returnValues: null,
-      additionalAttributes: defaultAttrs
+      additionalAttributes: defaultAttrs,
     };
   }
 
@@ -532,7 +551,7 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
     if (item.errorsFound && item.errorsFound.length > 0) {
       collectedErrors.push(
         `Error found in step ${item.awaitingStepId}`,
-        ...item.errorsFound
+        ...item.errorsFound,
       );
     }
   }
@@ -542,12 +561,12 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
     collectedReturnValueByAwaitingStepId,
     collectedErrors,
     returnValues: sharedReturnValues,
-    additionalAttributes: defaultAttrs
+    additionalAttributes: defaultAttrs,
   };
 
   if (settings.checkIsAllError) {
     result.isAllError = awaitingStepItems.every(
-      item => item.errorsFound && item.errorsFound.length > 0
+      (item) => item.errorsFound && item.errorsFound.length > 0,
     );
   }
 
@@ -570,21 +589,21 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
  * @returns {Promise<boolean>} True if operations completed successfully.
  */
 export async function clearAllAwaitingSteps(_izContext, pendingStepId) {
-  _izContext.logger.debug('[Lib:clearAllAwaitingSteps] Input parameters', {
-    pendingStepId
+  _izContext.logger.debug("[Lib:clearAllAwaitingSteps] Input parameters", {
+    pendingStepId,
   });
 
   const awaitingStepItems = await _queryAwaitingStepsByPendingStepId(
     _izContext,
-    pendingStepId
+    pendingStepId,
   );
   const tableSteps = dynamodbSharedLib.tableName(
     _izContext,
-    'AwaitingMultipleSteps'
+    "AwaitingMultipleSteps",
   );
   const tablePending = dynamodbSharedLib.tableName(
     _izContext,
-    'AwaitingMultipleStepByPending'
+    "AwaitingMultipleStepByPending",
   );
 
   await Promise.all(
@@ -592,14 +611,14 @@ export async function clearAllAwaitingSteps(_izContext, pendingStepId) {
       ({ awaitingStepId, pendingStepId: itemPendingStepId }) => [
         dynamodbSharedLib.deleteItem(_izContext, tableSteps, {
           awaitingStepId,
-          pendingStepId: itemPendingStepId
+          pendingStepId: itemPendingStepId,
         }),
         dynamodbSharedLib.deleteItem(_izContext, tablePending, {
           awaitingStepId,
-          pendingStepId: itemPendingStepId
-        })
-      ]
-    )
+          pendingStepId: itemPendingStepId,
+        }),
+      ],
+    ),
   );
 
   return true;
@@ -618,12 +637,12 @@ export async function removeAwaitingMultipleStep(
   _izContext,
   awaitingStepId,
   pendingStepId,
-  errorsFound = []
+  errorsFound = [],
 ) {
-  _izContext.logger.debug('[Lib:removeAwaitingMultipleStep] Input parameters', {
+  _izContext.logger.debug("[Lib:removeAwaitingMultipleStep] Input parameters", {
     awaitingStepId,
     pendingStepId,
-    errorsFound
+    errorsFound,
   });
 
   if (!awaitingStepId || !pendingStepId) {
@@ -637,9 +656,9 @@ export async function removeAwaitingMultipleStep(
   const promises = [
     dynamodbSharedLib.deleteItem(
       _izContext,
-      dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-      keys
-    )
+      dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
+      keys,
+    ),
   ];
 
   if (errorsFound.length === 0) {
@@ -648,10 +667,10 @@ export async function removeAwaitingMultipleStep(
         _izContext,
         dynamodbSharedLib.tableName(
           _izContext,
-          'AwaitingMultipleStepByPending'
+          "AwaitingMultipleStepByPending",
         ),
-        keys
-      )
+        keys,
+      ),
     );
   }
 
@@ -668,9 +687,10 @@ export async function removeAwaitingMultipleStep(
 export async function completeAction(
   _izContext,
   parentFlowId,
-  prefix = '',
+  prefix = "",
   returnValue = {},
-  errorsFound = []
+  errorsFound = [],
+  settings = { checkIsAllError: false }
 ) {
   _izContext.logger.debug('[Lib:CompleteAction] Input parameters', {
     parentFlowId,
@@ -678,14 +698,17 @@ export async function completeAction(
   });
 
   try {
-    const { pendingStepId } = await findPendingStepAwaitingMultipleSteps(
+    const {pendingStepId} = await findPendingStepAwaitingMultipleSteps(
       _izContext,
-      createAwaitingStepId(parentFlowId, prefix)
+      createAwaitingStepId(
+        parentFlowId,
+        prefix
+      )
     );
 
     if (!pendingStepId) {
       _izContext.logger.warn(
-        `No pending step found for awaitingStepId: ${awaitingStepId}`
+        `No pending step found for awaitingStepId: ${awaitingStepId}`,
       );
       return { returnValue, errorsFound };
     }
@@ -695,11 +718,17 @@ export async function completeAction(
       collectedReturnValueByAwaitingStepId,
       collectedErrors,
       returnValues,
-      additionalAttributes
+      additionalAttributes,
     } = await checkAllAwaitingStepsFinishedWithReturnParams(
       _izContext,
       pendingStepId,
-      createAwaitingStepId(parentFlowId, prefix)
+      createAwaitingStepId(
+        parentFlowId,
+        prefix
+      ),
+      errorsFound,
+      returnValue,
+      { checkIsAllError: settings.checkIsAllError }
     );
 
     let status = true;
@@ -714,22 +743,22 @@ export async function completeAction(
 
     if (status) {
       await Promise.all(
-        (pendingStepId.listOfRecords ?? []).flatMap(records =>
+        (additionalAttributes.listOfRecords ?? []).flatMap(records =>
           Object.values(records).map(async record =>
-            dynamodbSharedLib.putItem(
+            dynamodbSharedLib.updateItem(
               _izContext,
               await dynamodbSharedLib.tableName(
                 _izContext,
                 record.tableName,
-                record.serviceTag
+                record.serviceTag,
               ),
               {
                 ...record.objInstanceFull.identifiers,
-                ...record.objInstanceFull.fields
-              }
-            )
-          )
-        )
+                ...record.objInstanceFull.fields,
+              },
+            ),
+          ),
+        ),
       );
     }
 

package/src/awaitingStep.js

@@ -14,28 +14,28 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { NoRetryError } from '@izara_project/izara-core-library-core';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import { NoRetryError } from "@izara_project/izara-core-library-core";
+import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
 
-import { createFieldNameUniqueRequestId } from './asyncFlowSharedLib.js';
+import { createFieldNameUniqueRequestId } from "./asyncFlowSharedLib.js";
 
 async function _findSinglePendingStep(_izContext, awaitingStepId) {
-  _izContext.logger.debug('[Lib:AsyncFlow:findSinglePendingStep] Input', {
-    awaitingStepId
+  _izContext.logger.debug("[Lib:AsyncFlow:findSinglePendingStep] Input", {
+    awaitingStepId,
   });
 
   if (!awaitingStepId) {
-    throw new NoRetryError('awaitingStepId is required');
+    throw new NoRetryError("awaitingStepId is required");
   }
 
   const { Items } = await dynamodbSharedLib.query(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
-    { awaitingStepId }
+    dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
+    { awaitingStepId },
   );
 
   if (Items.length !== 1) {
-    throw new NoRetryError('listPendingSteps not equals 1');
+    throw new NoRetryError("listPendingSteps not equals 1");
   }
 
   return Items[0];
@@ -64,13 +64,13 @@ export async function createAwaitingStep(
   awaitingStepId,
   pendingStepId,
   additionalAttributes = {},
-  callingFlowConfig = {}
+  callingFlowConfig = {},
 ) {
-  _izContext.logger.debug('[Lib:AsyncFlow:createAwaitingStep] Input', {
+  _izContext.logger.debug("[Lib:AsyncFlow:createAwaitingStep] Input", {
     awaitingStepId,
     pendingStepId,
     additionalAttributes,
-    callingFlowConfig
+    callingFlowConfig,
   });
 
   const attributesWhenCreate = {
@@ -78,7 +78,7 @@ export async function createAwaitingStep(
     pendingStepId,
     timestamp: Date.now(),
     uniqueRequestId: _izContext.uniqueRequestId,
-    ...additionalAttributes
+    ...additionalAttributes,
   };
 
   if (Object.keys(callingFlowConfig).length > 0) {
@@ -87,8 +87,8 @@ export async function createAwaitingStep(
 
   await dynamodbSharedLib.putItem(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
-    attributesWhenCreate
+    dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
+    attributesWhenCreate,
   );
 }
 
@@ -116,21 +116,21 @@ export async function findPendingStep(_izContext, awaitingStepId) {
 export async function removeAwaitingStep(
   _izContext,
   awaitingStepId,
-  pendingStepId
+  pendingStepId,
 ) {
-  _izContext.logger.debug('[Lib:AsyncFlow:removeAwaitingStep] Input', {
+  _izContext.logger.debug("[Lib:AsyncFlow:removeAwaitingStep] Input", {
     awaitingStepId,
-    pendingStepId
+    pendingStepId,
   });
 
   if (!awaitingStepId || !pendingStepId) {
-    throw new NoRetryError('awaitingStepId, pendingStepId required');
+    throw new NoRetryError("awaitingStepId, pendingStepId required");
   }
 
   await dynamodbSharedLib.deleteItem(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
-    { awaitingStepId, pendingStepId }
+    dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
+    { awaitingStepId, pendingStepId },
   );
 }
 
@@ -150,16 +150,16 @@ export async function removeAwaitingStepWithCheckUniqueRequestId(
   awaitingStepId,
   pendingStepId,
   checkUniqueRequestId,
-  prefix = ''
+  prefix = "",
 ) {
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:removeAwaitingStepWithCheckUniqueRequestId] Input',
-    { awaitingStepId, pendingStepId, checkUniqueRequestId, prefix }
+    "[Lib:AsyncFlow:removeAwaitingStepWithCheckUniqueRequestId] Input",
+    { awaitingStepId, pendingStepId, checkUniqueRequestId, prefix },
   );
 
   if (!awaitingStepId || !pendingStepId || !checkUniqueRequestId) {
     throw new NoRetryError(
-      'awaitingStepId, pendingStepId, checkUniqueRequestId required'
+      "awaitingStepId, pendingStepId, checkUniqueRequestId required",
     );
   }
 
@@ -167,19 +167,19 @@ export async function removeAwaitingStepWithCheckUniqueRequestId(
     additionalAttributes: { checkUniqueRequestId },
     logicalElements: [
       {
-        type: 'logical',
-        comparison: 'equals',
+        type: "logical",
+        comparison: "equals",
         lhsAttribute: createFieldNameUniqueRequestId(prefix),
-        rhsReference: 'checkUniqueRequestId'
-      }
-    ]
+        rhsReference: "checkUniqueRequestId",
+      },
+    ],
   };
 
   await dynamodbSharedLib.deleteItem(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
+    dynamodbSharedLib.tableName(_izContext, "AwaitingStep"),
     { awaitingStepId, pendingStepId },
     queryElementsCondition,
-    { errorOnConditionalExpNotPass: false }
+    { errorOnConditionalExpNotPass: false },
   );
 }