@izara_project/izara-core-library-asynchronous-flow 1.0.37 → 1.0.39

package/package.json

@@ -3,42 +3,33 @@
   "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.37",
+  "version": "1.0.39",
   "description": "Shared asynchronous flow logic",
   "type": "module",
   "main": "index.js",
   "exports": {
     ".": "./index.js"
   },
-  "scripts": {
-    "test": "jest"
-  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/izara-core-libraries/izara-core-library-asynchronous-flow.git"
   },
-  "jest": {
-    "testEnvironment": "node"
-  },
   "devDependencies": {
-    "jest": "^30.4.2",
     "@izara_project/izara-core-library-core": "^1.0.32",
-    "@izara_project/izara-core-library-dynamodb": "^1.0.19",
+    "@izara_project/izara-core-library-dynamodb": "^1.0.20",
     "@izara_project/izara-core-library-external-request": "^1.0.30",
     "@izara_project/izara-core-library-logger": "^1.0.9",
-    "@izara_project/izara-core-library-sqs": "^1.0.7",
     "@izara_project/izara-core-library-sns": "^1.0.8",
-    "@izara_project/izara-shared-core": "^1.0.12"
+    "@izara_project/izara-core-library-sqs": "^1.0.7",
+    "@izara_project/izara-shared-core": "^1.0.13"
   },
   "peerDependencies": {
     "@izara_project/izara-core-library-core": "^1.0.32",
     "@izara_project/izara-core-library-dynamodb": "^1.0.19",
     "@izara_project/izara-core-library-external-request": "^1.0.30",
     "@izara_project/izara-core-library-logger": "^1.0.9",
-    "@izara_project/izara-core-library-sqs": "^1.0.7",
     "@izara_project/izara-core-library-sns": "^1.0.8",
+    "@izara_project/izara-core-library-sqs": "^1.0.7",
     "@izara_project/izara-shared-core": "^1.0.12"
-  },
-  "peerDependenciesMeta": {},
-  "dependencies": {}
+  }
 }

package/src/asyncFlowSharedLib.js

@@ -66,26 +66,6 @@ export function createConcatenatedPendingStepId(parentId, childId) {
   return parentId + '_' + childId;
 }
 
