@izara_project/izara-market-library-service-schemas 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/GenerateCodeLibs/src/Consts.js

@@ -61,7 +61,8 @@ const TOPIC_NAME_GENERATE_CODE = {
   getNodeComplete: "GetNodeComplete",
   outGetNodeComplete: "GetNodeComplete_Out",
   reservedLimitComplete: "ReservedLimitComplete",
-  createPresignUrl: "CreatePresignUrl"
+  createPresignUrl: "CreatePresignUrl",
+  flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete"
 }
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/MainLibs/src/Consts.js

@@ -111,12 +111,15 @@ const SOURCE_PATH = {
   translateIdsRequestFile: '../src/generatedCode/TranslateId/source/',
   processLogical: "../src/generatedCode/ProcessLogical/source/",
   resourceLocationPerAction: 'src/generatedCode/ObjectTypePerActionEndpoint/source/',
-  resourceLocationFindData: 'src/generatedCode/FindData/source',
+  resourceLocationFindData: 'src/generatedCode/FindData/source/',
+  resourceLocationFindData: 'src/generatedCode/FindData/source/',
   resourceLocationRelationshipPerAction: 'src/generatedCode/RelationshipPerAction/source/',
   resourceLocationTranslateId: 'src/generatedCode/TranslateId/source/',
   resourceLocationProcessLogical: "src/generatedCode/ProcessLogical/source/",
-  webSocket: "../src/generatedCode/FlowSchema/source/",
-  resourceLocationWebSocket: "src/generatedCode/FlowSchema/source/",
+  webSocket: "../src/generatedCode/FlowSchema/UploadS3/",
+  resourceLocationWebSocket: "src/generatedCode/FlowSchema/UploadS3/",
+  flowSchemaOwnTopic: "../src/generatedCode/FlowSchema/FlowSchemaOwnTopic/",
+  resourceLocationFlowSchemaOwnTopic: "src/generatedCode/flowSchemaOwnTopic/UploadS3/",
   generateCodeLib: "../src/generatedCode/libs/source/",
   logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
   resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
@@ -250,7 +253,9 @@ const FUNCTION_NAME = {
   getRel: "getRelationship",
   getRelComplete: "getRelationshipComplete",
   reservedLimit: "reservedLimit",
-  createPresignUrl: "createPresignUrl"
+  createPresignUrl: "createPresignUrl",
+  flowSchemaOwnTopic: "flowSchemaOwnTopic",
+  flowSchemaOwnTopicComplete: "flowSchemaOwnTopicComplete"
 };
 
 const SHORT_FUNCTION_NAME = {
@@ -366,6 +371,8 @@ const SOURCE_GENERATE_IAM_ROLE = {
   RelationshipRole: "Relationship",
   RelationshipCompleteRole: "RelationshipCom",
   FlowSchemaUploadS3Role: "FlowSchemaUploadS3",
+  FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
+  FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
   perActionEndpoint: "PerActionEndpoint"
 };
 

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

@@ -567,7 +567,7 @@ module.exports.createMain = async (
       let sendMessageOutCreateObjectComplete = {
         Message: JSON.stringify(messageObject),
         MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
+        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
       };
       _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
       await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
@@ -599,7 +599,7 @@ module.exports.createMain = async (
           messageObject = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, messageObject);
 
           let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
-          let outCreateNodeCompleteTopic = await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
+          let outCreateNodeCompleteTopic = await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
           let messageParams = {
             Message: JSON.stringify(messageObject),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
@@ -621,4 +621,4 @@ module.exports.createMain = async (
   } catch (err) {
     throw (err)
   }
-}
+}

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/delete/template.ejs

@@ -23,7 +23,6 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 
 const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
-const snsSharedLib = require('@izara_project/izara-shared/src/SnsSharedLib');
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const serviceConfigLib = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 
@@ -108,7 +107,7 @@ module.exports.deleteMain = async (
       let messageParams = {
         Message: JSON.stringify(deleteNodeCompleteMessage),
         MessageAttribute: sns.createStringMessageAttributes(_izContext, messageAttributes),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.deleteNodeComplete)
+        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outDeleteNodeComplete)
       }
 
       _izContext.logger.debug("messageParams OutDeleteNodeComplete::", messageParams);

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/get/template.ejs

@@ -160,7 +160,7 @@ module.exports.getMain = async (
               messageObject = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, messageObject);
 
               let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
-              let outGetNodeCompleteTopic = await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outGetNodeComplete)
+              let outGetNodeCompleteTopic = await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outGetNodeComplete)
               let messageParams = {
                 Message: JSON.stringify(messageObject),
                 MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
@@ -168,7 +168,7 @@ module.exports.getMain = async (
               };
 
               _izContext.logger.debug("messageParams OutUpdateNode ::::::: ", messageParams);
-              await sns.publishAsync(_izContext, messageParams);
+               await sns.publishAsync(_izContext, messageParams);
             }
 
 

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/update/template.ejs

