@izara_project/izara-core-generate-service-code 1.0.54 → 1.0.56

package/src/codeGenerators/app/src/generatedCode/libs/templates/Consts.ejs

@@ -166,12 +166,12 @@ const FUNCTION_NAME = {
   outTranslateIds: 'processTranslateIdsComplete',
   findData: 'findData',
   processLogical: 'processLogical',
-  updateNodeComplete: 'updateNodeComplete',
-  createObjectComplete: 'createObjectComplete',
-  getNodeComplete: 'getNodeComplete',
+  updateNodeComplete: 'updateComplete',
+  createObjectComplete: 'createComplete',
+  getNodeComplete: 'getComplete',
   paginateProcessLogical: 'paginateProcessLogical',
   deleteNode: 'deleteNode',
-  deleteNodeComplete: 'deleteNodeComplete',
+  deleteNodeComplete: 'deleteComplete',
   createObjectS3: 'createObjectS3',
   createObjectS3Complete: 'webSocketTaskComplete',
   processAfterUploadS3: 'processAfterUploadS3',
@@ -203,12 +203,12 @@ const SHORT_FUNCTION_NAME = functionName => {
     [FUNCTION_NAME.deleteRelComplete]: 'deleteRelComp',
     [FUNCTION_NAME.findData]: 'findData',
     [FUNCTION_NAME.processLogical]: 'processLogical',
-    [FUNCTION_NAME.updateNodeComplete]: 'updateNodeComp',
-    [FUNCTION_NAME.createObjectComplete]: 'createObjectComp',
-    [FUNCTION_NAME.getNodeComplete]: 'getNodeComp',
+    [FUNCTION_NAME.updateNodeComplete]: 'updateComp',
+    [FUNCTION_NAME.createObjectComplete]: 'createComp',
+    [FUNCTION_NAME.getNodeComplete]: 'getComp',
     [FUNCTION_NAME.paginateProcessLogical]: 'paginateProLogical',
     [FUNCTION_NAME.deleteNode]: 'deleteNode',
-    [FUNCTION_NAME.deleteNodeComplete]: 'deleteNodeComp',
+    [FUNCTION_NAME.deleteNodeComplete]: 'deleteComp',
     [FUNCTION_NAME.createObjectS3Complete]: 'webSocketTaskComp',
     [FUNCTION_NAME.getRel]: 'getRel',
     [FUNCTION_NAME.getRelComplete]: 'getRelComp',
@@ -238,7 +238,7 @@ const SOURCE_GENERATE_IAM_ROLE = {
   ProcessFindDataRole: 'ProcFindData',
   ObjectCompleteRole: 'ObjectCom',
   NodeCompleteRole: 'NodeCom',
-  RelationshipRole: 'Relationship',
+  FlowRelationshipRole: 'Relationship',
   RelationshipCompleteRole: 'RelationshipCom',
   FlowSchemaUploadS3Role: 'FlowSchemaUploadS3',
   FlowSchemaOwnTopic: 'FlowSchemaOwnTopic',
@@ -320,27 +320,27 @@ const TOPIC_NAME_GENERATE_CODE = {
   createRelComplete: 'CreateRelationshipComplete',
   deleteRelComplete: 'DeleteRelationshipComplete',
   getRelComplete: 'GetRelationshipComplete',
-  outUpdateRelComplete: 'UpdateRelationshipComplete_Out',
-  outCreateRelComplete: 'CreateRelationshipComplete_Out',
-  outDeleteRelComplete: 'DeleteRelationshipComplete_Out',
-  outGetRelComplete: 'GetRelationshipComplete_Out',
-  updateNodeComplete: 'UpdateNodeComplete',
-  outUpdateNodeComplete: 'UpdateNodeComplete_Out',
-  createNodeComplete: 'CreateObjectComplete',
-  outCreateNodeComplete: 'CreateObjectComplete_Out',
-  deleteNodeComplete: 'DeleteNodeComplete',
-  outDeleteNodeComplete: 'DeleteNodeComplete_Out',
-  getNodeComplete: 'GetNodeComplete',
-  outGetNodeComplete: 'GetNodeComplete_Out',
+  outUpdateRelComplete: 'UpdateRelationship_Out',
+  outCreateRelComplete: 'CreateRelationship_Out',
+  outDeleteRelComplete: 'DeleteRelationship_Out',
+  outGetRelComplete: 'GetRelationship_Out',
+  updateNodeComplete: 'UpdateComplete',
+  outUpdateNodeComplete: 'Update_Out',
+  createNodeComplete: 'CreateComplete',
+  outCreateNodeComplete: 'Create_Out',
+  deleteNodeComplete: 'DeleteComplete',
+  outDeleteNodeComplete: 'Delete_Out',
+  getNodeComplete: 'GetComplete',
+  outGetNodeComplete: 'Get_Out',
   reservedLimitComplete: 'ReservedLimitComplete',
   createPreSignUrl: 'CreatePreSignUrl',
   flowSchemaOwnTopicComplete: 'FlowSchemaOwnTopicComplete',
   flowSchemaOwnTopicEndpointComplete: 'FlowSchemaOwnTopicEndpointComplete',
   createRecordComplete: 'CreateRecordComplete',
   changeRelationshipComplete: 'ChangeRelationshipComplete',
-  outChangeRelationshipComplete: 'ChangeRelationshipComplete_Out',
+  outChangeRelationshipComplete: 'ChangeRelationship_Out',
   moveRelationshipComplete: 'MoveRelationshipComplete',
-  outMoveRelationshipComplete: 'MoveRelationshipComplete_Out'
+  outMoveRelationshipComplete: 'MoveRelationship_Out'
 };
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/codeGenerators/resource/sls_yaml/DynamoDBGenerator.js

@@ -72,15 +72,15 @@ export async function generateDynamoDBTables(allSchemas, options) {
         }
     }
 
-    let generatedCount = 0;
-    const yamlOutputPath = path.join(resourceYamlDir, 'generated-dynamoDB-table.yml');
+  let generatedCount = 0;
+  const yamlOutputPath = path.join(resourceYamlDir, 'generated-dynamoDB-table.yml');
 
-    // Generate system tables first
-    const systemYamlTplPath = path.join(__dirname, 'templates', 'SystemDynamoDB_Yaml.ejs');
-    const systemYamlTpl = await fs.readFile(systemYamlTplPath, 'utf-8');
-    const systemYamlContent = ejs.render(systemYamlTpl, {});
-    await appendToFile(yamlOutputPath, systemYamlContent);
-    generatedCount += 8; // 8 system tables
+  // Generate system tables first
+  const systemYamlTplPath = path.join(__dirname, 'templates', 'SystemDynamoDB_Yaml.ejs');
+  const systemYamlTpl = await fs.readFile(systemYamlTplPath, 'utf-8');
+  const systemYamlContent = ejs.render(systemYamlTpl, {});
+  await fs.writeFile(yamlOutputPath, `${systemYamlContent}\n`, 'utf-8');
+  generatedCount += 12; // 12 system tables
 
     for (const [tableName, keys] of tables.entries()) {
         const yamlContent = ejs.render(yamlTpl, {

package/src/codeGenerators/resource/sls_yaml/FlowOutGenerator.js

@@ -2,72 +2,78 @@ import path from 'path';
 import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
+
 import { getFlowsForGeneration } from '../../app/src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 async function appendToFile(filePath, content) {
-    try {
-        await fs.mkdir(path.dirname(filePath), { recursive: true });
-        await fs.appendFile(filePath, content + '\n', 'utf-8');
-    } catch (error) {
-        console.error(`[Error] Failed to append to file: ${filePath}`, error);
-    }
+  try {
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await fs.appendFile(filePath, `${content}\n`, 'utf-8');
+  } catch (error) {
+    console.error(`[Error] Failed to append file: ${filePath}`, error);
+  }
 }
 
 export async function generateFlowOut(allSchemas, options) {
-    console.log('  [FlowOutGenerator] Generating Flow Out nodes (SNS Topics)...');
-    
-    const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(resourceYamlDir, { recursive: true });
+  console.log('  [FlowOutGenerator] Generating Flow Out nodes (SNS Topics)...');
+
+  const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
+  await fs.mkdir(resourceYamlDir, { recursive: true });
+
+  const yamlTplPath = path.join(__dirname, 'templates', 'FlowOut_Yaml.ejs');
+  const yamlTpl = await fs.readFile(yamlTplPath, 'utf-8');
 
-    const yamlTplPath = path.join(__dirname, 'templates', 'FlowOut_Yaml.ejs');
-    const yamlTpl = await fs.readFile(yamlTplPath, 'utf-8');
+  let generatedCount = 0;
+  const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-out.yml');
+  await fs.writeFile(yamlOutputPath, 'Resources:\n', 'utf-8'); // ponytail: simplest one-line fix
 
-    let generatedCount = 0;
-    const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-out.yml');
+  const generatedTopics = new Set();
 
-    const flows = getFlowsForGeneration(allSchemas);
-    for (const flow of flows) {
-        if (flow.outputTopic === true) {
-            const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
-            const topicName = upperCase(flow.flowTag);
+  async function appendTopic(topicName) {
+    if (generatedTopics.has(topicName)) return;
 
-            const yamlContent = ejs.render(yamlTpl, {
-                topicName: topicName
-            });
+    generatedTopics.add(topicName);
+    const yamlContent = ejs.render(yamlTpl, { topicName });
+    await appendToFile(yamlOutputPath, yamlContent);
+    generatedCount++;
+  }
 
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-        }
-    }
+  const flows = getFlowsForGeneration(allSchemas);
+  for (const flow of flows) {
+    if (flow.outputTopic !== true) continue;
+    await appendTopic(flow.flowTag.charAt(0).toUpperCase() + flow.flowTag.slice(1));
+  }
 
-    const systemTopics = [
-        'CreateObjectComplete',
-        'DeleteNodeComplete',
-        'UpdateNodeComplete',
-        'GetNodeComplete',
-        'ProcessLogicalComplete',
-        'FindDataComplete',
-        // CRUD Async Topics
-        'Create', 'Update', 'Delete',
-        // Relationship Topics
-        'CreateRelationship', 'UpdateRelationship', 'DeleteRelationship',
-        'GetRelationship', 'ChangeRelationship', 'MoveRelationship',
-        // RBAC Topics
-        'CreateTargetRole', 'ListTargetRole', 'DeleteTargetRole',
-        'CreateRolePermissions', 'ListRolePermissions', 'DeleteRolePermissions',
-        'CreateUserRole', 'ListUserInRoles', 'DeleteUserFromRole'
-    ];
+  const systemTopics = [
+    'ProcessLogical',
+    'PaginateProcessLogical',
+    'FindData',
+    'Create',
+    'Update',
+    'Delete',
+    'CreateRelationship',
+    'UpdateRelationship',
+    'DeleteRelationship',
+    'GetRelationship',
+    'ChangeRelationship',
+    'MoveRelationship',
+    'CreateTargetRole',
+    'ListTargetRole',
+    'DeleteTargetRole',
+    'CreateRolePermissions',
+    'ListRolePermissions',
+    'DeleteRolePermissions',
+    'CreateUserRole',
+    'ListUserInRoles',
+    'DeleteUserFromRole'
+  ];
 
-    for (const topic of systemTopics) {
-        const yamlContent = ejs.render(yamlTpl, {
-            topicName: topic
-        });
-        await appendToFile(yamlOutputPath, yamlContent);
-        generatedCount++;
-    }
+  for (const topic of systemTopics) {
+    await appendTopic(topic);
+  }
 
-    console.log(`  [FlowOutGenerator] Generated ${generatedCount} SNS Topics for Flow Out nodes.`);
+  console.log(`  [FlowOutGenerator] Generated ${generatedCount} SNS Topics for Flow Out nodes.`);
 }

package/src/codeGenerators/resource/sls_yaml/FlowResourceYamlGenerator.js

@@ -2,198 +2,187 @@ import path from 'path';
 import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
+
 import { getFlowsForGeneration } from '../../app/src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 async function appendToFile(filePath, content) {
-    try {
-        await fs.mkdir(path.dirname(filePath), { recursive: true });
-        await fs.appendFile(filePath, content + '\n', 'utf-8');
-    } catch (error) {
-        console.error(`[Error] Failed to append to file: ${filePath}`, error);
-    }
+  try {
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await fs.appendFile(filePath, `${content}\n`, 'utf-8');
+  } catch (error) {
+    console.error(`[Error] Failed to append file: ${filePath}`, error);
+  }
 }
 
 export async function generateFlowResourceYaml(allSchemas, options) {
-    console.log('  [FlowResourceYamlGenerator] Generating SQS/SNS YAML resources for flows...');
-    
-    const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(resourceYamlDir, { recursive: true });
-
-    const resourceYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceYaml.ejs');
-    const resourceBeforeLogicalYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceBeforeLogicalYaml.ejs');
-    
-    const resourceYamlTpl = await fs.readFile(resourceYamlTplPath, 'utf-8');
-    const resourceBeforeLogicalYamlTpl = await fs.readFile(resourceBeforeLogicalYamlTplPath, 'utf-8');
-
-    let generatedCount = 0;
-    const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-in-sqs.yml');
-
-    const flows = getFlowsForGeneration(allSchemas);
-    for (const flow of flows) {
-        const flowTag = flow.flowTag;
-        
-        // Generate In-Queue resources for any flow that listens on its own topic
-        if (flow.event && flow.event.includes('ownTopic')) {
-            // Render main ResourceYaml.ejs (e.g., InCreate, CreateHdrSqs)
-            const yamlContent = ejs.render(resourceYamlTpl, {
-                queueName: flowTag
-            });
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-
-            // Check if there are beforeLogical configs for this flow
-            const generateCodeConfigs = flows
-                .filter(f => f.generatedCodeConfig && f.generatedCodeConfig.generatedCodeTag.toLowerCase() === flowTag.toLowerCase())
-                .map(f => ({
-                    ...f.generatedCodeConfig,
-                    flowTag: f.flowTag
-                }));
-
-            const beforeLogicalConfigs = generateCodeConfigs.filter(c => c.codeHookTag === 'beforeLogical');
-
-            if (beforeLogicalConfigs.length > 0) {
-                // Collect unique flowTags (like ValidateUnitTrackedProperty) from the beforeLogical configs
-                const uniqueFlowTags = [...new Set(beforeLogicalConfigs.map(c => c.flowTag))];
-                
-                const beforeLogicalYamlContent = ejs.render(resourceBeforeLogicalYamlTpl, {
-                    queueName: `${flowTag}BeforeLogical`,
-                    flowTags: uniqueFlowTags
-                });
-
-                await appendToFile(yamlOutputPath, beforeLogicalYamlContent);
-                generatedCount++;
-            }
-        } else if (flow.event && flow.event.includes('extTopic')) {
-            // Custom flows using extTopic do not have ownTopic, but need an entry queue
-            const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-            const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-            const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                queueName: `Process${flowTag}Sqs`
-            });
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-        }
-        
-        // Generate Complete queues for custom FlowSchema
-        // Also generate queues for any flowStep that uses sqs, dsq, or extTopic
-        if (flow.flowSteps && Array.isArray(flow.flowSteps)) {
-            for (const stepConfig of flow.flowSteps) {
-                const stepName = stepConfig.stepName;
-                if (stepName === 'InTag') continue;
-                
-                const events = stepConfig.event || ['sqs'];
-                for (const ev of events) {
-                    let queueName = flowTag + stepName;
-                    if (stepName === 'Complete') {
-                        queueName = flowTag + 'Complete';
-                    }
-
-                    if (ev === 'sqs' || ev === 'ownTopic') {
-                        // sqs and ownTopic create SNS Topic + Subscription + SQS Queue
-                        const yamlContent = ejs.render(resourceYamlTpl, {
-                            queueName: queueName
-                        });
-                        await appendToFile(yamlOutputPath, yamlContent);
-                        generatedCount++;
-                    } else if (ev === 'dsq' || ev === 'extTopic') {
-                        // extTopic and dsq create ONLY SQS Queue
-                        const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-                        const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-                        const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                            queueName: queueName
-                        });
-                        await appendToFile(yamlOutputPath, yamlContent);
-                        generatedCount++;
-                    }
-                }
-            }
-        }
+  console.log('  [FlowResourceYamlGenerator] Generating SQS/SNS YAML resources for flows...');
 
-        // Generate SQS queues for S3 Event flows
-        if (flow.event && flow.event.includes('s3')) {
-            const queueNames = [
-                `${flowTag}CreatePreSignUrlSqs`,
-                `${flowTag}ReservedLimitSqs`
-            ];
-            
-            for (const qName of queueNames) {
-                const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-                const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-                const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                    queueName: qName
-                });
-                await appendToFile(yamlOutputPath, yamlContent);
-                generatedCount++;
-            }
-        }
+  const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
+  await fs.mkdir(resourceYamlDir, { recursive: true });
 
