@izara_project/izara-market-library-service-schemas 1.0.65 → 1.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -24,11 +24,11 @@
     "@izara_project/izara-core-library-core": "^1.0.20",
     "@izara_project/izara-core-library-external-request": "^1.0.20",
     "@izara_project/izara-core-library-logger": "^1.0.7",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.90",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.95",
     "@izara_project/izara-core-library-sns": "^1.0.6",
     "@izara_project/izara-core-library-sqs": "^1.0.4",
     "@izara_project/izara-shared": "^1.0.126",
-    "@izara_project/izara-shared-service-schemas": "^1.0.29",
+    "@izara_project/izara-shared-service-schemas": "^1.0.31",
     "@izara_project/izara-shared-core": "^1.0.2",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",

package/src/GenerateCodeLibs/src/Consts.js

@@ -58,7 +58,9 @@ const TOPIC_NAME_GRAPH_HANDLER = {
   inDeleteNode: "DeleteNode_In",
   outDeleteNode: "DeleteNode_Out",
   inChangeRelationship: "ChangeRelationshipType_In",
-  outChangeRelationship: "ChangeRelationshipType_Out"
+  outChangeRelationship: "ChangeRelationshipType_Out",
+  inMoveRelationship: "MoveRelationship_In",
+  outMoveRelationship: "MoveRelationship_Out"
 }
 
 const TOPIC_NAME_GENERATE_CODE = {
@@ -83,7 +85,10 @@ const TOPIC_NAME_GENERATE_CODE = {
   flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete",
   flowSchemaOwnTopicEndpointComplete: "FlowSchemaOwnTopicEndpointComplete",
   createRecordComplete: "CreateRecordComplete",
-  changeRelationshipComplete: "ChangeRelationshipComplete"
+  changeRelationshipComplete: "ChangeRelationshipComplete",
+  outChangeRelationshipComplete: "ChangeRelationshipComplete_Out",
+  moveRelationshipComplete: "MoveRelationshipComplete",
+  outMoveRelationshipComplete: "MoveRelationshipComplete_Out"
 }
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -889,7 +889,17 @@ async function createDataDetailsLib(_izContext, objectSchemas, settings = { buck
               });
             };
           };
-        };
+        } else if (storageResources[eachStorageResourceTag].storageType === consts.STORAGE_TYPES.externalTopic) {
+          let topicName = storageResources[eachStorageResourceTag].serviceTag + storageResources[eachStorageResourceTag].stage + storageResources[eachStorageResourceTag].topicName
+          Object.assign(createDataDetails, {
+            [topicName]: {
+              storageType: consts.STORAGE_TYPES.externalTopic,
+              fieldNames: [keyFieldName],
+              accountId: storageResources[eachStorageResourceTag].accountId,
+              region: storageResources[eachStorageResourceTag].region,
+            }
+          });
+        }
       };
     }; // end loop storageResourceTags
   }; // end loop

package/src/MainLibs/src/Consts.js

@@ -286,32 +286,38 @@ const FUNCTION_NAME = {
   createRecordComplete: "createRecordComplete",
   flowSchemaRegister: "register",
   changeRel: "changeRelationship",
-  changeRelComplete: "changeRelationshipComplete"
+  changeRelComplete: "changeRelationshipComplete",
+  moveRel: "moveRelationship",
+  moveRelComplete: "moveRelationshipComplete"
 };
 