@@ -176,7 +176,7 @@ module.exports.updateMain = async (
       let messageParams = {
         Message: JSON.stringify(updateNodeCompleteMessage),
         MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete),
+        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete),
       };
 
       _izContext.logger.debug("messageParams OutUpdateNodeComplete ::::::: ", messageParams);
@@ -295,7 +295,7 @@ module.exports.updateMain = async (
                 let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
 
                 _izContext.logger.debug("after create callingFlow", messageObject)
-                let outUpdateNodeCompleteTopic = await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete);
+                let outUpdateNodeCompleteTopic = await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete);
                 let messageParams = {
                   Message: JSON.stringify(messageObject),
                   MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),

package/src/reStructure/TemplateData/EndpointPerService/yaml/data.js

@@ -72,16 +72,18 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
 
   let storageResourceAllLocalObjectSchemas = await getStorageResourceFromObjectSchemas(_izContext, allObjSchemas)
 
-  additionalResourcePermission.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE),
-      },
-      storageResourceAllLocalObjectSchemas.resourceDynamoTableName.map(tableName =>
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName)
+  if (storageResourceAllLocalObjectSchemas.resourceDynamoTableName.length) {
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE),
+        },
+        storageResourceAllLocalObjectSchemas.resourceDynamoTableName.map(tableName =>
+          resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName)
+        )
       )
     )
