@izara_project/izara-market-library-service-schemas 1.0.66 → 1.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "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/GenerateCodeLibs.js

@@ -889,7 +889,19 @@ 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,
+              serviceTag: storageResources[eachStorageResourceTag].serviceTag,
+              stage: storageResources[eachStorageResourceTag].stage
+            }
+          });
+        }
       };
     }; // end loop storageResourceTags
   }; // end loop

package/src/MainLibs/src/Consts.js

@@ -575,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,
@@ -610,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

@@ -67,7 +67,8 @@ const PREFIX = {
   ONE: "one",
   MANY: "many",
   CREATE_OBJECT_ASYNC: "createObjectAsync",
-  CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
+  CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete",
+  CREATE_OBJECT_EXTERNAL_TOPIC: "createObjectExternalTopic"
 }
 //-----------------------------------------------------------------------------------------------------------
 
@@ -204,10 +205,10 @@ 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(
-            //(<createOptionalOnCreateIdentifiers>)
-            let optionalOnCreateIdentifiers
-            //(</createOptionalOnCreateIdentifiers>)
             requestParams.fieldNames, {
             [identifier.fieldName]: hash(optionalOnCreateIdentifiers)
           }
@@ -295,8 +296,9 @@ module.exports.createMain = async (
 
     let listOfObjectForCreates = [];
 
-    let objInstanceFullForDynamoDb = lodash.cloneDeep(objInstanceFull)
-    let objInstanceFullForGraph = lodash.cloneDeep(objInstanceFull)
+    let objInstanceFullForDynamoDb = lodash.cloneDeep(objInstanceFull);
+    let objInstanceFullForGraph = lodash.cloneDeep(objInstanceFull);
+    let objInstanceFullForExternalTopic = lodash.cloneDeep(objInstanceFull);
 
     if (errorsFound.length == 0) {
       //(<validateBeforeCreate>)
@@ -312,8 +314,9 @@ module.exports.createMain = async (
           if (parentObject) {
             if (createDataDetail.tableName.includes(firstLetterUpperCase(`${parentObject.objectType}Records`))) {
               Object.assign(
-                objInstanceFullForDynamoDb.fields,
-                { [`${parentObject.objectType}HandlerServiceTag`]: process.env.iz_serviceTag })
+                objInstanceFullForDynamoDb.fields, {
+                [`${parentObject.objectType}HandlerServiceTag`]: process.env.iz_serviceTag
+              })
             }
           }
 
@@ -375,6 +378,30 @@ 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>)
+          Object.assign(objInstanceFullForExternalTopic.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
+          _izContext.logger.debug("objInstanceFull before send to external topic", objInstanceFullForExternalTopic)
+
+          allAwaitingStepsId.push(await asyncFlowSharedLib.createAwaitingStepId(
+            (hash({
+              objType: objType,
+              graphServerTag: storageTag,
+              identifiers: objInstanceFullForGraph.identifiers,
+              callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
+            })),
+            PREFIX.CREATE_OBJECT_EXTERNAL_TOPIC
+          ));
+
+          let sendToCreateExternalTopic = {
+            Message: JSON.stringify(objInstanceFullForExternalTopic),
+            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/lambdaRole/data.js

@@ -204,6 +204,14 @@ async function externalLambdaIamRoleRelationships(_izContext, allRelSchemas) {
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
           externalResourceName(RESOURCE_CLASSES.sns, "ChangeRelationshipType_In", graphServiceName)
         )
+      ),
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+        },
+        graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
+          externalResourceName(RESOURCE_CLASSES.sns, "MoveRelationship_In", graphServiceName)
+        )
       )
     )
   }

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

@@ -167,6 +167,17 @@ async function snsSubscriptionDeleteRelationshipComplete(_izContext, allRelSchem
   }
 }
 
+async function snsSubscriptionDeleteRelationshipComplete(_izContext, allRelSchemas) {
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+
+  return {
+    serviceTag: serviceTag,
+    topicName: TOPIC_NAME_GRAPH_HANDLER.outMoveRelationship,
+    sqsEndpoint: TOPIC_NAME_GENERATE_CODE.moveRelationshipComplete
+  }
+}
+
+
 function snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext) {
   let serviceTag = [EXTERNAL_SERVICE_NAME.accountLimits]
   return {
@@ -186,4 +197,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,
@@ -65,7 +65,7 @@ async function data(_izContext, objectSchemas, srcPath, settings) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
         // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
-        tableForGetItem.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, storageResource.tableName));
+        tableForGetItem.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(storageResource.tableName)));
 
       } else if (storageResource.storageType === STORAGE_TYPES.graph) {
         // find graph serviceName from graphServerTag or *GetNodeHdrInv ?

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);

package/src/reStructure/TemplateData/generateRole/data.js

@@ -21,36 +21,50 @@ const templatePath = path.join(__dirname, "./template.ejs")
 
 function generateRole(_izContext, createSourceParams, srcPath) {
   // console.log("createSourceParams", createSourceParams);
-  let reformCreateSourceParams = {};
-  let createSourceRole = [];
+  let createSourceRole = new Set();
+  const reformCreateSourceParams = {};
+
   for (const createSource of createSourceParams) {
-    const { roleName, additionalResourcePermission } = createSource.templateData
-    if (additionalResourcePermission && roleName) {
-      if (!reformCreateSourceParams[roleName]) {
-        reformCreateSourceParams[roleName] = {
-          resourcePermissions: [...additionalResourcePermission]
-        };
-      } else {
-        let resourcePermission = reformCreateSourceParams[roleName].resourcePermissions
-        let mergeResource = [...resourcePermission, ...additionalResourcePermission]
+    const { roleName, additionalResourcePermission } = createSource.templateData;
 
-        const seen = new Set();
-        const unique = [];
+    if (!roleName || !additionalResourcePermission) continue;
 
-        for (const permission of mergeResource) {
-          const key = JSON.stringify(permission);
-          if (!seen.has(key)) {
-            seen.add(key);
-            unique.push(permission);
-          }
-        }
-        reformCreateSourceParams[roleName].resourcePermissions = unique;
+    if (!reformCreateSourceParams[roleName]) {
+      reformCreateSourceParams[roleName] = { resourcePermissions: [] };
+    }
+
+    const rolePermissions = reformCreateSourceParams[roleName].resourcePermissions;
+
+    for (const newPerm of additionalResourcePermission) {
+      const normalizedActions = Object.entries(newPerm.action)
+        .flatMap(([service, actions]) => actions.map(action => `${service}:${action}`))
+        .sort();
+
+      const effect = newPerm.effect;
+      const resources = [...new Set(newPerm.resource)];
+
+      const existing = rolePermissions.find(
+        permission =>
+          permission.effect === effect &&
+          JSON.stringify([...permission.action].sort()) === JSON.stringify(normalizedActions)
+      );
+
+      if (existing) {
+        // Merge resources (deduplicate with Set)
+        existing.resource = Array.from(new Set([...existing.resource, ...resources]));
+      } else {
+        // Push new permission
+        rolePermissions.push({
+          effect: effect,
+          action: normalizedActions,
+          resource: resources
+        });
       }
     }
   }
+  // console.log({ reformCreateSourceParams: JSON.stringify(reformCreateSourceParams, null, 2) })
   for (const [roleName, roleData] of Object.entries(reformCreateSourceParams)) {
-
-    createSourceRole.push(
+    createSourceRole.add(
       {
         templatePath: templatePath,
         templateData: { roleName, roleData },
@@ -71,4 +85,4 @@ function generateRole(_izContext, createSourceParams, srcPath) {
 
 module.exports = {
   generateRole
-}
+}