-/**
- * Create a simple awaitingStepId (prefix + partitionKey).
- * @param {string} partitionKey
- * @param {string} [prefix=""]
- * @returns {string}
- */
-export function createAwaitingStepId(partitionKey, prefix = '') {
-  return prefix + partitionKey;
-}
-
-/**
- * Create a simple pendingStepId (prefix + identifierId).
- * @param {string} identifierId
- * @param {string} [prefix=""]
- * @returns {string}
- */
-export function createPendingStepId(identifierId, prefix = '') {
-  return prefix + identifierId;
-}
-
 /**
  * Create parent Flow Id.
  * @async
@@ -117,24 +97,6 @@ export function explodePendingStepId(pendingStepId, prefix = '') {
 }
 
 // copy from izara-core-library-trigger-cache
-/**
- * Build the field name that stores "cache complete" marker.
- * @param {string} [prefix='cache']
- * @returns {string}
- */
-export function createFieldNameCacheComplete(prefix = 'cache') {
-  return prefix + 'CacheComplete';
-}
-
-/**
- * Build the field name that stores a cache "status".
- * @param {string} [prefix='cache']
- * @returns {string}
- */
-export function createFieldNameStatus(prefix = 'cache') {
-  return prefix + 'Status';
-}
-
 /**
  * Checks if record has uniqueRequestId set, if not set to this requests uniqueRequestId and continue to process
  * if already set check if matches this request uniqueRequestId, if yes continue to process, if not then stop processing
@@ -333,8 +295,8 @@ export async function checkAndGetTimeCacheComplete(
   );
 
   const uniqueRequestIdFieldName = createFieldNameUniqueRequestId('cache');
-  const cacheCompleteFieldName = createFieldNameCacheComplete(prefix);
-  const statusFieldName = createFieldNameStatus(prefix);
+  const cacheCompleteFieldName = prefix + 'CacheComplete';
+  const statusFieldName = prefix + 'Status';
 
   let getTimeCacheComplete = await dynamodbSharedLib.getItem(
     _izContext,

package/src/awaitingMultipleSteps.js

@@ -95,10 +95,10 @@ async function _queryAwaitingStepsByPendingStepId(_izContext, pendingStepId) {
 export async function createAwaitingMultipleSteps(
   _izContext,
   pendingStepId,
+  records = [],
   options = {}
 ) {
   const {
-    records = [],
     prefix = '',
     additionalAttributes = {},
     publishConfig = null
@@ -109,6 +109,16 @@ export async function createAwaitingMultipleSteps(
     options
   });
 
+  const formattedPrefix = prefix
+    ? prefix.endsWith('_')
+      ? prefix
+      : `${prefix}_`
+    : '';
+  const finalPendingStepId =
+    formattedPrefix && !pendingStepId.startsWith(formattedPrefix)
+      ? formattedPrefix + pendingStepId
+      : pendingStepId;
+
   let finalRecords = records;
 
   if (finalRecords.length === 0 && !publishConfig) {
@@ -152,7 +162,7 @@ export async function createAwaitingMultipleSteps(
       awaitingStepId,
       additionalAttributes: itemAttrs
     })),
-    pendingStepId,
+    finalPendingStepId,
     {
       complete: false,
       errorsFound: []
@@ -180,42 +190,30 @@ export async function createAwaitingMultipleSteps(
   return finalRecords[0]?.awaitingStepId;
 }
 
-export async function createAwaitingMultipleStepsWithAdditionalAttributes(
-  _izContext,
-  records,
-  pendingStepId
-) {
-  return createAwaitingMultipleSteps(_izContext, pendingStepId, { records });
-}
-
-export async function createAwaitingMultipleStep(
+export async function updateAwaitingMultipleStep(
   _izContext,
+  awaitingStepId,
   pendingStepId,
-  prefix = '',
-  additionalAttributes = {}
+  data
 ) {
-  return createAwaitingMultipleSteps(_izContext, pendingStepId, {
-    prefix,
-    additionalAttributes
-  });
-}
+  const tableSteps = dynamodbSharedLib.tableName(
+    _izContext,
+    'AwaitingMultipleSteps'
+  );
 
-export async function createAwaitingMultipleStepsWithAdditionalAttributesAndPublish(
-  _izContext,
-  messages,
-  prefix = '',
-  flowType = {},
-  additionalAttributes = {},
-  pendingStepId
-) {
-  return createAwaitingMultipleSteps(_izContext, pendingStepId, {
-    prefix,
-    additionalAttributes,
-    publishConfig: {
-      messages,
-      flowType
-    }
+  await dynamodbSharedLib.updateItem(
+    _izContext,
+    tableSteps,
+    { awaitingStepId, pendingStepId },
+    data
+  );
+
+  _izContext.logger.debug('[Lib:updateAwaitingMultipleStep] Output', {
+    awaitingStepId,
+    data
   });
+
+  return { ...data, awaitingStepId };
 }
 
 export async function findPendingStepAwaitingMultipleSteps(

package/src/awaitingStep.js

@@ -80,26 +80,8 @@ export async function createAwaitingStep(
   );
 }
 
-export async function findPendingStepIdAwaitingStep(
-  _izContext,
-  awaitingStepId
-) {
-  const item = await _findSinglePendingStep(_izContext, awaitingStepId);
-  return item.pendingStepId;
-}
-
 export async function findPendingStep(_izContext, awaitingStepId) {
-  return _findSinglePendingStep(_izContext, awaitingStepId);
-}
-
-export async function findPendingStepAwaitingStepWithCallingFlow(
-  _izContext,
-  awaitingStepId
-) {
-  const awaitingStep = await findPendingStep(_izContext, awaitingStepId);
-  const { callingFlowConfig = null, ...restAwaitingStep } = awaitingStep;
-
-  return [restAwaitingStep, callingFlowConfig];
+ return _findSinglePendingStep(_izContext, awaitingStepId);
 }
 
 export async function removeAwaitingStep(