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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -20,15 +20,15 @@
     "testEnvironment": "node"
   },
   "dependencies": {
+    "@izara_project/izara-core-library-calling-flow": "^1.0.3",
     "@izara_project/izara-core-library-core": "^1.0.18",
-    "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.48",
-    "@izara_project/izara-shared": "^1.0.125",
-    "@izara_project/izara-shared-service-schemas": "^1.0.5",
-    "@izara_project/izara-core-library-sns": "^1.0.3",
-    "@izara_project/izara-core-library-sqs": "^1.0.3",
-    "@izara_project/izara-core-library-calling-flow": "^1.0.2",
-    "@izara_project/izara-core-library-logger": "^1.0.6",
+    "@izara_project/izara-core-library-external-request": "^1.0.18",
+    "@izara_project/izara-core-library-logger": "^1.0.7",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.49",
+    "@izara_project/izara-core-library-sns": "^1.0.4",
+    "@izara_project/izara-core-library-sqs": "^1.0.4",
+    "@izara_project/izara-shared": "^1.0.126",
+    "@izara_project/izara-shared-service-schemas": "^1.0.6",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",

package/src/GenerateCodeLibs/src/Consts.js

@@ -28,19 +28,34 @@ const PREFIX = {
   getRel: "getRelationshipEndpoint"
 }
 
+// const TOPIC_NAME_GRAPH_HANDLER = {
+//   inUpdateRel: "InUpdateRelationship",
+//   inCreateRel: "InCreateRelationshipV2",
+//   outUpdateRel: "OutUpdateRelationship",
+//   outCreateRel: "OutCreateRelationship",
+//   inDeleteRel: "InDeleteRelationshipV2",
+//   outDeleteRel: "OutDeleteRelationshipV2",
+//   inUpdateNode: "InUpdateNode",
+//   outUpdateNode: "OutUpdateNode",
+//   inCreateNode: "InCreateNodeV2",
+//   outCreateNode: "OutCreateNodeV2",
+//   inDeleteNode: "InDeleteNodeV2",
+//   outDeleteNode: "OutDeleteNodeV2",
+// }
+
 const TOPIC_NAME_GRAPH_HANDLER = {
-  inUpdateRel: "InUpdateRelationship",
-  inCreateRel: "InCreateRelationshipV2",
-  outUpdateRel: "OutUpdateRelationship",
-  outCreateRel: "OutCreateRelationship",
-  inDeleteRel: "InDeleteRelationshipV2",
-  outDeleteRel: "OutDeleteRelationshipV2",
-  inUpdateNode: "InUpdateNode",
-  outUpdateNode: "OutUpdateNode",
-  inCreateNode: "InCreateNodeV2",
-  outCreateNode: "OutCreateNodeV2",
-  inDeleteNode: "InDeleteNodeV2",
-  outDeleteNode: "OutDeleteNodeV2",
+  inUpdateRel: "UpdateRelationship_In",
+  inCreateRel: "CreateRelationship_In",
+  outUpdateRel: "UpdateRelationship_Out",
+  outCreateRel: "CreateRelationship_Out",
+  inDeleteRel: "DeleteRelationship_In",
+  outDeleteRel: "DeleteRelationship_Out",
+  inUpdateNode: "UpdateNode_In",
+  outUpdateNode: "UpdateNode_Out",
+  inCreateNode: "CreateNode_In",
+  outCreateNode: "CreateNode_Out",
+  inDeleteNode: "DeleteNode_In",
+  outDeleteNode: "DeleteNode_Out"
 }
 
 const TOPIC_NAME_GENERATE_CODE = {
@@ -61,7 +76,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/",
   generateCodeLib: "../src/generatedCode/libs/source/",
   logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
   resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
@@ -187,7 +190,7 @@ function externalResourceName(resourceClass, resourceName, serviceTag) {
     // [RESOURCE_CLASSES.dynamoDbAcrossService]: "arn:aws:dynamodb:${process.env.iz_region}:${process.env.iz_accountId}:table/*/" + `${resourceName}`,
     [RESOURCE_CLASSES.dynamoDbAcrossService]: "arn:aws:dynamodb:${process.env.iz_region}:${process.env.iz_accountId}:table/" + `"${serviceTag}"` + `"${resourceName}"`,
     [RESOURCE_CLASSES.lambda]: "arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${await lambdaSharedLib.lambdaFunctionName(_izContext, " + `"${resourceName}" ,"${serviceTag}")}`,
-    [RESOURCE_CLASSES.sns]: "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${await snsSharedLib.snsTopicName(_izContext, " + `"${resourceName}", "${serviceTag}")}`
+    [RESOURCE_CLASSES.sns]: "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${await snsSharedLib.snsTopicNameByFlowSchema(_izContext, " + `"${resourceName}", "${serviceTag}")}`
 
   }[resourceClass]
 };
@@ -250,7 +253,11 @@ const FUNCTION_NAME = {
   getRel: "getRelationship",
   getRelComplete: "getRelationshipComplete",
   reservedLimit: "reservedLimit",
-  createPresignUrl: "createPresignUrl"
+  createPresignUrl: "createPresignUrl",
+  flowSchemaOwnTopic: "flowSchemaOwnTopic",
+  flowSchemaOwnTopicComplete: "flowSchemaOwnTopicComplete",
+  flowSchemaOwnTopicEndpoint: "flowSchemaOwnTopicEndpoint",
+  flowSchemaExternalTopic: "externalTopic",
 };
 
 const SHORT_FUNCTION_NAME = {
@@ -366,7 +373,10 @@ const SOURCE_GENERATE_IAM_ROLE = {
   RelationshipRole: "Relationship",
   RelationshipCompleteRole: "RelationshipCom",
   FlowSchemaUploadS3Role: "FlowSchemaUploadS3",
-  perActionEndpoint: "PerActionEndpoint"
+  FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
+  FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
+  perActionEndpoint: "PerActionEndpoint",
+  ExternalTopicRole: "ExternalTopic",
 };
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {

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

@@ -205,9 +205,6 @@ module.exports.createMain = async (
             }
           })
         );