-  )
+  }
 
   function httpEvent(lambdaAction) {
     return {

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

@@ -49,11 +49,11 @@ const {
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ConfirmNewReserved";
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -104,7 +104,7 @@ function createSourceParams(_izContext, srcPath) {
       functionName,
       handlerType,
       functionNameConfig: functionName + upperCase(handlerType),
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role

package/src/reStructure/TemplateData/flowSchema/components/upload/confirmReserved/handler/data.js

@@ -30,11 +30,11 @@ const { HANDLER, SOURCE_PATH } = require('../../../../../../../MainLibs/src/Cons
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ConfirmNewReserved";
   let handlerType = upperCase(HANDLER.hdrSqs);
 
@@ -46,7 +46,7 @@ function createSourceParams(_izContext, srcPath) {
     },
     setting: {
       saveFileName: `${functionName}_${handlerType}`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: true
     }

package/src/reStructure/TemplateData/flowSchema/components/upload/confirmReserved/mainFunction/data.js

@@ -34,14 +34,14 @@ function data(_izContext, flowSchema, srcPath) {
   return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "ConfirmNewReserved"
   return {
     templatePath: templatePath,
     templateData: {},
     setting: {
       saveFileName: `${functionName}_Main`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: false
     }

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

@@ -53,7 +53,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3)
   let handlerType = upperCase("hdrWbs")
   let additionalResourcePermission = defaultIamRolePerAction();
-  let route = "webSocket"
+  let route = flowSchema.flowTag;
 
   additionalResourcePermission.push(
     createIamRole(
@@ -96,7 +96,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       functionName,
       handlerType,
       additionalResourcePermission,

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

@@ -46,7 +46,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       handlerType
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

@@ -44,7 +44,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
     templatePath: templatePath,
     templateData: {},
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

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

@@ -47,11 +47,11 @@ const {
  * @param {Object} objectSchemas
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3Complete);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -98,7 +98,7 @@ function createSourceParams(_izContext, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       functionName: functionName,
       handlerType: handlerType,
       additionalResourcePermission: additionalResourcePermission,

package/src/reStructure/TemplateData/flowSchema/components/upload/createObjectComplete/handler/data.js

@@ -45,11 +45,11 @@ const {
  * @param {Object} objectSchemas
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3Complete)
   let handlerType = upperCase(HANDLER.hdrSqs)
   return {
@@ -59,7 +59,7 @@ function createSourceParams(_izContext, srcPath) {
       handlerType,
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

package/src/reStructure/TemplateData/flowSchema/components/upload/createObjectComplete/mainFunction/data.js

@@ -32,11 +32,11 @@ const { firstLetterUpperCase: upperCase } = require('../../../../../../../MainLi
  * @param {Object} objectSchemas
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3Complete)
   return {
     templatePath: templatePath,
@@ -44,7 +44,7 @@ function createSourceParams(_izContext, srcPath) {
       functionName,
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

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

@@ -54,11 +54,11 @@ const {
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -118,7 +118,7 @@ function createSourceParams(_izContext, srcPath) {
       functionName,
       handlerType,
       functionNameConfig: functionName + upperCase(handlerType),
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       additionalResourcePermission,
       functionNameConfig: upperCase("ReservedLimitComp") + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/createPresignUrl/handler/data.js

@@ -31,11 +31,11 @@ const { HANDLER, SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../..
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
   let handlerType = upperCase(HANDLER.hdrSqs);
 
@@ -47,7 +47,7 @@ function createSourceParams(_izContext, srcPath) {
     },
     setting: {
       saveFileName: `${functionName}_${handlerType}`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: true
     }

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/createPresignUrl/mainFunction/data.js

@@ -44,7 +44,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
     },
     setting: {
       saveFileName: `${functionName}_Main`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: false
     }

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

@@ -51,11 +51,11 @@ const {
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.reservedLimit);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -88,7 +88,7 @@ function createSourceParams(_izContext, srcPath) {
       functionName,
       handlerType,
       functionNameConfig: functionName + upperCase(handlerType),
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/handler/data.js

@@ -31,11 +31,11 @@ const { HANDLER, SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../..
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.reservedLimit);
   let handlerType = upperCase(HANDLER.hdrSqs);
 
@@ -47,7 +47,7 @@ function createSourceParams(_izContext, srcPath) {
     },
     setting: {
       saveFileName: `${functionName}_${handlerType}`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: true
     }

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/mainFunction/data.js

@@ -30,18 +30,18 @@ const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../../MainLibs
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.reservedLimit)
   return {
     templatePath: templatePath,
     templateData: {},
     setting: {
       saveFileName: `${functionName}_Main`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: false
     }

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/data.js

@@ -114,7 +114,7 @@ function createSourceParam(_izContext, flowSchema, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       bucketName,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/handler/handlerS3/data.js

@@ -38,18 +38,18 @@ const {
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
-function data(_izContext, srcPath) {
-  return [createSourceData(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceData(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceData(_izContext, srcPath) {
+function createSourceData(_izContext, flowSchema, srcPath) {
   let functionName = FUNCTION_NAME.processAfterUploadS3
   let handlerType = "HdrS3"
   return {
     templatePath: templatePath,
     templateData: {},
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: ".js",
     }

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/mainFunction/data.js

@@ -38,18 +38,18 @@ const {
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.processAfterUploadS3)
   return {
     templatePath: templatePath,
     templateData: {},
     setting: {
       saveFileName: `${functionName}_Main`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
     }
   }

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/functionYaml/data.js

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, DYNAMO_RESOURCE, resourceNames, SOURCE_GENERATE_IAM_ROLE } = require("../../../../libs/Consts");
-const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils');
+const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, DYNAMO_RESOURCE, resourceNames, SOURCE_GENERATE_IAM_ROLE } = require("../../../../../../../MainLibs/src/Consts");
+const { firstLetterUpperCase: upperCase } = require('../../../../../../../MainLibs/src/Utils');
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -59,7 +59,7 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: "src/generatedCode/FlowSchema/WebSocketConnect/source/",
       additionalResourcePermission,
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
 

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

@@ -7,6 +7,8 @@
         route: $connect
     - websocket:
         route: $disconnect
+    - websocket:
+        route: $default
   iamRoleStatements:
     <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
     - Effect: <%- resourcePermission.effect %>

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/handler/data.js

@@ -18,7 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { SOURCE_PATH } = require("../../../../libs/Consts");
+const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, DYNAMO_RESOURCE, resourceNames, SOURCE_GENERATE_IAM_ROLE } = require("../../../../../../../MainLibs/src/Consts");
+const { firstLetterUpperCase: upperCase } = require('../../../../../../../MainLibs/src/Utils');
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -44,7 +45,7 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
       functionName,
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, "../src/generatedCode/FlowSchema/WebSocketConnect/source/"),
       saveFileName: functionName,
       fileExtension: ".js",
       isAppend: false

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

@@ -32,25 +32,13 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       switch (eventType) {
         case 'CONNECT':
           console.log('Connect websocket')
-          // await dynamodbSharedLib.putItem(
-          //   event._izContext,
-          //   await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
-          //   {
-          //     taskKey: "connect" + connectionId,
-          //     connectionId: connectionId,
-          //   }
-          // )
+          //(<additionalParams>)
+          //(</additionalParams>)
           break
         case 'DISCONNECT':
           console.log('Websocket are Disconnection')
-          // await dynamodbSharedLib.deleteItem(
-          //   event._izContext,
-          //   await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
-          //   {
-          //     taskKey: "connect" + connectionId,
-          //     connectionid: connectionId
-          //   }
-          // );
+          //(<additionalParams>)
+          //(</additionalParams>)
           break
         case '$default':
           console.log('Received unknown route:', route)