@izara_project/izara-market-library-service-schemas 1.0.35 → 1.0.36

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

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
 const {
   SOURCE_PATH,
@@ -32,12 +32,14 @@ const {
   FUNCTION_NAME,
   shortNameHandler,
   externalResourceYaml,
-  SOURCE_GENERATE_IAM_ROLE
+  SOURCE_GENERATE_IAM_ROLE,
+  SQS_RESOURCE,
+  LAMBDA_RESOURCE
 } = require('../../../../../../MainLibs/src/Consts');
 const { TOPIC_NAME_GENERATE_CODE } = require('../../../../../../GenerateCodeLibs/src/Consts');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
 
 const templatePath = path.join(__dirname, "template.ejs");
-const hookTemplate = path.join(__dirname, "./hookTemplate.ejs");
 /**
  * receive objectSchema
  * create data for WebScoket handler template
@@ -46,29 +48,72 @@ const hookTemplate = path.join(__dirname, "./hookTemplate.ejs");
  * @return {{templatePath, templateData,setting}}
  */
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
+async function data(_izContext, flowSchema, srcPath) {
+  return [await createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicEndpoint)
+async function createSourceParams(_izContext, flowSchema, srcPath) {
+  let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = flowSchema.flowTag;
+  let flowSteps = Object.keys(flowSchema.flowSteps)
+  let flowStepsIn = flowSteps[0];
+  let splitFlowStepsOut = flowStepsIn.split("_");
+  let queueName = splitFlowStepsOut[3] + handlerType
+  additionalResourcePermission.push(
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, queueName)
+      ]
+    ),
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.lambda]: Object.values(LAMBDA_RESOURCE)
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.lambda, 'CreateHdrInv')
+      ]
+    ),
+  )
 
-  additionalResourcePermission.push()
+  if (flowSchema.statusType === "storedCache") {
+    let tableStroedCaches = [];
+    const objectSchemaPath = path.join(srcPath, "./schemas")
+    let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objectSchemaPath).then(res => res.records[0])
+    for (const storageResource of Object.values(objectSchema.storageResources)) {
+      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+        if (!tableStroedCaches.includes(storageResource.tableName)) {
+          tableStroedCaches.push(storageResource.tableName)
+        }
+      }
+    }
 
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE)
+        },
+        tableStroedCaches.map(
+          tableName => resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName))
+      )
+    )
+  }
 
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, flowSchema.flowTag, "source/"),
       functionName,
       handlerType,
       additionalResourcePermission,
       route,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic,
+      queueName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/template.ejs

@@ -4,7 +4,7 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow

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

@@ -36,7 +36,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicEndpoint)
+  let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrSqs)
   let route = flowSchema.flowTag;
   let queueName = functionName
@@ -49,7 +49,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

@@ -25,7 +25,7 @@ const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
 
-const FlowSchemaOwnTopicEndpoint = require('./FlowSchemaOwnTopicEndpoint_Main')
+const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {}

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

@@ -18,10 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../MainLibs/src/Consts');
+const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
 const templatePath = path.join(__dirname, "template.ejs");
