@izara_project/izara-market-library-service-schemas 1.0.81 → 1.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.81",
+  "version": "1.0.82",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -21,24 +21,25 @@
   },
   "type": "module",
   "dependencies": {
+    "@izara_project/izara-core-library-asynchronous-flow": "^1.0.19",
     "@izara_project/izara-core-library-calling-flow": "^1.0.4",
-    "@izara_project/izara-core-library-core": "^1.0.28",
-    "@izara_project/izara-core-library-dynamodb": "^1.0.12",
-    "@izara_project/izara-core-library-external-request": "^1.0.22",
-    "@izara_project/izara-core-library-graph-service": "1.0.16",
+    "@izara_project/izara-core-library-core": "^1.0.31",
+    "@izara_project/izara-core-library-dynamodb": "^1.0.13",
+    "@izara_project/izara-core-library-external-request": "^1.0.23",
+    "@izara_project/izara-core-library-graph-service": "1.0.17",
     "@izara_project/izara-core-library-lambda": "^1.0.6",
     "@izara_project/izara-core-library-logger": "^1.0.8",
-    "@izara_project/izara-core-library-s3": "^1.0.3",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.102",
+    "@izara_project/izara-core-library-s3": "^1.0.5",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.104",
     "@izara_project/izara-core-library-sns": "^1.0.7",
     "@izara_project/izara-core-library-sqs": "^1.0.5",
     "@izara_project/izara-shared": "^1.0.126",
-    "@izara_project/izara-shared-core": "^1.0.6",
-    "@izara_project/izara-shared-service-schemas": "^1.0.33",
+    "@izara_project/izara-shared-core": "^1.0.8",
+    "@izara_project/izara-shared-service-schemas": "^1.0.35",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",
-    "yaml": "^2.8.1"
+    "yaml": "^2.8.2"
   }
 }

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -19,13 +19,13 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 import lodash from 'lodash';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import { NoRetryError, inMemoryCacheLib } from '@izara_project/izara-core-library-core';
+import { NoRetryError, inMemoryCacheLib, validator as validateObject } from '@izara_project/izara-core-library-core';
 import { sns, sqs } from '@izara_project/izara-core-library-external-request';
 import { getObjectSchema, validator as validatorSchema, serviceConfig, utils, consts as coreConsts, explodedReqParams, deliminatorTree } from '@izara_project/izara-core-library-service-schemas'
 import Logger from "@izara_project/izara-core-library-logger";
 
 import { validateObjType } from '@izara_project/izara-shared-service-schemas';
-import { validator as validateObject } from "@izara_project/izara-core-library-core"
+
 // core libs
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow'

package/src/MainLibs/src/Utils.js

@@ -39,8 +39,8 @@ function checkOverWriteGenerateMainFunction(objectSchema, action) {
   return overWriteStatus
 }
 
