@izara_project/izara-market-library-service-schemas 1.0.55 → 1.0.56

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/mainFunction/template.ejs

@@ -32,11 +32,11 @@ const { S3Client, GetObjectCommand, DeleteObjectCommand, PutObjectCommand, CopyO
 const s3 = new S3Client({ region: 'us-east-2' });
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
-const Readable = require('stream');
-const { isValidCsv, getNestObject } = require('../../../../libs/source/GenerateCodeLibs');
 const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
 
+//(<optionalRequired>)
+//(</optionalRequired>)
 
 /**
  * description of function.
@@ -58,331 +58,23 @@ module.exports.processAfterUpload = async (
   _izContext,
   bucket,
   field,
-  importBy = '',
-  importBatchId = '',
-  realImageSize = 0,
+  //(<additionalProperties>)
+  //(</additionalProperties>)
   passBackProperties = {}
 ) => {
 
   try {
 
-    _izContext.logger.debug('----- processImageFile event params ----- ', {
+    _izContext.logger.debug('----- process AfterUpload event params ----- ', {
       bucket: bucket,
       field: field,
-      importBy: importBy,
-      importBatchId: importBatchId,
-      realImageSize: realImageSize,
+      //(<loggerAdditionalParams>)
+      //(</loggerAdditionalParams>)
       passBackProperties: passBackProperties
     })
 
-    let errorsFound = [];
-
-    const objectS3Param = {
-      Bucket: bucket.name,
-      Key: field.key
-    }
-    _izContext.logger.debug("params before getObjectParam::", objectS3Param)
-
-    const fileObjectS3 = await s3.send(new GetObjectCommand(objectS3Param));
-    _izContext.logger.debug("get fileObjectS3", fileObjectS3);
-
-    importBatchId = fileObjectS3.Metadata.importbatchid
-
-    let getImportBatchMain = await lambda.invokeSync(_izContext,
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "ImportBatchMainGetHdrInv"),
-      {
-        identifiers: {
-          importBatchId: importBatchId
-        }
-      }
-    )
-
-    _izContext.logger.debug("getImportBatchMain", getImportBatchMain)
-    _izContext.correlationIds.set(coreConsts.BASE_USER_ID, getImportBatchMain.fields.userId);
-    _izContext.correlationIds.set(coreConsts.TARGET_ID, getImportBatchMain.fields.submittedByUserId);
-
-    let userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
-    let targetId = _izContext.correlationIds.get(coreConsts.TARGET_ID);
-
-    if (Date.now() > getImportBatchMain.fields.expiryTimestamp) {
-      errorsFound.push("url expired can't upload")
-      let sendMessageUpdateUrlExpired = {
-        objInstanceFull: {
-          identifiers: {
-            importBatchId: importBatchId
-          },
-          fields: {
-            importBatchStatus: "urlExpired",
-            errorsFound: "url expired can't upload",
-            processingError: true
-          }
-        }
-      }
-
-      let sendMessageToInImportBatchUpdate = {
-        Message: JSON.stringify(sendMessageUpdateUrlExpired),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, "InImportBatchMainUpdate")
-      };
-
-      _izContext.logger.debug("message param before send to updateImportBatchMain", sendMessageToInImportBatchUpdate);
-      await sns.publishAsync(_izContext, sendMessageToInImportBatchUpdate);
-
-      let deleteFileObjectS3 = await s3.send(new DeleteObjectCommand(objectS3Param));
-      _izContext.logger.debug("Delete object response: ", deleteFileObjectS3)
-
-      return
-    }
-
-    if (fileObjectS3) {
-      if (!importBatchId) {
-        errorsFound.push("cant't get importBatchId from S3 uploaded file");
-      }
-    } else {
-      errorsFound.push("cant't get fileObjectS3 from S3 uploaded file");
-    };
-
-    let fileS3Body = fileObjectS3.Body;
-    _izContext.logger.debug("fileS3Body", fileS3Body);
-
-    let fileS3Buffer = null;
-
-    if (fileS3Body instanceof Readable) {
-      fileS3Buffer = Buffer.concat(await fileS3Body.toArray());
-      _izContext.logger.debug("fileS3Buffer", fileS3Buffer)
-    } else {
-      errorsFound.push('unknown object stream type');
-    }
-
-    // check file type
-    // can be strict in function.yml that only trigger if it specific type of file
-    const srcKey = field.key;
-    const importFieldType = srcKey.match(/\.([^.]*)$/);
-    _izContext.logger.debug("importFieldType", importFieldType);
-    if (!importFieldType) {
-      throw new NoRetryError("error fileType")
-    };
-
-    const importKeyType = utils.firstLetterLowerCase(importFieldType[1]);
-    _izContext.logger.debug("importKeyType", importKeyType);
-
-    if (importKeyType === "csv") {
-      // check valid CSV file
-      let [validCsv, errorCheckCsv] = await isValidCsv(_izContext, fileObjectS3)
-      _izContext.logger.debug("validCsv check::", { validCsv, errorsFound })
-      if (errorCheckCsv.length) {
-        errorsFound.push(errorCheckCsv[0])
-      }
-
-      // check file size
-      let reservedFileSize = getImportBatchMain.fields.fileSize;
-      _izContext.logger.debug("initialFileSize::", reservedFileSize)
-      let s3FileSize = fileObjectS3.ContentLength / 1048576 // convert back to byte unit
-      _izContext.logger.debug("s3FileSize in MiB::", s3FileSize)
-
-      if (s3FileSize < 0.5) { // round up to 1
-        s3FileSize = 1
-      }
-
-      let reservedData = await dynamodbSharedLib.getItem(_izContext,
-        await dynamodbSharedLib.tableName(_izContext, "ReservedDataMain"),
-        {
-          servicePendingId: importBatchId,
-          reservedDataId: `${consts.ACCOUNTLIMIT_TAG.reservedDynamic}_${getImportBatchMain.fields.userId}_${consts.LIMIT_TAG.uploadData}`
-        }
-      )
-      _izContext.logger.debug("reservedData::", reservedData);
-
-      let sizeDiff;
-
-      if (s3FileSize > reservedFileSize) {
-        sizeDiff = s3FileSize - reservedFileSize;
-
-
-        if (sizeDiff < 1) {
-
-          // send message to confirmUsage
-          let confirmUsageMessage = {
-            userId: userId,
-            limitTag: consts.LIMIT_TAG.uploadData,
-            uniqueIdentify: reservedData.uniqueIdentify,
-          }
-
-          let sendMessageToConfirmUsage = {
-            Message: JSON.stringify(confirmUsageMessage),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InConfirmUsage', consts.EXTERNAL_SERVICE_NAME.accountLimits)
-          };
-          _izContext.logger.debug("sendMessageToConfirmUsage", sendMessageToConfirmUsage);
-          await sns.publishAsync(_izContext, sendMessageToConfirmUsage);
-
-          let sendMessageToUpdateImportBatchStatus = {
-            objInstanceFull: {
-              identifiers: {
-                importBatchId: servicePendingId
-              },
-              fields: {
-                importBatchStatus: 'uploadComplete'
-              }
-            }
-          }
-
-          let sendMessageToUpdateImportBatch = {
-            Message: JSON.stringify(sendMessageToUpdateImportBatchStatus),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, `InImportBatchMainUpdate`)
-          };
-          _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
-          await sns.publishAsync(_izContext, sendMessageToUpdateImportBatch);
-
-        }
-      } else if (s3FileSize < reservedFileSize) {
-        sizeDiff = reservedFileSize - s3FileSize;
-
-        if (sizeDiff < 1) {
-          let confirmUsageMessage = {
-            userId: userId,
-            limitTag: consts.LIMIT_TAG.uploadData,
-            uniqueIdentify: reservedData.uniqueIdentify,
-          }
-
-          let sendMessageToConfirmUsage = {
-            Message: JSON.stringify(confirmUsageMessage),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InConfirmUsage', consts.EXTERNAL_SERVICE_NAME.accountLimits)
-          };
-          _izContext.logger.debug("sendMessageToConfirmUsage", sendMessageToConfirmUsage);
-          await sns.publishAsync(_izContext, sendMessageToConfirmUsage);
-
-          let sendMessageToUpdateImportBatchStatus = {
-            objInstanceFull: {
-              identifiers: {
-                importBatchId: servicePendingId
-              },
-              fields: {
-                importBatchStatus: 'uploadComplete'
-              }
-            }
-          }
-
-          let sendMessageToUpdateImportBatch = {
-            Message: JSON.stringify(sendMessageToUpdateImportBatchStatus),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, `InImportBatchMainUpdate`)
-          };
-          _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
-          await sns.publishAsync(_izContext, sendMessageToUpdateImportBatch);
-
-        } else {
-          let realFileSize = Math.round(s3FileSize);
-          // cancel reserved -> new reserved -> confirm
-          // cancel
-          let sendMessageToCancelReserved = {
-            Message: JSON.stringify({
-              userId: userId,
-              limitTag: consts.LIMIT_TAG.uploadData,
-              uniqueIdentify: reservedData.uniqueIdentify
-            }),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InCancelUsage', consts.EXTERNAL_SERVICE_NAME.accountLimits)
-          };
-          _izContext.logger.debug("sendMessageToCancelReserved", sendMessageToCancelReserved);
-          await sns.publishAsync(_izContext, sendMessageToCancelReserved);
-
-          // new reserved
-          let originTimestamp = Date.now();
-          let messageObjReserved = {
-            userId: userId,
-            limitTag: consts.LIMIT_TAG.uploadData,
-            value: realFileSize,
-            rbacType: consts.RBAC_TYPE.appLevel,
-            usedTimestamp: originTimestamp,
-            targetUserId: targetId
-          }
-
-          let callingFlowProperties = {
-            identifier: {
-              servicePendingId: importBatchId,
-              reservedDataId: `${consts.ACCOUNTLIMIT_TAG.reservedDynamic}_${getImportBatchMain.fields.userId}_${consts.LIMIT_TAG.uploadData}`,
-              userId: getImportBatchMain.fields.userId,
-              realSize: realFileSize
-            }
-          }
-
-          messageObjReserved = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-            messageObjReserved,
-            callingFlowSharedLib.createCallingFlowConfig(
-              await lambdaSharedLib.lambdaFunctionName(_izContext, "ConfirmNewReservedHdrSqs"),
-              callingFlowProperties
-            )
-          )
-          _izContext.logger.debug('after add callingFlow: ', messageObjReserved)
-
-          let sendMessageToReservedDynamic = {
-            Message: JSON.stringify(messageObjReserved),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InReservedDynamicUsage', consts.EXTERNAL_SERVICE_NAME.accountLimits)
-          };
-
-          _izContext.logger.debug("sendMessageToReservedDynamic", sendMessageToReservedDynamic);
-          await sns.publishAsync(_izContext, sendMessageToReservedDynamic);
-        };
-      } else if (s3FileSize === reservedFileSize) {
-        let confirmUsageMessage = {
-          userId: getImportBatchMain.fields.userId,
-          limitTag: consts.LIMIT_TAG.uploadData,
-          uniqueIdentify: reservedData.uniqueIdentify,
-        }
-
-        let sendMessageToConfirmUsage = {
-          Message: JSON.stringify(confirmUsageMessage),
-          TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InConfirmUsage', consts.EXTERNAL_SERVICE_NAME.accountLimits)
-        };
-        _izContext.logger.debug("sendMessageToConfirmUsage", sendMessageToConfirmUsage);
-        await sns.publishAsync(_izContext, sendMessageToConfirmUsage);
-
-        let sendMessageToUpdateImportBatchStatus = {
-          objInstanceFull: {
-            identifiers: {
-              importBatchId: servicePendingId
-            },
-            fields: {
-              importBatchStatus: 'uploadComplete'
-            }
-          }
-        }
-
-        let sendMessageToUpdateImportBatch = {
-          Message: JSON.stringify(sendMessageToUpdateImportBatchStatus),
-          TopicArn: await snsSharedLib.snsTopicArn(_izContext, `InImportBatchMainUpdate`)
-        };
-        _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
-        await sns.publishAsync(_izContext, sendMessageToUpdateImportBatch);
-
-      }
-
-    } else {
-      errorsFound.push("error importKeyType")
-    }
-
-    if (errorsFound.length) { // if error send message to update error in importBatchMain
-      let updateImportBatchMainError = {
-        objInstanceFull: {
-          identifiers: {
-            importBatchId: importBatchId
-          },
-          fields: {
-            importBatchStatus: "errorToUpload",
-            errorsFound: errorsFound,
-            processingError: true
-          }
-        }
-      }
-
-      let sendMessageToUpdateImportBatchMain = {
-        Message: JSON.stringify(updateImportBatchMainError),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, "InImportBatchMainUpdate")
-      };
-      _izContext.logger.debug('sendMessageToUpdateImportBatchMain::', sendMessageToUpdateImportBatchMain);
-      await sns.publishAsync(_izContext, sendMessageToUpdateImportBatchMain);
-
-      let deleteFileObjectS3 = await s3.send(new DeleteObjectCommand(objectS3Param));
-      _izContext.logger.debug("Delete object response: ", deleteFileObjectS3)
-
-    }
+    //(<endpointHook>)
+    //(</endpointHook>)
 
   } catch (err) {
     _izContext.logger.error('error ProcessImageAfterUploadMain: ', err)

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/libs/template.ejs

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const lambda = externalRequest.lambda;
-
+const lambdaSharedLib = require('@izara_project/izara-core-library-lambda')
 const { ApiGatewayManagementApiClient, PostToConnectionCommand } = require("@aws-sdk/client-apigatewaymanagementapi");
 const hash = require('@izara_project/izara-shared-core').objectHash;
 <% if (uploadS3) { %>
@@ -57,17 +57,17 @@ async function postToConnection(message, connectionId) {
  * @param {string} functionName
  * @param {Object} payload
  */
-async function getDataFromInvokeFunction(_izContext, functionName, payload) {
+async function processStaticLimit(_izContext, functionName, payload) {
   return await lambda.invokeSync(_izContext, functionName, payload)
 }
 
-const getDataFromInvokeFunctionWithCache = inMemoryCacheLib(
-  getDataFromInvokeFunction,
+const processStaticLimitWithCache = inMemoryCacheLib(
+  processStaticLimit,
   {
     max: 100,
     maxAge: 86400000,
     promise: true,
-    profileName: "getDataFromInvokeFunction",
+    profileName: "processStaticLimit",
     normalizer: function (args) {
       return hash(args[1], args[2])
     }

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/data.js

@@ -111,7 +111,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), "source/"),
       functionName,
       handlerType,
       additionalResourcePermission,

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/handler/template.ejs

@@ -39,6 +39,10 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       const connectionId = event.requestContext.connectionId;
       let correlationId = event._izContext.correlationIds.get(consts.X_CORRELATION_ID)
 
+      //(<createIdentifiersFlow>)
+      let identifiers
+      //(</createIdentifiersFlow>)
+
       switch (route) {
 
         case '$default':
@@ -47,16 +51,35 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
         case '<%- route %>':
           console.log("event in route webSocket", event);
           let eventParams = JSON.parse(event.body)
-
-          await dynamodbSharedLib.putItem(
+          let flowSchema = getObjectSchema.getFlowSchemaS3WithCache(
             event._izContext,
-            await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
             {
-              taskKey: correlationId,
-              connectionId: connectionId,
+              flowTag: "<%- route %>",
+              serviceTag: process.env.iz_serviceTag
             }
           )
 
+          if (flowSchema.statusType === "statusField" || flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
+            await dynamodbSharedLib.putItem(event._izContext,
+              await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
+              {
+                taskKey: `${utils.createFlowTypeConcat(event._izContext, { flowTag: "<%- route %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
+                connectionId: connectionId,
+              }
+            )
+
+          } else if (flowSchema.statusType === "none") {
+            await dynamodbSharedLib.putItem(
+              event._izContext,
+              await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
+              {
+                taskKey: `${utils.createFlowTypeConcat(event._izContext, { flowTag: "<%- route %>", serviceTag: process.env.iz_serviceTag })}${correlationId}`,
+                connectionId: connectionId,
+              }
+            )
+          }
+
+
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
           await <%- functionName %>.<%- functionName %>(
             event._izContext,

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-in/data.js

@@ -72,17 +72,17 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   let defaultDsqQueueDataList = [];
 
-  if (flowSchema.outputTopic) {
-    if (flowSteps.includes("Out")) {
-      if (flowSchema.outputTopic) {
-        defaultDsqQueueDataList.push(
-          {
-            queueName: upperCase(topicIn) + "CompleteHdrSqs"
-          }
-        )
-      }
-    }
-  }
+  // if (flowSchema.outputTopic) {
+  //   if (flowSteps.includes("Out")) {
+  //     if (flowSchema.outputTopic) {
+  //       defaultDsqQueueDataList.push(
+  //         {
+  //           queueName: upperCase(topicIn) + "CompleteHdrSqs"
+  //         }
+  //       )
+  //     }
+  //   }
+  // }
 
 
   for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {

package/src/reStructure/TemplateData/flowSchema/generateTemplateData.js

@@ -199,15 +199,15 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
           // const webSocketCreateObjectStordCache = createWebSocketCreateObjectStoredCache(_izContext, saveFilePath);
 
-          const getPreSignUrlFunctionYaml = createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
-          const getPreSignUrlHandler = createReservedLimitHandler(_izContext, flowSchema, saveFilePath);
-          const getPreSignUrlMainFunction = createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
-          const getPreSignUrlQueue = createReservedLimitQueueName(_izContext, saveFilePath);
+          const reservedLimitFunctionYaml = createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
+          const reservedLimitHandlerFunction = createReservedLimitHandler(_izContext, flowSchema, saveFilePath);
+          const reservedLimitMainFunction = await createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
+          const reservedLimitQueueName = createReservedLimitQueueName(_izContext, saveFilePath);
 
-          const reservedLimitCompleteFunctionYaml = createPresignUrlFunctionYaml(_izContext, flowSchema, saveFilePath);
-          const reservedLimitCompleteMainFunction = createPresignUrlMainFunction(_izContext, flowSchema, saveFilePath);
-          const reservedLimitCompleteHandler = createPresignUrlHandler(_izContext, flowSchema, saveFilePath);
-          const reservedLimitCompleteQueue = createPresignUrlQueueName(_izContext, saveFilePath);
+          const presignUrlFunctionYaml = createPresignUrlFunctionYaml(_izContext, flowSchema, saveFilePath);
+          const presignUrlMainFunction = createPresignUrlMainFunction(_izContext, flowSchema, saveFilePath);
+          const presignUrlHandlerFunction = createPresignUrlHandler(_izContext, flowSchema, saveFilePath);
+          const presignUrlQueueName = createPresignUrlQueueName(_izContext, saveFilePath);
 
           const processAfterUploadFunctionYmlS3 = createProcessAfterUploadS3FunctionYmlS3(_izContext, flowSchema, saveFilePath);
           // const processAfterUploadFunctionYamlHdrDsq = createProcessAfterUploadS3FunctionYmlDsq(_izContext, saveFilePath);
@@ -232,17 +232,17 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           ];
 
           const getPreSignUrlResources = [
-            ...getPreSignUrlFunctionYaml,
-            ...getPreSignUrlHandler,
-            ...getPreSignUrlMainFunction,
-            ...getPreSignUrlQueue
+            ...reservedLimitFunctionYaml,
+            ...reservedLimitHandlerFunction,
+            ...reservedLimitMainFunction,
+            ...reservedLimitQueueName
           ];
 
           const reservedLimitResources = [
-            ...reservedLimitCompleteFunctionYaml,
-            ...reservedLimitCompleteHandler,
-            ...reservedLimitCompleteMainFunction,
-            ...reservedLimitCompleteQueue
+            ...presignUrlFunctionYaml,
+            ...presignUrlHandlerFunction,
+            ...presignUrlMainFunction,
+            ...presignUrlQueueName
           ];
 
           const processAfterUploadResources = [

package/src/reStructure/TemplateData/flowSchema/register/complete/handler/template.ejs

@@ -52,6 +52,9 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.TopicArn)
       passOnProperties.push(record.body.Message)
+      //(<additionalParams>)
+      //(</additionalParams>)
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/reStructure/TemplateData/flowSchema/register/complete/mainFunction/template.ejs

@@ -53,9 +53,9 @@ module.exports.registerCompleteMain = async (
   _izContext,
   topicArn,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
   try {
     _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/handler/template.ejs

@@ -51,7 +51,11 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       );
 
       // add argument (to invoke lambda) to passOnProperties[]
+      passOnProperties.push(record.body.TopicArn)
       passOnProperties.push(record.body.Message)
+      //(<additionalParams>)
+      //(</additionalParams>)
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/mainFunction/template.ejs

@@ -56,10 +56,11 @@ const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-librar
 
 module.exports.<%- functionName %> = async (
   _izContext,
+  topicArn,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
 
   try {
@@ -68,15 +69,43 @@ module.exports.<%- functionName %> = async (
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
     let correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID);
+    if (!topicArn) {
+      throw new NoRetryError('not have TopicArn for get FlowSchemas')
+    }
+
+    let topicName = topicArn.spilt(":")[5].split("_")
 
+    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+      flowTag: topicName[2],
+      serviceTag: topicName[0]
+    })
+
+    //(<createIdentifiersFlow>)
+      let identifiers
+    //(</createIdentifiersFlow>)
+
+    if (!flowSchema) {
+      throw new NoRetryError("not have flowSchema in S3")
+    }
 
-    let wbsTasks = await dynamodbSharedLib.query(
-      _izContext,
-      await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
-      {
-        taskKey: correlationId,
+    let wbsTasks; 
+    if (flowSchema.statusType === "statusField" || flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
+      wbsTasks = await dynamodbSharedLib.query(
+        _izContext,
+        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
+        {
+          taskKey: `${createFlowTypeConcat(_izContext,{flowTag: topicName[2],serviceTag: topicName[0]})}${identifiers}`
+        }
+      )
+    } else if (flowSchema.statusType === "none") {
+      wbsTasks = await dynamodbSharedLib.query(
+        _izContext,
+        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
+        {
+          taskKey: correlationId,
+        }
+      )
       }
-    )
 
     if (wbsTasks.Items.length) {
       await Promise.all(wbsTasks.Items.map(async ({ connectionId }) => {

package/src/reStructure/TemplateData/perActionEndpoint/handler/api/template.ejs

@@ -29,8 +29,8 @@ const {
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
 validateSchemaMiddleware(

package/src/reStructure/TemplateData/perActionEndpoint/handler/dsq/template.ejs

@@ -29,8 +29,8 @@ const recordHandlerSharedLib = require('@izara_project/izara-core-library-record
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
 middleware.setValidatorSchema(

package/src/reStructure/TemplateData/perActionEndpoint/handler/sqs/template.ejs

@@ -29,8 +29,8 @@ const recordHandlerSharedLib = require('@izara_project/izara-core-library-record
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
 middleware.setValidatorSchema(

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/data.js

@@ -88,8 +88,7 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
   // const objectType = objectSchema.objectType; // main objectType
   let propertyValue = settings.propertyValueTag
   const storageResources = objectSchema.storageResources // storageResource from main objectType
-  const serviceTag = getLocalConfig(srcPath, "iz_serviceTag")
-
+  const serviceTag = getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag")
   attributeRelationships.push(
     { // has{objectType}propertyValue
       relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(propertyValue) + PROPERTY_VALUE_TAG.property,