-        // Generate Dsq queues for Relationship
-        if (flow.isDynamicRelationshipType) {
-            // Usually Relationship has dead-letter queue processing
-            const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-            const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-            const queueName = flowTag + 'Dsq';
-            const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                queueName: queueName
-            });
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-        }
+  const resourceYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceYaml.ejs');
+  const resourceBeforeLogicalYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceBeforeLogicalYaml.ejs');
+  const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
+
+  const resourceYamlTpl = await fs.readFile(resourceYamlTplPath, 'utf-8');
+  const resourceBeforeLogicalYamlTpl = await fs.readFile(resourceBeforeLogicalYamlTplPath, 'utf-8');
+  const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
+
+  let generatedCount = 0;
+  const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-in-sqs.yml');
+  await fs.writeFile(yamlOutputPath, 'Resources:\n', 'utf-8'); // ponytail: build minimum that works, one-line initialization fix
+
+  const generatedResources = new Set();
+
+  async function appendUnique(resourceKey, template, templateData) {
+    if (generatedResources.has(resourceKey)) return;
+
+    generatedResources.add(resourceKey);
+    const yamlContent = ejs.render(template, templateData);
+    await appendToFile(yamlOutputPath, yamlContent);
+    generatedCount++;
+  }
+
+  const flows = getFlowsForGeneration(allSchemas);
+
+  for (const flow of flows) {
+    const flowTag = flow.flowTag;
+
+    if (flow.event && flow.event.includes('ownTopic')) {
+      await appendUnique(flowTag, resourceYamlTpl, { queueName: flowTag });
+
+      const generateCodeConfigs = flows
+        .filter((candidate) => candidate.generatedCodeConfig
+          && candidate.generatedCodeConfig.generatedCodeTag?.toLowerCase() === flowTag.toLowerCase())
+        .map((candidate) => ({
+          ...candidate.generatedCodeConfig,
+          flowTag: candidate.flowTag
+        }));
+
+      const beforeLogicalConfigs = generateCodeConfigs.filter((config) => config.codeHookTag === 'beforeLogical');
+      if (beforeLogicalConfigs.length > 0) {
+        const uniqueFlowTags = [...new Set(beforeLogicalConfigs.map((config) => config.flowTag))];
+        await appendUnique(`${flowTag}BeforeLogical`, resourceBeforeLogicalYamlTpl, {
+          queueName: `${flowTag}BeforeLogical`,
+          flowTags: uniqueFlowTags
+        });
+      }
+    } else if (flow.event && flow.event.includes('extTopic')) {
+      await appendUnique(`Process${flowTag}HdrSqs`, resourceSqsYamlTpl, {
+        queueName: `Process${flowTag}HdrSqs`
+      });
     }
 
-    // Add hardcoded ownTopic flows for CRUD, RBAC, Relationship
-    const systemOwnTopicFlows = [
-        'Create', 'Update', 'Delete', // CRUD
-        'CreateRelationship', 'UpdateRelationship', 'DeleteRelationship', 'ChangeRelationship', 'MoveRelationship', // Relationship
-        'CreateTargetRole', 'DeleteTargetRole', 'CreateRolePermissions', 'DeleteRolePermissions', 'CreateUserRole', 'DeleteUserFromRole' // RBAC
-    ];
-    for (const flowTag of systemOwnTopicFlows) {
-        const yamlContent = ejs.render(resourceYamlTpl, { queueName: flowTag });
-        await appendToFile(yamlOutputPath, yamlContent);
-        generatedCount++;
-        
-        // BeforeLogical queues for CRUD
-        if (['Create', 'Update', 'Delete'].includes(flowTag)) {
-            // Since we don't have beforeLogical configs here, we assume we might need them or we can just generate a generic one?
-            // For now, only custom flows generate beforeLogical dynamically above.
+    if (Array.isArray(flow.flowSteps)) {
+      for (const stepConfig of flow.flowSteps) {
+        const stepName = stepConfig.stepName;
+        if (stepName === 'InTag') continue;
+
+        const events = stepConfig.event || ['sqs'];
+        for (const ev of events) {
+          let queueName = `${flowTag}${stepName}`;
+          if (stepName === 'Complete') {
+            queueName = `${flowTag}Complete`;
+          }
+
+          if (ev === 'ownTopic') {
+            await appendUnique(queueName, resourceYamlTpl, { queueName });
+          } else if (ev === 'sqs') {
+            // ponytail: purely SQS events don't need SNS topics, use resourceSqsYamlTpl
+            await appendUnique(`${queueName}HdrSqs`, resourceSqsYamlTpl, {
+              queueName: `${queueName}HdrSqs`
+            });
+          } else if (ev === 'dsq') {
+            await appendUnique(`${queueName}HdrDsq`, resourceSqsYamlTpl, {
+              queueName: `${queueName}HdrDsq`
+            });
+          } else if (ev === 'extTopic') {
+            await appendUnique(`${queueName}HdrSqs`, resourceSqsYamlTpl, {
+              queueName: `${queueName}HdrSqs`
+            });
+          }
         }
+      }
     }
 
-    // Generate Dsq queues for Relationship
-    const relationshipActions = ['CreateRelationship', 'UpdateRelationship', 'DeleteRelationship', 'GetRelationship', 'ChangeRelationship', 'MoveRelationship'];
-    const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-    const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-    for (const action of relationshipActions) {
-        const yamlContent = ejs.render(resourceSqsYamlTpl, { queueName: action + 'Dsq' });
-        await appendToFile(yamlOutputPath, yamlContent);
-        generatedCount++;
-    }
+    if (flow.event && flow.event.includes('s3')) {
+      const queueNames = [
+        `${flowTag}CreatePreSignUrlHdrSqs`,
+        `${flowTag}ReservedLimitHdrSqs`
+      ];
 
-    // Add System Queues
-    const systemQueues = [
-        'ProcessLogical',
-        'PaginateProcessLogical',
-        'FindData',
-        'Register',
-        'WebSocket',
-        'CreateObjectComplete',
-        'UpdateNodeComplete',
-        'DeleteNodeComplete',
-        'GetNodeComplete'
-    ];
-
-    const resourceSqsYamlTplGlobal = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-
-    for (const sysQueue of systemQueues) {
-        const yamlContent = ejs.render(resourceSqsYamlTplGlobal, {
-            queueName: sysQueue
-        });
-        await appendToFile(yamlOutputPath, yamlContent);
-        generatedCount++;
+      for (const queueName of queueNames) {
+        await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+      }
     }
 
-    console.log(`  [FlowResourceYamlGenerator] Appended ${generatedCount} sections to generated-sns-in-sqs.yml.`);
+    if (flow.isDynamicRelationshipType) {
+      const queueName = `${flowTag}HdrDsq`;
+      await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+    }
+  }
+
+  const systemOwnTopicFlows = [
+    'ProcessLogical',
+    'PaginateProcessLogical',
+    'FindData',
+    'Create',
+    'Update',
+    'Delete',
+    'CreateRelationship',
+    'UpdateRelationship',
+    'DeleteRelationship',
+    'ChangeRelationship',
+    'MoveRelationship',
+    'CreateTargetRole',
+    'DeleteTargetRole',
+    'CreateRolePermissions',
+    'DeleteRolePermissions',
+    'CreateUserRole',
+    'DeleteUserFromRole'
+  ];
+
+  for (const flowTag of systemOwnTopicFlows) {
+    await appendUnique(flowTag, resourceYamlTpl, { queueName: flowTag });
+  }
+
+  const relationshipActions = [
+    'CreateRelationship',
+    'UpdateRelationship',
+    'DeleteRelationship',
+    'GetRelationship',
+    'ChangeRelationship',
+    'MoveRelationship'
+  ];
+
+  for (const action of relationshipActions) {
+    const queueName = `${action}HdrDsq`;
+    await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+  }
+
+  const systemQueues = [
+    'Register',
+    'WebSocket',
+    'CreateComplete',
+    'UpdateComplete',
+    'DeleteComplete',
+    'GetComplete',
+    'GetRelationship',
+    'CreateRelationshipComplete',
+    'UpdateRelationshipComplete',
+    'DeleteRelationshipComplete',
+    'GetRelationshipComplete',
+    'ChangeRelationshipComplete',
+    'MoveRelationshipComplete'
+  ];
+
+  for (const sysQueue of systemQueues) {
+    const queueName = `${sysQueue}HdrSqs`;
+    await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+  }
+
+  console.log(`  [FlowResourceYamlGenerator] Appended ${generatedCount} sections to generated-sns-in-sqs.yml.`);
 }