-function getLocalConfig(srcPath, params) {
-  const configPath = path.join(srcPath, '../config/serverless.config.yml');
+function getLocalConfig(params) {
+  const configPath = path.join(process.cwd(), '../config/serverless.config.yml');
   const serverlessConfig = fs.readFileSync(configPath, 'utf8');
   const config = yaml.parse(serverlessConfig);
   const returnConfig = config.main_config[params];

package/src/reStructure/GenerateTests.js

@@ -30,10 +30,11 @@ import generateTest from './TemplateData/IntTest/generateTests/generateTemplate.
 
 import lib from '../reStructure/TemplateData/IntTest/libs/libs.js';
 const { getLocalConfig } = lib;
+import uploadLib from '../reStructure/TemplateData/IntTest/upload/uploadIntTest.js'
 async function generateCodeWithTemplate(_izContext, savePath, settings) {
   _izContext.logger.debug("START", { savePath, settings })
   try {
-
+    const serviceTag = getLocalConfig("iz_serviceTag")
     let packagePath = path.join(__dirname, "../../")
     // console.log({ packagePath });
     // ---------  Prepare path  -------------
@@ -108,10 +109,10 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     console.log('Generated all source files successfully');
 
     console.log("upload file to S3")
-    const intTestPath = join(saveFilePath, `../../src/generateIntegrationTest/${getLocalConfig("iz_serviceTag")}`)
+    const intTestPath = join(saveFilePath, `../../src/generateIntegrationTest/${serviceTag}`)
     console.log({ intTestPath })
 
-    // uploadLib(intTestPath, settings)
+    await uploadLib(intTestPath, { s3Prefix: settings, serviceTag: serviceTag })
 
 
     // exec(`bash ${ path.join(packagePath, "./frontEnd/NpmBash.bash") } `, (error, stdout, stderr) => {

package/src/reStructure/TemplateData/IntTest/generateTests/tests/data.js

@@ -153,7 +153,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
             }
           }
 
-          Object.assign(baseIntTest, { stage: stages })
+          Object.assign(baseIntTest, { stages: stages })
 
           // console.log("baseIntTest", JSON.stringify(baseIntTest, null, 2));
 

package/src/reStructure/TemplateData/IntTest/libs/libs.js

@@ -4,6 +4,7 @@ import yaml from "yaml";
 import fs from 'fs';
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 const { getDataFromPath } = getObjectSchema;
+
 function lowercaseFirst(str) {
   if (!str) return "";
   return str[0].toLowerCase() + str.slice(1);

package/src/reStructure/TemplateData/IntTest/upload/uploadIntTest.js

@@ -25,36 +25,56 @@ import Logger from "@izara_project/izara-core-library-logger";
 
 const _izContext = { Logger }
 
-async function uploadFolder(folderPath, s3Prefix) {
-  let objectToUploads = [];
-  const entries = fs.readdirSync(folderPath, { withFileTypes: true });
-  for (const entry of entries) {
-    const fullPath = path.join(folderPath, entry.name);
-    const s3Key = path.join(s3Prefix, entry.name).replace(/\\/g, "/"); // path for user upload
-
-    if (entry.isDirectory()) {
-      await uploadFolder(fullPath, s3Key);
-    } else {
+async function uploadFolder(folderPath, settings) {
+
+  try {
+
+    const files = getAllFiles(folderPath);
+    console.log({ files })
+    for (const filePath of files) {
+      const fileContent = fs.readFileSync(filePath);
+      const index = filePath.indexOf(settings.serviceTag);
+
+      let relativePath;
+      if (index !== -1) {
+        relativePath = filePath.substring(index);
+      } else {
+        relativePath = path.basename(filePath);
+      }
 
-      const fileStream = fs.createReadStream(fullPath);
+      let s3Key = path.join('test_config', settings.s3Prefix, relativePath).split(path.sep).join('/');
       const params = {
-        Bucket: "integrationtest-config-us-east-2",
-        Key: `test_config/${s3Key}`,
-        Body: fileStream,
+        Bucket: 'integrationtest-config-us-east-2',
+        Key: s3Key,
+        Body: fileContent,
+        ContentType: 'application/json'
       };
 
-      objectToUploads.push(s3.putObjectS3(_izContext, params));
+      await s3.putObjectS3(_izContext, params)
 
-      try {
-        await Promise.all(objectToUploads)
-        console.log("uploadComplete to", s3Key)
-        // console.log("Upload-Succuss:", s3Key, "ETag:", result.ETag);
-      } catch (err) {
-        // console.error("Upload-Failed:", s3Key, err);
-        console.log("Upload-Failed");
-      }
     }
+
+  } catch (err) {
+    console.error("Upload Failed:", err);
   }
 }
 
+function getAllFiles(dirPath, filePaths) {
+  const files = fs.readdirSync(dirPath);
+
+  filePaths = filePaths || [];
+
+  files.forEach(function (file) {
+    const fullPath = path.join(dirPath, file);
+
+    if (fs.statSync(fullPath).isDirectory()) {
+      filePaths = getAllFiles(fullPath, filePaths);
+    } else {
+      filePaths.push(fullPath);
+    }
+  });
+
+  return filePaths;
+}
+
 export default uploadFolder;

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/functionYaml/data.js

@@ -36,7 +36,8 @@ const {
   SAVE_FILE_NAME,
   DYNAMO_RESOURCE,
   SOURCE_GENERATE_IAM_ROLE,
-  ACTIONS
+  ACTIONS,
+  FUNCTION_NAME
 } = consts;
 
 const templatePath = path.join(__dirname, 'template.ejs')

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

@@ -21,7 +21,7 @@ import { lambda } from '@izara_project/izara-core-library-external-request';
 import { ApiGatewayManagementApiClient, PostToConnectionCommand } from "@aws-sdk/client-apigatewaymanagementapi";
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 
-const { NoRetryError, inMemoryCacheLib } = require('@izara_project/izara-core-library-core');
+import { NoRetryError, inMemoryCacheLib } from '@izara_project/izara-core-library-core';
 
 const client = new ApiGatewayManagementApiClient({
   endpoint: `https://${process.env.iz_webSocketEndpoint}`

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/handler/template.ejs

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { middlewareHandler as middleware } from "@izara_project/izara-middleware";
+import { middlewareHandler as middleware, response } from "@izara_project/izara-middleware";
 
 export const main = middleware.wrap(async (event, context) => {
 
@@ -63,10 +63,10 @@ export const main = middleware.wrap(async (event, context) => {
     }
 
 
-    return (izara.response.webSocketSuccess());
+    return (response.webSocketSuccess());
 
   } catch (err) {
     event._izContext.logger.error('Error, WebSocketConnect: ', err);
-    return (izara.response.failure(err));
+    return (response.failure(err));
   }
 });

package/src/reStructure/TemplateData/flowSchema/flowSchemaMainFunction/data.js

@@ -22,11 +22,11 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 import { NoRetryError } from '@izara_project/izara-core-library-core';
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
-
+import { getObjectSchema, utils as coreUtils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = coreUtils
 import { consts, utils } from '../../../../MainLibs/index.js';
 const { SOURCE_PATH, STORAGE_TYPES } = consts;
-const { firstLetterUpperCase: upperCase } = utils;
+const { firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 
 const templatePath = path.join(__dirname, "template.ejs");
 const statusFieldTemplate = path.join(__dirname, "../templateByStatusType/statusFieldTemplate.ejs")
@@ -77,6 +77,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       tableName,
       flowSchemaComplete,
       triggerType,
+      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: flowSchema.flowTag })}_Main`
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),

package/src/reStructure/TemplateData/flowSchema/flowSchemaMainFunction/template.ejs

@@ -30,11 +30,7 @@ import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { utils} from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = utils;
 <% if (statusType === "triggerCache") { -%>
-<<<<<<< HEAD
-import triggeredCacheSharedLibV2 from '@izara_project/izara-core-library-trigger-cache';
-=======
 import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
->>>>>>> 80dda49 (- fix bug: fix template for triggerCahce flowSchema, main function and handler)
 <% } else if (statusType === "statusField") { -%>
 import statusFieldSharedLib from '@izara_project/izara-core-library-status-field';
 <% } else if (statusType === "storedCache") { -%>
@@ -82,6 +78,7 @@ export default async function <%- functionName %> (
         flowSchemaComplete: flowSchemaComplete,
         triggerType: triggerType,
         flowTag,
+        queueName
         }) %>
     <% } %>
 

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

@@ -17,11 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-import { middlewareHandler as middleware, validatorSchema } from "@izara_project/izara-middleware";
+import { middlewareHandler as middleware, validatorSchema, consts } from "@izara_project/izara-middleware";
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import consts from '@izara_project/izara-middleware';
 import { postToConnection } from '../../../libs/source/GenerateCodeLibs.js';
 import <%- functionName %> from './<%- functionName %>_Main.js';
 import { utils} from "@izara_project/izara-core-library-service-schemas";

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

@@ -461,7 +461,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         const functionYaml = (await Promise.all(Object.entries(createFlowSchemaTriggerCacheFunctionYaml).map(([type, functionYaml]) => functionYaml(_izContext, flowSchema, saveFilePath)))).flat();
         const mainFunction = Object.entries(createFlowSchemaTriggerCacheMainFunction).flatMap(([type, mainFunction]) => mainFunction(_izContext, flowSchema, saveFilePath));
         const handler = Object.entries(createFlowSchemaTriggerCacheHandler).flatMap(([type, handler]) => handler(_izContext, flowSchema, saveFilePath));
-        const queue = createFlowSchemaTriggerCacheQueue(flowSchema, saveFilePath);
+        const queue = createFlowSchemaTriggerCacheQueue(_izContext, flowSchema, saveFilePath);
         // console.log("functionYaml", JSON.stringify(...functionYaml, null, 2))
         createSourceParams.push(...functionYaml, ...mainFunction, ...handler, ...queue)
         // console.log("Generate triggerCache component")

package/src/reStructure/TemplateData/flowSchema/templateByStatusType/triggerCacheTemplate.ejs

@@ -1,20 +1,20 @@
-  let [triggerCacheStatus, triggerCache] = await triggeredCacheSharedLib.checkTriggeredCacheV2(
-    _izContext,
-    {
-      serviceTag: process.env.iz_serviceTag,
-      flowTag: "<%- flowTag %>"
-    },
-    {
-      //(<identifiersTriggerCacheTable>)
-      //(</identifiersTriggerCacheTable>)
-    },
-    //(<additionalCheckTriggerCacheSetting>)
-    "",      // overWriteUniqueRequestId
-    {},      //flowParams
-    false,   // createIfNotHave
-    {}       // triggerFlowIdentifiers
-    //(</additionalCheckTriggerCacheSetting>)
-  )
+let [triggerCacheStatus, triggerCache] = await triggeredCacheSharedLibV2.checkTriggeredCacheV2(
+  _izContext,
+  {
+    serviceTag: process.env.iz_serviceTag,
+    flowTag: "<%- flowTag %>"
+  },
+  {
+    //(<identifiersTriggerCacheTable>)
+    //(</identifiersTriggerCacheTable>)
+  },
+  //(<additionalCheckTriggerCacheSetting>)
+  "",      // overWriteUniqueRequestId
+  {},      //flowParams
+  false,   // createIfNotHave
+  {}       // triggerFlowIdentifiers
+  //(</additionalCheckTriggerCacheSetting>)
+)
 
 //(<afterCheckTriggerCache>)
 //(</afterCheckTriggerCache>)
@@ -28,11 +28,17 @@ if (triggerCacheStatus !== "process") {
   //(</checkTriggerCacheHook>)
 
   // send message to ProcessTriggerCache
-  let sendMessageToProcessTriggerCache = {
-    MessageBody: JSON.stringify(
-      //(<messageBody>)
-      //(</messageBody>)
-    ),
-    QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, "ProcessTriggerCache<%- flowTag %>HdrSqs")
-  }
 }
+
+//(<processTriggerCacheHook>)
+//(</processTriggerCacheHook>)
+let sendMessageToProcessTriggerCache = {
+  MessageBody: JSON.stringify(
+    //(<messageBody>)
+    //(</messageBody>)
+  ),
+  QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, "<%- queueName %>")
+}
+
+await sqs.sendMessage(_izContext, sendMessageToProcessTriggerCache)
+_izContext.logger.debug("after send message to <%- queueName %>", sendMessageToProcessTriggerCache)

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/mainFunction/template.ejs

@@ -19,6 +19,8 @@ along with this program. If not, see
 'use strict';
 
 const { getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
+import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -58,7 +60,7 @@ export default async function <%- functionName %> (
       serviceTag: topicName[0]
     })
 
-    let checkTriggerCache = await triggeredCacheSharedLib.checkTriggeredCacheV2(
+    let checkTriggerCache = await triggeredCacheSharedLibV2.checkTriggeredCacheV2(
       _izContext,
       {                                    // flowType
         serviceTag: topicName[0],

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/functionYaml/data.js

@@ -21,7 +21,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);;
 import { NoRetryError } from '@izara_project/izara-core-library-core';
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { getObjectSchema, utils as coreUtils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = coreUtils;
 import { consts, utils } from '../../../../../../MainLibs/index.js';
 
 const {
@@ -38,7 +39,7 @@ const {
   shortNameHandler,
   STORAGE_TYPES
 } = consts;
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 const templatePath = path.join(__dirname, './template.ejs')
 
 /**
@@ -55,9 +56,12 @@ async function data(_izContext, flowSchema, srcPath) {
 
 async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag)
+  // let functionName = createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
-  let queueName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag) + handlerType;
+  // let queueName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag) + handlerType;
+  let queueName = `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })}_Main`
+
 
   additionalResourcePermission.push(
     createIamRole(

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/functionYaml/template.ejs

@@ -5,6 +5,7 @@
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
+  events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
         batchSize: 10

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/handler/data.js

@@ -16,17 +16,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-import path from 'path';;
+import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);;
+const __dirname = path.dirname(__filename);
+import { utils as coreUtils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = coreUtils;
+
 import { consts, utils } from '../../../../../../MainLibs/index.js';
 
 const {
   SOURCE_PATH,
   HANDLER,
 } = consts;
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 const templatePath = path.join(__dirname, 'template.ejs');
 
 /**
@@ -43,8 +46,9 @@ function data(_izContext, flowSchema, srcPath) {
 
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag)
+  // let functionName = createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })
   let handlerType = upperCase(HANDLER.hdrSqs)
-  let queueName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag) + handlerType;
+  let queueName = `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })}_Main`
 
 
   return {

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/mainFunction/data.js

@@ -16,16 +16,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-import path from 'path';;
+import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);;
+const __dirname = path.dirname(__filename);
+import { utils as coreUtils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = coreUtils;
+
 import { consts, utils } from '../../../../../../MainLibs/index.js';
 const {
   SOURCE_PATH,
   HANDLER,
 } = consts;
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 const templatePath = path.join(__dirname, './template.ejs')
 
 /**
@@ -42,15 +45,12 @@ function data(_izContext, flowSchema, srcPath) {
 
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag)
-  let handlerType = upperCase(HANDLER.hdrSqs)
-  let queueName = "ProcessTriggerCache" + upperCase(flowSchema.flowTag) + handlerType;
-
+  // let functionName = createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig("iz_serviceTag"), flowTag: upperCase(flowSchema.flowTag) })
 
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
-      queueName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/mainFunction/template.ejs

@@ -18,6 +18,8 @@ along with this program. If not, see
 
 'use strict';
 
+import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -48,7 +50,7 @@ export default async function <%- functionName %>(
     _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
-    let checkTriggerResetedV2 = await triggeredCacheSharedLib.checkTriggerResetedV2(
+    let checkTriggerResetedV2 = await triggeredCacheSharedLibV2.checkTriggerResetedV2(
       _izContext,
       {                                    // flowType
         serviceTag: process.env.iz_serviceTag,

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/triggerCacheQueue/data.js

@@ -17,10 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-import path from 'path';;
+import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);;
+const __dirname = path.dirname(__filename);
+import { utils as coreUtils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = coreUtils;
 import { consts, utils } from '../../../../../MainLibs/index.js';
 
 const {
@@ -29,7 +31,7 @@ const {
   SAVE_FILE_NAME
 } = consts;
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 const templatePath = path.join(__dirname, 'template.ejs');
 
 /**
@@ -42,9 +44,10 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @returns {Object[]}              - data of multiple dynamoDb template
  */
 
-function createDataForDefaultSnsInSqs(flowSchema, srcPath) {
+function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
   let flowTag = upperCase(flowSchema.flowTag)
+  let serviceTag = getLocalConfig("iz_serviceTag")
   // console.log("create topic by flowSteps", flowSteps)
   const setting = {
     initialData: "Resources:\n",
@@ -56,7 +59,8 @@ function createDataForDefaultSnsInSqs(flowSchema, srcPath) {
 
   let generateTriggerCacheQueueNames = [
     {
-      queueName: "ProcessTriggerCache" + upperCase(flowTag) + upperCase(HANDLER.hdrSqs)
+      // queueName: "ProcessTriggerCache" + upperCase(flowTag) + upperCase(HANDLER.hdrSqs)
+      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: serviceTag, flowTag: upperCase(flowTag) })}_Main`
     },
     {
       queueName: "CheckTriggerCache" + upperCase(flowTag) + "Complete" + upperCase(HANDLER.hdrSqs)

package/src/reStructure/TemplateData/flowSchema/triggerCacheComponent/triggerCacheQueue/template.ejs

@@ -1,22 +1,22 @@
 #------- queue ---------
-  <%- queueName %>:
+  <%- resourceNameFromQueueName(queueName) %>:
     Type: "AWS::SQS::Queue"
     Properties:
       QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
       RedrivePolicy:
         deadLetterTargetArn: #!GetAtt
           Fn::GetAtt:
-            - <%- queueName %>DLQ
+            - <%- resourceNameFromQueueName(queueName) %>DLQ
             - Arn
         maxReceiveCount: 3
       VisibilityTimeout: 120
 
-  <%- queueName %>DLQ:
+  <%- resourceNameFromQueueName(queueName) %>DLQ:
     Type: AWS::SQS::Queue
     Properties:
       QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
 
-  <%- queueName %>Policy:
+  <%- resourceNameFromQueueName(queueName) %>Policy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -27,14 +27,20 @@
             Principal: "*"
             Resource: #!GetAtt
               Fn::GetAtt:
-                - <%- queueName %>
+                - <%- resourceNameFromQueueName(queueName) %>
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>
+        - Ref: <%- resourceNameFromQueueName(queueName) %>
   #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
   #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
 
+<% function resourceNameFromQueueName(queueName) {
+  if (queueName.includes("_")) {
+    queueName = queueName.split("_").join("")
+  }
+  return queueName
+} %>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/perActionComplete/create/mainFunction/template.ejs

@@ -145,6 +145,9 @@ export default async function createObjectComplete (
             errorsFound: errorsFound
           }
 
+          //(<beforeSendMessage>)
+          //(</beforeSendMessage>)
+
           messageObject = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, messageObject)
           let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {})
 