-const SHORT_FUNCTION_NAME = {
-  updateRel: "updateRel",
-  createRel: "createRel",
-  updateRelComplete: "updateRelComp",
-  createRelComplete: "createRelComp",
-  deleteRel: "deleteRel",
-  deleteRelComplete: "deleteRelComp",
-  translateId: "translateIdsReq",
-  translateIdsProcess: "processTranslateIds",
-  outTranslateIds: "processTranslateIdsComp",
-  findData: "findData",
-  processLogical: "processLogical",
-  updateNodeComplete: "updateNodeComp",
-  createObjectComplete: "createObjectComp",
-  getNodeComplete: "getNodeComp",
-  paginateProcessLogical: "paginateProLogical",
-  deleteNode: "deleteNode",
-  deleteNodeComplete: "deleteNodeComp",
-  createObjectS3Complete: "webSocketTaskComp",
-  getRel: "getRel",
-  getRelComplete: "getRelComp",
-  changeRel: "changeRel",
-  changeRelComplete: "changeRelComp"
+const SHORT_FUNCTION_NAME = (functionName) => {
+  return {
+    [FUNCTION_NAME.updateRel]: "updateRel",
+    [FUNCTION_NAME.createRel]: "createRel",
+    [FUNCTION_NAME.updateRelComplete]: "updateRelComp",
+    [FUNCTION_NAME.createRelComplete]: "createRelComp",
+    [FUNCTION_NAME.deleteRel]: "deleteRel",
+    [FUNCTION_NAME.deleteRelComplete]: "deleteRelComp",
+    // translateId: "translateIdsReq",
+    // translateIdsProcess: "processTranslateIds",
+    // outTranslateIds: "processTranslateIdsComp",
+    [FUNCTION_NAME.findData]: "findData",
+    [FUNCTION_NAME.processLogical]: "processLogical",
+    [FUNCTION_NAME.updateNodeComplete]: "updateNodeComp",
+    [FUNCTION_NAME.createObjectComplete]: "createObjectComp",
+    [FUNCTION_NAME.getNodeComplete]: "getNodeComp",
+    [FUNCTION_NAME.paginateProcessLogical]: "paginateProLogical",
+    [FUNCTION_NAME.deleteNode]: "deleteNode",
+    [FUNCTION_NAME.deleteNodeComplete]: "deleteNodeComp",
+    [FUNCTION_NAME.createObjectS3Complete]: "webSocketTaskComp",
+    [FUNCTION_NAME.getRel]: "getRel",
+    [FUNCTION_NAME.getRelComplete]: "getRelComp",
+    [FUNCTION_NAME.changeRel]: "changeRel",
+    [FUNCTION_NAME.changeRelComplete]: "changeRelComp",
+    [FUNCTION_NAME.moveRel]: "moveRel",
+    [FUNCTION_NAME.moveRelComplete]: "moveRelComp"
+  }[functionName]
 }
 
 const getGraphServiceNameFromAllRelSchema = async (_izContext, allRelSchemas, settings = { bucketName: OBJECT_SCHEMA_BUCKET_NAME }) => {
@@ -569,6 +575,38 @@ const FLOW_SCHEMA_EVENT_TYPE = {
   eventBridge: "eventBridge",
 }
 
+async function getExternalTopicComponentFromAllObjectSchemas(_izContext, allObjSchemas) {
+  const externalTopicComponentSet = new Set();
+  for (const objectSchema of allObjSchemas) {
+    for (let storageResource of Object.values(objectSchema.storageResources)) {
+
+      if (storageResource.storageType === STORAGE_TYPES.externalTopic) {
+        let uniqueTag = hash({
+          accountId: storageResource.accountId,
+          region: storageResource.region,
+          serviceTag: storageResource.serviceTag,
+          stage: storageResource.stage
+        })
+
+        if (!externalTopicComponentSet.has(uniqueTag)) {
+          externalTopicComponentSet.add(
+            {
+              [uniqueTag]: {
+                accountId: storageResource.accountId,
+                region: storageResource.region,
+                serviceTag: storageResource.serviceTag,
+                stage: storageResource.stage
+              }
+            }
+          )
+        }
+      }
+    }
+  }
+  let externalTopicComponents = [...externalTopicComponentSet]
+  return externalTopicComponents
+};
+
 module.exports = {
   STORAGE_TYPES,
   ACTIONS,
@@ -604,5 +642,6 @@ module.exports = {
   checkDynamoTypeRelationship,
   createDynamoDbComponentByLinks,
   getStorageResourceFromObjectSchemas,
-  FLOW_SCHEMA_EVENT_TYPE
+  FLOW_SCHEMA_EVENT_TYPE,
+  getExternalTopicComponentFromAllObjectSchemas
 }

package/src/MainLibs/src/GenerateCodeUtils.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
-
+const { firstLetterUpperCase: upperCase } = require('./Utils')
 
 function checkValidTableYaml(_izContext, currentTableSetting, existsTableSetting) {
   // console.log("checkValidTableYaml", JSON.stringify(currentTableSetting, null, 2), JSON.stringify(existsTableSetting, null, 2))
@@ -31,14 +31,14 @@ function checkValidTableYaml(_izContext, currentTableSetting, existsTableSetting
 
   for (let i = 0, length = currentTableSetting.length; i < length; i++) {
     let dynamoDbYamlSetting = currentTableSetting[i];
-    console.log("dynamoDbYamlSetting", dynamoDbYamlSetting)
-    if (existsTableSetting.hasOwnProperty(dynamoDbYamlSetting.templateData.tableName)) {
+    // console.log("dynamoDbYamlSetting", dynamoDbYamlSetting)
+    if (existsTableSetting.hasOwnProperty(upperCase(dynamoDbYamlSetting.templateData.tableName))) {
 
       // exists table
-      if (hash(existsTableSetting[dynamoDbYamlSetting.templateData.tableName]) === hash(dynamoDbYamlSetting.templateData.attributes.sort())) {
+      if (hash(existsTableSetting[upperCase(dynamoDbYamlSetting.templateData.tableName)]) === hash(dynamoDbYamlSetting.templateData.attributes.sort())) {
         continue;
       } else {
-        throw Error(`tableName:${dynamoDbYamlSetting.templateData.tableName} have duplicate setting but not have same setting`)
+        throw Error(`tableName:${upperCase(dynamoDbYamlSetting.templateData.tableName)} have duplicate setting but not have same setting`)
       }
 
     } else {
@@ -48,7 +48,7 @@ function checkValidTableYaml(_izContext, currentTableSetting, existsTableSetting
       Object.assign(
         existsTableSetting,
         {
-          [dynamoDbYamlSetting.templateData.tableName]: dynamoDbYamlSetting.templateData.attributes.sort()
+          [upperCase(dynamoDbYamlSetting.templateData.tableName)]: dynamoDbYamlSetting.templateData.attributes.sort()
         }
       );
     }

package/src/reStructure/GenerateCode.js

@@ -84,7 +84,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath, settings = {}
     const functionNameConfigs = functionNameConfigYamlData(_izContext, allCreateSource, saveFilePath);
     allCreateSource.push(...functionNameConfigs);
 
-    const generateRoleData = generateRole(_izContext, allCreateSource, saveFilePath);
+    let filterAllCreateSource = allCreateSource.filter((createSource) => createSource.templateData.hasOwnProperty("additionalResourcePermission") && createSource.templateData.hasOwnProperty("roleName"))
+    const generateRoleData = generateRole(_izContext, filterAllCreateSource, saveFilePath);
     allCreateSource.push(...generateRoleData);
 
     // ** create Generate-Shared-resource

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

@@ -60,7 +60,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
   try {
     const saveFilePath = join(objSchemaPath, `../`);
     const allObjSchemas = await getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
-
+    console.log("allObjSchemas: ", allObjSchemas.records)
     const createSourceParams = [];
 
     for (const objectSchema of allObjSchemas.records) {

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

@@ -204,12 +204,12 @@ module.exports.createMain = async (
         }
       } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("optionalOnCreate")) {
         if ((objectSchemas.fieldNames[identifier.fieldName].optionalOnCreate == true)) {
+          //(<createOptionalOnCreateIdentifiers>)
+          let optionalOnCreateIdentifiers
+          //(</createOptionalOnCreateIdentifiers>)
           Object.assign(
             requestParams.fieldNames, {
-            [identifier.fieldName]: hash({
-              //(<createIdentifiersOptionalOnCreate>)
-              //(</createIdentifiersOptionalOnCreate>)
-            })
+            [identifier.fieldName]: hash(optionalOnCreateIdentifiers)
           }
           )
         }
@@ -375,6 +375,22 @@ module.exports.createMain = async (
 
           _izContext.logger.debug("FIRST", listOfObjectForCreates)
 
+        } else if (createDataDetail.storageType === consts.STORAGE_TYPES.externalTopic) {
+          _izContext.logger.debug("::::::externalTopic::::::", { storageTag, createDataDetail });
+          //(<beforeSendMessageToExternalTopic>)
+          //(</beforeSendMessageToExternalTopic>)
+          let messageObject = {
+            //(<messageObjectHook>)
+            //(</messageObjectHook>)
+          };
+
+          let sendToCreateExternalTopic = {
+            Message: JSON.stringify(messageObject),
+            TopicArn: `arn:aws:sns:${createDataDetail.region}:${createDataDetail.accountId}:${createDataDetail.serviceTag}_${createDataDetail.stage}_Create_In`
+          };
+          _izContext.logger.debug("Request params before send to create endpoint:", sendToCreateExternalTopic);
+
+          await sns.publishAsync(_izContext, sendToCreateExternalTopic)
         }
       };
       _izContext.logger.debug("[1]listOfObjectForCreates:::", listOfObjectForCreates);

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

@@ -22,6 +22,7 @@ const fs = require('fs');
 const yaml = require('yaml');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+const hash = require('@izara_project/izara-shared-core').objectHash
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
@@ -82,7 +83,7 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
           [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE),
         },
         storageResourceAllLocalObjectSchemas.resourceDynamoTableName.map(tableName =>
-          resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName)
+          resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(tableName))
         )
       )
     )
@@ -143,19 +144,44 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
   const config = yaml.parse(serverlessConfig);
   const ownServiceTag = config.main_config.iz_serviceTag;
   let parentTables = [];
+  let externalTopicComponents = [];
   // create lambdaRole for parent dynamo table if able
   for (const objectSchema of allObjSchemas.records) {
-    if (objectSchema.hasOwnProperty("extendObjType")) {
-      for (const storageResource of Object.values(objectSchema.storageResources)) {
-        if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+    for (const storageResource of Object.values(objectSchema.storageResources)) {
+      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+        if (objectSchema.hasOwnProperty("extendObjType")) {
           if (storageResource.serviceTag && storageResource.serviceTag !== ownServiceTag) {
-            parentTables.push({ tableName: storageResource.tableName, serviceTag: storageResource.serviceTag })
+            parentTables.push({ tableName: upperCase(storageResource.tableName), serviceTag: upperCase(storageResource.serviceTag) })
           }
         }
       }
+
+      if (storageResource.storageType === STORAGE_TYPES.externalTopic) {
+        let uniqueTag = hash({
+          accountId: storageResource.accountId,
+          region: storageResource.region,
+          serviceTag: storageResource.serviceTag,
+          stage: storageResource.stage
+        })
+
+        if (!externalTopicComponents.includes(uniqueTag)) {
+          externalTopicComponents.push(
+            {
+              [uniqueTag]: {
+                accountId: storageResource.accountId,
+                region: storageResource.region,
+                serviceTag: storageResource.serviceTag,
+                stage: storageResource.stage
+              }
+            }
+          )
+        }
+      }
     }
   }
 
+
+
   if (parentTables.length > 0) {
     additionalResourcePermission.push(
       createIamRole(
@@ -179,6 +205,24 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
     }
   }
 
+  if (externalTopicComponents.length > 0) {
+    if (action === ACTIONS.create) {
+      externalTopicComponents.map(component => {
+        for (const [_, compo] of Object.entries(component)) {
+          additionalResourcePermission.push(createIamRole(
+            {
+              [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+            },
+            [
+              `arn:aws:sns:${compo.region}:${compo.accountId}:${compo.serviceTag}_${compo.stage}_Create_In`
+            ]
+          ))
+        }
+      }
+      )
+    }
+  }
+
   return {
     templatePath: templatePath,
     templateData: {

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

@@ -186,4 +186,7 @@ function snsSubscriptionConfirmReserved(_izContext) {
   }
 }
 
+async function snsSubScriptionFromExternalTopic(_izContext, allObjectSchemas) {
+  
+}
 module.exports = createExternalSnsSubscriptions;

package/src/reStructure/TemplateData/findData/findDataYaml/data.js

@@ -25,7 +25,7 @@ const { HANDLER, STORAGE_TYPES, ACTIONS } = require('@izara_project/izara-core-l
 const {
   firstLetterLowerCase: lowerCase,
   firstLetterUpperCase: upperCase,
-} = require("../../../../MainLibs/index.js").utils;
+} = require("../../../../MainLibs/src/Utils");
 const {
   createIamRole,
   resourceNames,
@@ -90,7 +90,7 @@ async function data(_izContext, objectSchemas, srcPath, settings) {
     additionalResourcePermission.push(
       createIamRole(
         { [RESOURCE_CLASSES.dynamoDbTable]: [DEFAULT_LAMBDA_ROLE_PER_ACTION[ACTIONS.get].dynamoDbPermission] },
-        tableForGetItem
+        upperCase(tableForGetItem)
       )
     );
   }

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

@@ -102,7 +102,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       functionName: functionName,
       handlerType: handlerType,
       additionalResourcePermission: additionalResourcePermission,
-      functionNameConfig: upperCase(SHORT_FUNCTION_NAME.createObjectS3Complete) + upperCase(shortNameHandler(handlerType)),
+      functionNameConfig: upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.createObjectS3Complete)) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {

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

@@ -39,7 +39,9 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.reservedLimit)
   return {
     templatePath: templatePath,
-    templateData: {},
+    templateData: {
+      flowTag: flowSchema.flowTag
+    },
     setting: {
       saveFileName: `${functionName}_Main`,
       savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),

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

@@ -29,6 +29,10 @@ const coreConsts = require('@izara_project/izara-middleware/src/MiddlewareCore/C
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const importDataLibs = require('../../../../libs/source/GenerateCodeLibs');
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
+const { createFlowTypeConcat } = require("@izara_project/izara-core-library-service-schemas").utils
+
+//(<optionalRequired>)
+//(</optionalRequired>)
 
 /**
  * description of function.
@@ -81,6 +85,16 @@ module.exports.reservedLimit = async (
 
     if (res.passStatus === false) {
       importDataLibs.postToConnection({ message: "static limit over" }, connectionId)
+      let identifiers = hash({})
+
+      // after post message delete websocket task
+      await dynamodbSharedLib.deleteItem(_izContext,
+        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
+        {
+          taskKey: ${createFlowTypeConcat(_izContext, { flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag })}${identifiers},
+          connectionId: connectionId
+        }
+      )
       //(<afterFailReservedStaticLimit>)
       return
       //(</afterFailReservedStaticLimit>)

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

@@ -21,7 +21,7 @@ const path = require("path")
 
 const templatePath = path.join(__dirname, '../../resourceYaml/dynamodb/template.ejs')
 const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, DYNAMO_RESOURCE, resourceNames, RESOURCE_CLASSES, FUNCTION_NAME, SOURCE_GENERATE_IAM_ROLE } = require('../../../../MainLibs/src/Consts.js')
-
+const { firstLetterUpperCase: upperCase } = require('../../../../MainLibs/src/Utils.js')
 /**
  * create param of crateSouce for FindData And processLogical
  *
@@ -84,7 +84,7 @@ const createAwaitingMultipleStepDynamoDbData = (_izContext, flowSchema, allLocal
     templatePath,
     templateData: {
       tableName,
-      resourceName: tableName,
+      resourceName: upperCase(tableName),
       attributes,
     },
     setting: {

package/src/reStructure/TemplateData/flowSchema/flowStep/functionYaml/data.js

@@ -77,7 +77,7 @@ function data(_izContext, flowSchema, srcPath) {
 function createSourceParams(_izContext, flowTag, flowStep, srcPath) {
   let functionName = upperCase(flowStep);
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let topicIn = upperCase(flowStep);
+  let topicIn = `${upperCase(flowTag)}_${upperCase(flowStep)}`;
   let additionalResourcePermission = defaultIamRolePerAction();
   additionalResourcePermission.push(
     createIamRole(
@@ -95,8 +95,8 @@ function createSourceParams(_izContext, flowTag, flowStep, srcPath) {
         [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.sendMessage, SQS_RESOURCE.receiveMessage, SQS_RESOURCE.deleteMessage, SQS_RESOURCE.getQueueAttributes, SQS_RESOURCE.deleteMessageBatch, SQS_RESOURCE.getQueueUrl]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(flowStep) + upperCase(handlerType)),
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(flowStep) + upperCase(handlerType) + "DLQ")
+        resourceNames(RESOURCE_CLASSES.sqs, `${upperCase(flowTag)}_${upperCase(flowStep)}` + upperCase(handlerType)),
+        resourceNames(RESOURCE_CLASSES.sqs, `${upperCase(flowTag)}_${upperCase(flowStep)}` + upperCase(handlerType) + "DLQ")
       ]
     )
   )

package/src/reStructure/TemplateData/flowSchema/flowStep/handler/data.js

@@ -62,7 +62,7 @@ function data(_izContext, flowSchema, srcPath) {
 function createParamsForCreateSource(_izContext, flowTag, flowStep, srcPath) {
   let functionName = upperCase(flowStep)
   let handlerType = upperCase(HANDLER.hdrSqs)
-  let queueName = upperCase(flowStep) + handlerType
+  let queueName = `${upperCase(flowTag)}_${upperCase(flowStep)}` + handlerType
   return {
     templatePath: templatePath,
     templateData: {

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

@@ -55,7 +55,8 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
               for (let i = 2; i < flowSteps.length; i++) {
                 generatedSnsTopicInForFlowSchema.add(
                   {
-                    queueName: upperCase(flowSteps[i])
+                    queueName: `${upperCase(flowSchema.flowTag)}_${upperCase(flowSteps[i])}`,
+                    resourceName: upperCase(flowSchema.flowTag) + upperCase(flowSteps[i])
                   }
                 )
               }
@@ -67,7 +68,8 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
               for (let i = 2; i < flowSteps.length; i++) {
                 generatedSnsTopicInForFlowSchema.add(
                   {
-                    queueName: upperCase(flowSteps[i])
+                    queueName: `${upperCase(flowSchema.flowTag)}_${upperCase(flowSteps[i])}`,
+                    resourceName: upperCase(flowSchema.flowTag) + upperCase(flowSteps[i])
                   }
                 )
               }

package/src/reStructure/TemplateData/flowSchema/flowStep/sns-in/template.ejs

@@ -1,19 +1,19 @@
 ##===== [Create topic in]
-  In<%- queueName %>:
+  In<%- resourceName %>:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
       TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>
 ##===== SNS Subscription
 ##===== [Topic In]
-  SubscriptionIn<%- queueName %>:
+  SubscriptionIn<%- resourceName %>:
     Type: AWS::SNS::Subscription
     Properties:
-      TopicArn: !Ref In<%- queueName %>
+      TopicArn: !Ref In<%- resourceName %>
       Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
       Protocol: "sqs"
 ##===== [Queue]
-  <%- queueName %>HdrSqs:
+  <%- resourceName %>HdrSqs:
     Type: "AWS::SQS::Queue"
     Properties:
       QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
@@ -21,17 +21,17 @@
         deadLetterTargetArn:
         # !GetAtt
           Fn::GetAtt:
-            - <%- queueName %>HdrSqsDLQ
+            - <%- resourceName %>HdrSqsDLQ
             - Arn
         maxReceiveCount: 3
       VisibilityTimeout: 120
 ##==== [QueueDLQ]
-  <%- queueName %>HdrSqsDLQ:
+  <%- resourceName %>HdrSqsDLQ:
     Type: AWS::SQS::Queue
     Properties:
       QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
 ##==== [QueuePolicy]
-  <%- queueName %>HdrSqsPolicy:
+  <%- resourceName %>HdrSqsPolicy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -43,11 +43,11 @@
             Resource:
             # !GetAtt
               Fn::GetAtt:
-                - <%- queueName %>HdrSqs
+                - <%- resourceName %>HdrSqs
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>HdrSqs
+        - Ref: <%- resourceName %>HdrSqs
   #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
   #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
 

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

@@ -386,30 +386,30 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       }
 
       // statusType enum [storedCache, statusField]
-      if (flowSchema.statusType === "storedCache") {
-        const flowSchemaDynamoDb = createAwaitingMultipleStepDynamoDbData(_izContext, flowSchema, allLocalObjectSchemas, saveFilePath)
-        console.log("generated code storedCache flowSchema")
-        createSourceParams.push(...flowSchemaDynamoDb);
-      } else if (flowSchema.statusType === "statusField") {
-        // wait
-
-
-        // if (flowSchema.statusType === "statusField") {
-        //   const createRecordCompleteFunctionYaml = createCreateObjectCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
-        //   const createRecordCompleteHandler = createCreateObjectCompleteHandler(_izContext, flowSchema, saveFilePath);
-        //   const createRecordCompleteMainFunction = createCreateObjectCompleteMainFunction(_izContext, flowSchema, saveFilePath);
-        //   const createRecordCompleteQueue = createCreateObjectCompleteQueue(_izContext, flowSchema, saveFilePath);
-
-        //   const recordCompleteResources = [
-        //     ...createRecordCompleteFunctionYaml,
-        //     ...createRecordCompleteHandler,
-        //     ...createRecordCompleteMainFunction,
-        //     ...createRecordCompleteQueue
-        //   ];
-        //   console.log("generated Code createRecordComplete")
-        //   createSourceParams.push(...recordCompleteResources);
-        // }
-      }
+      // if (flowSchema.statusType === "storedCache") {
+      // const flowSchemaDynamoDb = createAwaitingMultipleStepDynamoDbData(_izContext, flowSchema, allLocalObjectSchemas, saveFilePath)
+      // console.log("generated code storedCache flowSchema")
+      // createSourceParams.push(...flowSchemaDynamoDb);
+      // } else if (flowSchema.statusType === "statusField") {
+      // wait
+
+
+      // if (flowSchema.statusType === "statusField") {
+      //   const createRecordCompleteFunctionYaml = createCreateObjectCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
+      //   const createRecordCompleteHandler = createCreateObjectCompleteHandler(_izContext, flowSchema, saveFilePath);
+      //   const createRecordCompleteMainFunction = createCreateObjectCompleteMainFunction(_izContext, flowSchema, saveFilePath);
+      //   const createRecordCompleteQueue = createCreateObjectCompleteQueue(_izContext, flowSchema, saveFilePath);
+
+      //   const recordCompleteResources = [
+      //     ...createRecordCompleteFunctionYaml,
+      //     ...createRecordCompleteHandler,
+      //     ...createRecordCompleteMainFunction,
+      //     ...createRecordCompleteQueue
+      //   ];
+      //   console.log("generated Code createRecordComplete")
+      //   createSourceParams.push(...recordCompleteResources);
+      // }
+      // }
       const flowSchemaFlowStepYml = createFlowSchemaFlowStepFunctionYaml(_izContext, flowSchema, saveFilePath);
       const flowSchemaFlowStepHandler = createFlowSchemaFlowStepHandler(_izContext, flowSchema, saveFilePath);
       const flowSchemaFlowStepMainFunction = createFlowSchemaFlowStepMainFunction(_izContext, flowSchema, saveFilePath);