-const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
+const { STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 const statusFieldTemplate = path.join(__dirname, "../../../createRecordByStatusType/statusFieldTemplate.ejs")
 const storedCacheTemplate = path.join(__dirname, "../../../createRecordByStatusType/storedCacheTemplate.ejs")
 
@@ -34,21 +35,33 @@ const storedCacheTemplate = path.join(__dirname, "../../../createRecordByStatusT
  */
 
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createParamsForCreateSource(_izContext, flowSchema, srcPath)]
+async function data(_izContext, flowSchema, srcPath) {
+  return [await createParamsForCreateSource(_izContext, flowSchema, srcPath)]
 }
 
-function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicEndpoint)
+async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+  let functionName = "Process" + upperCase(flowSchema.flowTag);
+  let tableName;
+  let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0]);
+  for (const storageResource of Object.values(objectSchema.storageResources)) {
+    if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+      tableName = storageResource.tableName
+    }
+  }
+  let flowSchemaComplete = upperCase(flowSchema.flowTag) + "Complete"
   return {
     templatePath: templatePath,
     templateData: {
       statusType: flowSchema.statusType,
       statusFieldTemplate,
       storedCacheTemplate,
+      flowTag: flowSchema.flowTag,
+      functionName,
+      tableName,
+      flowSchemaComplete
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/mainFunction/template.ejs

@@ -31,12 +31,16 @@ const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
 const sqs = externalRequest.sqs
+const lambda = externalRequest.lambda
 const { postToConnection } = require("../../../../libs/source/GenerateCodeLibs");
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
 const { v4: uuidv4 } = require('uuid')
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
+const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs.js')
+
 /**
  *
  *
@@ -52,7 +56,7 @@ const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-librar
  * @returns {object} description of return value
  */
 
-module.exports.FlowSchemaOwnTopicEndpoint = async (
+module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -61,20 +65,26 @@ module.exports.FlowSchemaOwnTopicEndpoint = async (
 ) => {
 
   try {
-    _izContext.logger.debug("flowSchemaOwnTopicEndpoint _izContext", _izContext)
-    _izContext.logger.debug("flowSchemaOwnTopicEndpoint requestParams", requestParams)
-    _izContext.logger.debug("flowSchemaOwnTopicEndpoint callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- functionName %> _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
+
+    let correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID)
+    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
 
     //(<endpointHookMainFunction>)
     //(</endpointHookMainFunction>)
 
+    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+      flowTag: requestParams.action,
+      serviceTag: process.env.iz_serviceTag
+    })
+
     <% if (statusType === "statusField") { %>
       <%- include(statusFieldTemplate) %>
     <% } else if (statusType === "storedCache") { %>
-      <%- include(storedCacheTemplate) %>
-    let messageObject = {
-      requestParams:requestParams
-    }
+      <%- include(storedCacheTemplate, {tableName:tableName}) %>
+    let messageObject = requestParams
 
     //(<beforeSendMessage>)
     //(</beforeSendMessage>)
@@ -84,22 +94,15 @@ module.exports.FlowSchemaOwnTopicEndpoint = async (
       callingFlowSharedLib.addParentCallingFlowConfig(
         callingFlowConfig,
         callingFlowSharedLib.createCallingFlowConfig(
-          await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.flowSchemaOwnTopicComplete), {}
+          await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- flowSchemaComplete %>"), {}
         )
       )
     )
 
-    let sendMessageToEndpointComplete = {
-      Message:JSON.stringify(messageObject),
-      QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, "FlowSchemaOwnTopicEndpointCompleteHdrSqs")
-    }
-    _izContext.logger.debug("sendMessageToEndpointComplete", sendMessageToEndpointComplete)
-    await sqs.sendMessage(_izContext, sendMessageToEndpointComplete)
-
     <% } else if (statusType === "none") { %>
-      let messageObject = {
-        requestParams:requestParams
-      }
+
+      let messageObject = requestParams
+
       // create callingFlow
       messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         messageObject,
@@ -110,22 +113,10 @@ module.exports.FlowSchemaOwnTopicEndpoint = async (
           )
         )
       )
-
-      let sendMessageToEndpointComplete = {
-        Message:JSON.stringify(messageObject),
-        QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, "FlowSchemaOwnTopicEndpointCompleteHdrSqs")
-      }
-      _izContext.logger.debug("sendMessageToEndpointComplete", sendMessageToEndpointComplete)
-      await sqs.sendMessage(_izContext, sendMessageToEndpointComplete)
-
     <% } %>
 
-    let sendMessageToEndpointComplete = {
-      Message:JSON.stringify(messageObject),
-      QueueUrl: await sqsSharedLib.sqsQueueUrl(_izContext, "FlowSchemaOwnTopicEndpointCompleteHdrSqs")
-    }
-    _izContext.logger.debug("sendMessageToEndpointComplete", sendMessageToEndpointComplete)
-    await sqs.sendMessage(_izContext, sendMessageToEndpointComplete)
+    //(<endpointHook>)
+    //(</endpointHook>)
 
     return {
       //(<endpointReturn>)

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

@@ -32,7 +32,8 @@ const {
   FUNCTION_NAME,
   shortNameHandler,
   externalResourceYaml,
-  SOURCE_GENERATE_IAM_ROLE
+  SOURCE_GENERATE_IAM_ROLE,
+  SQS_RESOURCE
 } = require('../../../../../../MainLibs/src/Consts');
 const { TOPIC_NAME_GENERATE_CODE } = require('../../../../../../GenerateCodeLibs/src/Consts');
 
@@ -51,11 +52,16 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicComplete)
+  let functionName = upperCase(flowSchema.flowTag) + "Complete"
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = flowSchema.flowTag;
   let flowStep = Object.keys(flowSchema.flowSteps)
+  let flowStepsIn = flowStep[0];
+  let splitFlowStepsIn = flowStepsIn.split("_");
+  let topicIn = `${splitFlowStepsIn[3]}_${splitFlowStepsIn[4]}`
+  let queueName = functionName + handlerType
+
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -64,7 +70,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, flowStep[0])
+        resourceNames(RESOURCE_CLASSES.sns, topicIn)
       ]
     ),
     createIamRole(
@@ -90,6 +96,14 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.webSocket)
       ]
+    ),
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.sendMessage, SQS_RESOURCE.receiveMessage, SQS_RESOURCE.deleteMessage, SQS_RESOURCE.getQueueAttributes]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, queueName)
+      ]
     )
   )
 
@@ -97,13 +111,14 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, flowSchema.flowTag, "source/"),
       functionName,
       handlerType,
       additionalResourcePermission,
       route,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic,
+      queueName: queueName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaCompleteComponent/functionYaml/template.ejs