package/src/reStructure/TemplateData/relationshipPerAction/changeRelationship/action/functionYaml/data.js

@@ -118,7 +118,7 @@ function createParamForCreateSource(handlerType, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.changeRel)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
-      serviceTag: getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag"),
+      serviceTag: getLocalConfig("iz_serviceTag"),
       apiTemplate,
       dsqTemplate,
       invTemplate,

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/data.js

@@ -143,7 +143,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.createRel)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
-      serviceTag: getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag"),
+      serviceTag: getLocalConfig("iz_serviceTag"),
       apiTemplate,
       dsqTemplate,
       invTemplate,

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/data.js

@@ -144,7 +144,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.deleteRel)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
-      serviceTag: getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag"),
+      serviceTag: getLocalConfig("iz_serviceTag"),
       apiTemplate,
       dsqTemplate,
       invTemplate,

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/data.js

@@ -145,7 +145,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.getRel)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
-      serviceTag: getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag"),
+      serviceTag: getLocalConfig("iz_serviceTag"),
       apiTemplate,
       dsqTemplate,
       invTemplate,

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/functionYaml/data.js

@@ -121,7 +121,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.moveRel)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
-      serviceTag: getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag"),
+      serviceTag: getLocalConfig("iz_serviceTag"),
       apiTemplate,
       dsqTemplate,
       invTemplate,

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/data.js

@@ -138,7 +138,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.updateRel)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
-      serviceTag: getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag"),
+      serviceTag: getLocalConfig("iz_serviceTag"),
       apiTemplate,
       dsqTemplate,
       invTemplate,