@izara_project/izara-core-library-asynchronous-flow 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-asynchronous-flow",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Shared asynchronous flow logic",
   "main": "index.js",
   "scripts": {
@@ -20,10 +20,10 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@izara_project/izara-core-library-core": "^1.0.16",
-    "@izara_project/izara-core-library-dynamodb": "^1.0.2",
-    "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-logger": "^1.0.6",
-    "@izara_project/izara-core-library-sqs": "^1.0.2"
+    "@izara_project/izara-core-library-core": "^1.0.18",
+    "@izara_project/izara-core-library-dynamodb": "^1.0.4",
+    "@izara_project/izara-core-library-external-request": "^1.0.18",
+    "@izara_project/izara-core-library-logger": "^1.0.7",
+    "@izara_project/izara-core-library-sqs": "^1.0.4"
   }
 }

package/src/AsyncFlowSharedLib.js

@@ -712,18 +712,24 @@ module.exports.checkAndGetTimeCacheComplete = async (
   }
 
   // check if exist and match with initail create not changing in flow.
-  if (!getTimeCacheComplete[uniqueRequestIdFieldName]
-    // || !getTimeCacheComplete[cacheCompleteFieldName]
-    || (getTimeCacheComplete[cacheCompleteFieldName]
-      && getTimeCacheComplete[cacheCompleteFieldName] !== timeCacheComplete
-      && getTimeCacheComplete[statusFieldName] != "complete")
+  // if (!getTimeCacheComplete[uniqueRequestIdFieldName]
+  //   // || !getTimeCacheComplete[cacheCompleteFieldName]
+  //   || (getTimeCacheComplete[cacheCompleteFieldName]
+  //     && getTimeCacheComplete[cacheCompleteFieldName] !== timeCacheComplete
+  //     && getTimeCacheComplete[statusFieldName] != "complete")
+  // ) {
+  //   return [false, getTimeCacheComplete[cacheCompleteFieldName]];
+  // } else {
+  //   return [true, getTimeCacheComplete[cacheCompleteFieldName], getTimeCacheComplete[uniqueRequestIdFieldName]];
+  // }
+
+  if (getTimeCacheComplete[cacheCompleteFieldName]
+    && getTimeCacheComplete[cacheCompleteFieldName] !== timeCacheComplete
   ) {
     return [false, getTimeCacheComplete[cacheCompleteFieldName]];
   } else {
     return [true, getTimeCacheComplete[cacheCompleteFieldName], getTimeCacheComplete[uniqueRequestIdFieldName]];
   }
-
-
 }
 
 
@@ -811,21 +817,24 @@ module.exports.validateStartKeyParam = (
   _izContext,
   startKey,
   partitionKeyFieldName,
-  sortKeyFieldName = null
+  sortKeyFieldName
 ) => {
+  const stringNotEmptyRegex = /^[A-Za-z0-9_-]+$/;
+
+  if (
+    !partitionKeyFieldName || !sortKeyFieldName
+    || !stringNotEmptyRegex.test(partitionKeyFieldName)
+    || !stringNotEmptyRegex.test(sortKeyFieldName)
+  ) {
+    throw new NoRetryError("validateStartKeyParam: Invalid partitionKeyFieldName or sortKeyFieldName");
+  }
 
   if (startKey && Object.keys(startKey).length != 0) {
-    if (
-      startKey.constructor !== Object ||
-      !startKey[partitionKeyFieldName]
-    ) {
-      startKey = false; // we can type check for false to see if invalid
-    }
-    if (sortKeyFieldName !== null && sortKeyFieldName !== undefined && !startKey[sortKeyFieldName]) {
-      startKey = false;
+    if (!startKey[partitionKeyFieldName] || !startKey[sortKeyFieldName]) {
+      throw new NoRetryError("validateStartKeyParam: Invalid startKey, missing partitionKeyFieldName or sortKeyFieldName");
     }
   } else {
-    startKey = null; // if empty set to null so lib functions process correctly (not want empty object)
+    startKey = null; // if empty set to null so lib functions process correctly
   }
 
   return startKey;