-        if (serviceTag.includes(GRAPH_HANDLER_SERVICE_NAME.graphHandler)) {
-          filteredRequiredOnCreatedLinks.push(requiredLink);
-        }
       })
     )
     _izContext.logger.debug("filteredRequiredOnCreatedLinks", filteredRequiredOnCreatedLinks);
@@ -530,7 +527,7 @@ module.exports.createMain = async (
 
           let messageToCreateObject = {
             Message: JSON.stringify(messageObject),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inCreateNode, graphServiceName)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inCreateNode, graphServiceName)
           };
           _izContext.logger.debug("RequestParams before send to sqs messageToCreateObject ::::::: ", messageToCreateObject);
           await sns.publishAsync(_izContext, messageToCreateObject);
@@ -567,7 +564,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 +596,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),

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);
@@ -160,7 +159,7 @@ module.exports.deleteMain = async (
         let deleteNodeMessageBody = {
           Message: JSON.stringify(deleteNodeParams),
           MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-          TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inDeleteNode, storageTag)
+          TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inDeleteNode, storageTag)
         }
 
         _izContext.logger.debug("request message params before send to IndeleteNode::", deleteNodeMessageBody);

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);
@@ -249,7 +249,7 @@ module.exports.updateMain = async (
             let updateNodeMessageBody = {
               Message: JSON.stringify(updateNodeParams),
               MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-              TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag,)
+              TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag,)
             }
 
             _izContext.logger.debug('requset param before send to topic InUpdateNode:::', updateNodeMessageBody);
@@ -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/externalService/lambdaRole/data.js

@@ -115,7 +115,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, allObjSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         storageResourceAllLocalObjectSchemas.resourceGraphServiceTag.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InUpdateNode", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "UpdateNode_In", graphServiceName)
         )
       ),
       createIamRole(
@@ -123,7 +123,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, allObjSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         storageResourceAllLocalObjectSchemas.resourceGraphServiceTag.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InCreateNodeV2", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "CreateNode_In", graphServiceName)
         )
       )
     )
@@ -151,7 +151,7 @@ async function externalLamdaIamRoleRelationships(_izContext, allRelSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InUpdateRelationship", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "UpdateRelationship_In", graphServiceName)
         )
       ),
       createIamRole(
@@ -159,7 +159,7 @@ async function externalLamdaIamRoleRelationships(_izContext, allRelSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InCreateRelationshipV2", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "CreateRelationship_In", graphServiceName)
         )
       ),
       createIamRole(
@@ -167,7 +167,7 @@ async function externalLamdaIamRoleRelationships(_izContext, allRelSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InDeleteRelationshipV2", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "DeleteRelationship_In", graphServiceName)
         )
       ),
       createIamRole(

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/data.js

@@ -75,6 +75,10 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
           const snsServiceConfigForConfirmReserved = await snsSubscriptionConfirmReserved(_izContext);
           snsServiceConfigForConfirmReserved && snsServiceConfigArray.push(snsServiceConfigForConfirmReserved);
         }
+        if (event.includes("extTopic")) {
+          const snsServiceConfigForExtTopic = await snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema);
+          snsServiceConfigForExtTopic && snsServiceConfigArray.push(snsServiceConfigForExtTopic);
+        }
       }
     }
   }
@@ -176,4 +180,22 @@ function snsSubscriptionConfirmReserved(_izContext) {
   }
 }
 
+function snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema) {
+  const flowSteps = Object.keys(localFlowSchema.flowSteps || {});
+  const lastIndex = flowSteps.length - 1;
+
+  if (lastIndex >= 0) {
+    const flowStep = flowSteps[lastIndex];
+    const splitFlowStepKey = flowStep.split("_");
+
+    return {
+      serviceNames: [splitFlowStepKey[0]],
+      topicName: splitFlowStepKey[2],
+      sqsEndpoint: splitFlowStepKey[3]
+    };
+  }
+
+  return null;
+}
+
 module.exports = createExternalSnsSubscriptions;

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/confirmReserved/mainFunction/template.ejs

@@ -21,7 +21,7 @@ const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb')
 const snsSharedLib = require('@izara_project/izara-core-library-sns')
 const sns = require('@izara_project/izara-core-library-external-request').sns
 const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-const { getNestObject } = require('../../libs/source/ImportDataLib')
+const { getNestObject } = require('../../libs/source/GenerateCodeLibs')
 /**
  * description of function.
  * @param {Object} _izContext

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/handler/template.ejs

@@ -26,7 +26,7 @@ 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/ImportDataLib");
+const { postToConnection } = require("../../libs/source/GenerateCodeLibs");
 const createObject = require('./CreateObjectS3_Main');
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 

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/createObjectComplete/mainFunction/template.ejs

@@ -21,7 +21,7 @@ const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 let coreConsts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 
-const { postToConnection } = require('../../libs/source/ImportDataLib')
+const { postToConnection } = require('../../libs/source/GenerateCodeLibs')
 module.exports.webSocketTaskComplete = async (
   _izContext,
   objType,

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
     }