@@ -4,13 +4,11 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-          - body: {"MessageAttributes":{"_izContext":{"Value":["x-correlation-connectionId"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"_izContext":{"Value":[{"exists":true}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaCompleteComponent/handler/data.js

@@ -36,7 +36,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicComplete)
+  let functionName = upperCase(flowSchema.flowTag) + "Complete"
   let handlerType = upperCase(HANDLER.hdrSqs)
   let queueName = upperCase(functionName) + upperCase(handlerType);
   return {
@@ -47,7 +47,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

@@ -25,11 +25,11 @@ const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
 
-const FlowSchemaOwnTopicComplete = require('./FlowSchemaOwnTopicComplete_Main')
+const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-
+let perRecordsValidatorSchema = {}
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
   try {
@@ -45,7 +45,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "FlowSchemaOwnTopicComplete", // queue name that need to retry or send to dlq
+        "<%- functionName %>", // queue name that need to retry or send to dlq
         perRecordsValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema   // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -57,8 +57,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
-        FlowSchemaOwnTopicComplete.FlowSchemaOwnTopicComplete, // mainFunction that need to invoke.
-        "FlowSchemaOwnTopicComplete", // queue name that need to retry or send to dlq
+        <%- functionName %>.<%- functionName %>, // mainFunction that need to invoke.
+        "<%- functionName %>", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaCompleteComponent/mainFunction/data.js

@@ -37,12 +37,14 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicComplete)
+  let functionName = `${upperCase(flowSchema.flowTag)}Complete`
   return {
     templatePath: templatePath,
-    templateData: {},
+    templateData: {
+      functionName
+    },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaCompleteComponent/mainFunction/template.ejs

@@ -29,11 +29,13 @@ const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
-const { postToConnection } = require("../../../../libs/source/GenerateCodeLibs");
+const { postToConnection } = require("../../../libs/source/GenerateCodeLibs");
+
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
 const { v4: uuidv4 } = require('uuid')
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
+const consts = require("@izara_project/izara-middleware").consts
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 /**
  *
@@ -50,7 +52,7 @@ const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-librar
  * @returns {object} description of return value
  */
 
-module.exports.FlowSchemaOwnTopicComplete = async (
+module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -59,9 +61,9 @@ module.exports.FlowSchemaOwnTopicComplete = async (
 ) => {
 
   try {
-    _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)
-    _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
-    _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- functionName %> _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
     let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID);
     let correlationId = _izContext.correlationIds.get(coreConsts.X_CORRELATION_ID);

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

@@ -51,11 +51,14 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopic)
+  let functionName = upperCase(flowSchema.flowTag)
   let handlerType = upperCase("hdrWbs")
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = flowSchema.flowTag;
   let flowStep = Object.keys(flowSchema.flowSteps)
+  let flowStepsOut = flowStep[0];
+  let splitFlowStepsIn = flowStepsOut.split("_");
+  let topicIn = `${splitFlowStepsIn[3]}_${splitFlowStepsIn[4]}`
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -64,7 +67,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, flowStep[0])
+        resourceNames(RESOURCE_CLASSES.sns, topicIn)
       ]
     ),
     createIamRole(
@@ -97,7 +100,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, flowSchema.flowTag, "source/"),
       functionName,
       handlerType,
       additionalResourcePermission,

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

@@ -3,8 +3,6 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
-    - websocket:
-        route: $default
     - websocket:
         route: <%- route %>
         # authorizer: ${self:custom.iz_authorizerAppLevel}

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/handler/data.js

@@ -36,7 +36,7 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopic)
+  let functionName = upperCase(flowSchema.flowTag)
   let handlerType = "HdrWbs"
   let route = flowSchema.flowTag;
   return {
@@ -47,7 +47,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       route
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

@@ -26,8 +26,8 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 const hash = require('object-hash')
 // const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
-const { postToConnection } = require("../../libs/source/GenerateCodeLibs");
-const flowSchemaOwnTopic = require('./FlowSchemaOwnTopic_Main');
+const { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
+const <%- functionName %> = require('./<%- functionName %>_Main');
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
   event._izContext.logger.debug('Event:', event);
@@ -58,7 +58,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
           )
 
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
-          await flowSchemaOwnTopic.flowSchemaOwnTopic(
+          await <%- functionName %>.<%- functionName %>(
             event._izContext,
             eventParams,
             callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data.js

@@ -49,16 +49,21 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopic)
-  let topicArn = Object.keys(flowSchema.flowSteps)[0];
+  let functionName = upperCase(flowSchema.flowTag)
+  // let topicArn = Object.keys(flowSchema.flowSteps)[0];
+  let flowStep = Object.keys(flowSchema.flowSteps)
+  let flowStepsIn = flowStep[0];
+  let splitFlowStepsIn = flowStepsIn.split("_");
+  let topicArn = `${splitFlowStepsIn[3]}_${splitFlowStepsIn[4]}`
   return {
     templatePath: templatePath,
     templateData: {
       topicArn,
       flowTag: flowSchema.flowTag,
+      functionName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false