@izara_project/izara-core-generate-service-code 1.0.66 → 1.0.68

package/src/emit/custom/templates/s3/ReservedLimit_Main.ejs

@@ -15,19 +15,23 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
-import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-flow";
-import { sns, webSocket } from '@izara_project/izara-core-library-external-request';
+import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
+import {
+  sns,
+  webSocket
+} from '@izara_project/izara-core-library-external-request';
 import { consts as coreConsts } from '@izara_project/izara-middleware';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import { processStaticLimit } from '../../../libs/source/GenerateCodeLibs.js';
-import { consts as schemaConsts, utils } from "@izara_project/izara-core-library-service-schemas";
-const { createFlowTypeConcat } = utils
+import {
+  consts as schemaConsts,
+  utils
+} from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = utils;
 const { postToConnection } = webSocket;
 
 //(<optionalRequired>)
@@ -54,51 +58,54 @@ export default async function reservedLimit(
   //(</additionalProperties>)
   callingFlowConfig = {}
 ) {
-
   try {
-
     _izContext.logger.debug('----- reservedLimit event params ----- ', {
       objType,
       objInstanceFull,
       callingFlowConfig
     });
 
-    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID)
+    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID);
 
     //(<beforeReserved>)
     //(</beforeReserved>)
 
-
     // get static
     let payloadBeforeInvokeStaticLimit = {
       //(<additionalPropertiesStaticLimit>)
       //(</additionalPropertiesStaticLimit>)
-    }
+    };
 
-    let res = await processStaticLimit(_izContext,
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "StaticLimitProcessHdrInv", schemaConsts.EXTERNAL_SERVICE_NAME.accountLimits),
+    let res = await processStaticLimit(
+      _izContext,
+      await lambdaSharedLib.lambdaFunctionName(
+        _izContext,
+        'StaticLimitProcessHdrInv',
+        schemaConsts.EXTERNAL_SERVICE_NAME.accountLimits
+      ),
       payloadBeforeInvokeStaticLimit
-    )
+    );
 
-    _izContext.logger.debug("res::", res);
+    _izContext.logger.debug('res::', res);
 
     if (res.passStatus === false) {
-      postToConnection({ message: "static limit over" }, connectionId)
+      postToConnection({ message: 'static limit over' }, connectionId);
       let identifiers = hash({
         //(<hashIdentifiers>)
         //(</hashIdentifiers>)
-      })
+      });
 
       // after post message delete websocket task
-      await dynamodbSharedLib.deleteItem(_izContext,
-        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
+      await dynamodbSharedLib.deleteItem(
+        _izContext,
+        await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
         {
-          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
+          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${identifiers}`,
           connectionId: connectionId
         }
-      )
+      );
       //(<afterFailReservedStaticLimit>)
-      return
+      return;
       //(</afterFailReservedStaticLimit>)
     }
 
@@ -107,42 +114,51 @@ export default async function reservedLimit(
     let sendMsgReservedDynamic = {
       //(<additionalPropertiesReservedDynamic>)
       //(</additionalPropertiesReservedDynamic>)
-    }
+    };
 
     let callingFlowProperties = {
       //(<baseCallingFlowProperties>)
       //(</baseCallingFlowProperties>)
-    }
+    };
 
-    _izContext.logger.debug("callingFlowProperties", callingFlowProperties);
+    _izContext.logger.debug('callingFlowProperties', callingFlowProperties);
 
     if (callingFlowConfig) {
-      sendMsgReservedDynamic = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-        sendMsgReservedDynamic,
-        callingFlowSharedLib.addParentCallingFlowConfig(
-          callingFlowConfig,
+      sendMsgReservedDynamic =
+        callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+          sendMsgReservedDynamic,
+          callingFlowSharedLib.addParentCallingFlowConfig(
+            callingFlowConfig,
+            callingFlowSharedLib.createCallingFlowConfig(
+              //(<callingFlowPropertiesIfHaveCallingFlowConfig>)
+              await lambdaSharedLib.lambdaFunctionName(
+                _izContext,
+                'ReservedLimitCompleteHdrSqs'
+              ),
+              //(</callingFlowPropertiesIfHaveCallingFlowConfig>)
+              callingFlowProperties
+            )
+          )
+        );
+    } else {
+      sendMsgReservedDynamic =
+        callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+          sendMsgReservedDynamic,
           callingFlowSharedLib.createCallingFlowConfig(
-            //(<callingFlowPropertiesIfHaveCallingFlowConfig>)
-            await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
-            //(</callingFlowPropertiesIfHaveCallingFlowConfig>)
+            //(<callingFlowPropertiesIfNotHaveCallingFlowConfig>)
+            await lambdaSharedLib.lambdaFunctionName(
+              _izContext,
+              'ReservedLimitCompleteHdrSqs'
+            ),
+            //(</callingFlowPropertiesIfNotHaveCallingFlowConfig>)
             callingFlowProperties
           )
-        )
-      )
-    } else {
-      sendMsgReservedDynamic = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-        sendMsgReservedDynamic,
-        callingFlowSharedLib.createCallingFlowConfig(
-          //(<callingFlowPropertiesIfNotHaveCallingFlowConfig>)
-          await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
-          //(</callingFlowPropertiesIfNotHaveCallingFlowConfig>)
-          callingFlowProperties
-        )
-      );
+        );
     }
 
     // create awaitingSteps
-    await asyncFlowSharedLib.createAwaitingStep(_izContext,
+    await asyncFlowSharedLib.createAwaitingStep(
+      _izContext,
       asyncFlowSharedLib.createAwaitingStepId(
         //(<createAwaitStepId>)
         //(</createAwaitStepId>)
@@ -151,22 +167,28 @@ export default async function reservedLimit(
         //(<createPendingStepId>)
         //(</createPendingStepId>)
       )
-    )
-
+    );
 
     let sendMessageToReservedDynamic = {
       Message: JSON.stringify(sendMsgReservedDynamic),
-      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "ReservedDynamicUsage_In", schemaConsts.EXTERNAL_SERVICE_NAME.accountLimits)
+      TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+        _izContext,
+        'ReservedDynamicUsage_In',
+        schemaConsts.EXTERNAL_SERVICE_NAME.accountLimits
+      )
     };
-    _izContext.logger.debug("sendMessageToReservedDynamic", sendMessageToReservedDynamic);
+    _izContext.logger.debug(
+      'sendMessageToReservedDynamic',
+      sendMessageToReservedDynamic
+    );
     await sns.publishAsync(_izContext, sendMessageToReservedDynamic);
 
     return {
       objType,
-      objInstanceFull,
-    }
+      objInstanceFull
+    };
   } catch (err) {
     _izContext.logger.error('error GetSignedUrlAccountLimit: ', err);
-    throw (err)
+    throw err;
   }
 }

package/src/emit/custom/templates/triggerCache/CheckTriggerCache_HdrSqs.ejs

@@ -5,24 +5,68 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 
 import <%- functionName %> from './<%- functionName %>_Main.js';
 
+let perRecordsValidatorSchema = {
+  <% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
+  type: 'object',
+  properties: {
+    <% startConfig.properties.forEach((prop, index) => { %> <%- prop.propertyName %>: {
+      type: '<%- prop.type || 'string' %>'
+    } /*__EJS_COMMA_6__*/
+    <% }) %>
+  },
+  required: [<%- startConfig.properties.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %>]
+  <% } -%>
+};
+
+<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { -%>
+let messageAttributeValidatorSchema = {
+  type: 'object',
+  properties: {
+    <% startConfig.messageAttributes.forEach((prop, index) => { %> <%- prop.propertyName %>: {
+      type: 'object',
+      properties: {
+        Type: { type: 'string' },
+        Value: { type: '<%- prop.type || 'string' %>' }
+      },
+      required: ['Type', 'Value']
+    } /*__EJS_COMMA_14__*/
+    <% }) %>
+  },
+  required: [<%- startConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %>]
+};
+<% } else { -%>
+let messageAttributeValidatorSchema = null;
+<% } -%>
+
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
-export const main = middleware.wrap(async event => {
+export const main = middleware.wrap(async (event) => {
   try {
     const recordPromises = [];
-    await Promise.all(event.Records.map(async record => {
-      await recordHandlerSharedLib.validateRecord(record, '<%- queueName %>', {}, null);
-      recordPromises.push(recordHandlerSharedLib.recordHandler(
-        record,
-        <%- functionName %>,
-        '<%- queueName %>',
-        [
-          record.body.Message.identifiers,
-          record.body.TopicArn,
-          callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)
-        ]
-      ));
-    }));
+    await Promise.all(
+      event.Records.map(async (record) => {
+        await recordHandlerSharedLib.validateRecord(
+          record,
+          '<%- queueName %>',
+          perRecordsValidatorSchema,
+          messageAttributeValidatorSchema
+        );
+        recordPromises.push(
+          recordHandlerSharedLib.recordHandler(
+            record,
+            <%- functionName %>,
+            '<%- queueName %>',
+            [
+              record.body.Message,
+              record.body.TopicArn,
+              callingFlowSharedLib.addCallingFlowToPassOnProperties(
+                record.body.Message
+              )
+            ]
+          )
+        );
+      })
+    );
     await Promise.all(recordPromises);
     return event.Records;
   } catch (error) {

package/src/emit/custom/templates/triggerCache/CheckTriggerCache_Main.ejs

@@ -1,6 +1,9 @@
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 export default async function <%- functionName %>(
   _izContext,
   requestParams,
@@ -8,14 +11,8 @@ export default async function <%- functionName %>(
   callingFlowConfig = {}
 ) {
   try {
-    _izContext.logger.debug(
-      '<%- functionName %> requestParams',
-      requestParams
-    );
-    _izContext.logger.debug(
-      '<%- functionName %> topicArn',
-      topicArn
-    );
+    _izContext.logger.debug('<%- functionName %> requestParams', requestParams);
+    _izContext.logger.debug('<%- functionName %> topicArn', topicArn);
     _izContext.logger.debug(
       '<%- functionName %> callingFlowConfig',
       callingFlowConfig
@@ -39,13 +36,14 @@ export default async function <%- functionName %>(
         _izContext,
         { serviceTag: topicName[0], flowTag: topicName[2] },
         identifiers,
-        { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag }
+        {
+          flowTag: '<%- flowTag %>',
+          serviceTag: process.env.iz_serviceTag,
+          targetCompleteStep: process.env.iz_targetCompleteStepName
+        }
       );
 
-    _izContext.logger.debug(
-      '<%- functionName %> flowSchema',
-      flowSchema
-    );
+    _izContext.logger.debug('<%- functionName %> flowSchema', flowSchema);
     _izContext.logger.debug(
       '<%- functionName %> checkTriggerCache',
       checkTriggerCache
@@ -54,10 +52,7 @@ export default async function <%- functionName %>(
     //(<endpointHook>)
     //(</endpointHook>)
   } catch (error) {
-    _izContext.logger.error(
-      '<%- functionName %> failed',
-      error
-    );
+    _izContext.logger.error('<%- functionName %> failed', error);
     throw error;
   }
 }

package/src/emit/custom/templates/triggerCache/TriggerCacheComplete_Main.ejs

@@ -7,24 +7,31 @@ export default async function <%- functionName %>(
 ) {
   try {
     _izContext.logger.debug('<%- functionName %> requestParams', requestParams);
-    _izContext.logger.debug('<%- functionName %> callingFlowConfig', callingFlowConfig);
+    _izContext.logger.debug(
+      '<%- functionName %> callingFlowConfig',
+      callingFlowConfig
+    );
 
     //(<beforeCheckTriggeredCache>)
     //(</beforeCheckTriggeredCache>)
 
-    const checkTriggerResetedV2 = await triggeredCacheSharedLibV2.checkTriggerResetedV2(
-      _izContext,
-      { serviceTag: process.env.iz_serviceTag, flowTag: '<%- flowTag %>' },
-      //(<identifiers>)
-      {},
-      //(</identifiers>)
-      //(<uniqueRequestId>)
-      //(</uniqueRequestId>)
-      //(<settings>)
-      //(</settings>)
-    );
+    const checkTriggerResetedV2 =
+      await triggeredCacheSharedLibV2.checkTriggerResetedV2(
+        _izContext,
+        { serviceTag: process.env.iz_serviceTag, flowTag: '<%- flowTag %>' },
+        //(<identifiers>)
+        {}
+        //(</identifiers>)
+        //(<uniqueRequestId>)
+        //(</uniqueRequestId>)
+        //(<settings>)
+        //(</settings>)
+      );
 
-    _izContext.logger.debug('<%- functionName %> checkTriggerResetedV2', checkTriggerResetedV2);
+    _izContext.logger.debug(
+      '<%- functionName %> checkTriggerResetedV2',
+      checkTriggerResetedV2
+    );
 
     //(<endpointHook>)
     //(</endpointHook>)

package/src/emit/custom/templates/triggerCache/TriggerCache_Main.ejs

@@ -5,7 +5,10 @@ export default async function <%- functionName %>(
 ) {
   try {
     _izContext.logger.debug('<%- functionName %> requestParams', requestParams);
-    _izContext.logger.debug('<%- functionName %> callingFlowConfig', callingFlowConfig);
+    _izContext.logger.debug(
+      '<%- functionName %> callingFlowConfig',
+      callingFlowConfig
+    );
 
     //(<endpointHook>)
     //(</endpointHook>)

package/src/emit/function/functionYamlArtifact.js

@@ -1,14 +1,14 @@
-export function createSqsFunctionYamlArtifact({ functionName, handlerPath, roleName, queueName, fileName }) {
+export function createSqsFunctionYamlArtifact({ functionName, handlerPath, roleName, queueName, fileName, flowTag, flowStepName, targetCompleteStepName }) {
   if (![functionName, handlerPath, roleName, queueName, fileName].every(value => typeof value === 'string' && value !== '')) {
     throw new TypeError('Function descriptor must include functionName, handlerPath, roleName, queueName, and fileName');
   }
   return {
     path: `app/sls_yaml/generatedCode/source/${fileName}`,
-    content: renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName })
+    content: renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName, flowTag, flowStepName })
   };
 }
 
-export function renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName }) {
+export function renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName, flowTag, flowStepName, targetCompleteStepName }) {
   if (![functionName, handlerPath, roleName, queueName].every(value => typeof value === 'string' && value !== '')) {
     throw new TypeError('SQS function descriptor must include functionName, handlerPath, roleName, and queueName');
   }
@@ -16,7 +16,7 @@ export function renderSqsFunctionYaml({ functionName, handlerPath, roleName, que
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName, targetCompleteStepName)}${functionSetting(functionName)}
   events:
     - sqs:
         arn: arn:aws:sqs:\${self:custom.iz_region}:\${self:custom.iz_accountId}:\${self:custom.iz_resourcePrefix}${queueName}
@@ -24,7 +24,7 @@ ${functionSetting(functionName)}
 ${completionFilter(functionName)}`;
 }
 
-export function renderApiFunctionYaml({ functionName, handlerPath, roleName, routes = [] }) {
+export function renderApiFunctionYaml({ functionName, handlerPath, roleName, routes = [], flowTag, flowStepName }) {
   if (!Array.isArray(routes)) {
     throw new TypeError('API function routes must be an array');
   }
@@ -41,12 +41,12 @@ export function renderApiFunctionYaml({ functionName, handlerPath, roleName, rou
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
   events:
 ${routeEvents ? `${routeEvents}\n` : ''}`;
 }
 
-export function renderWbsFunctionYaml({ functionName, handlerPath, roleName, routeName }) {
+export function renderWbsFunctionYaml({ functionName, handlerPath, roleName, routeName, flowTag, flowStepName }) {
   if (![functionName, handlerPath, roleName, routeName].every(value => typeof value === 'string' && value !== '')) {
     throw new TypeError('WebSocket function descriptor must include functionName, handlerPath, roleName, and routeName');
   }
@@ -54,7 +54,7 @@ export function renderWbsFunctionYaml({ functionName, handlerPath, roleName, rou
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
   events:
     - websocket:
         route: ${routeName}
@@ -63,16 +63,36 @@ ${functionSetting(functionName)}
 `;
 }
 
-export function renderInvFunctionYaml({ functionName, handlerPath, roleName }) {
+export function renderInvFunctionYaml({ functionName, handlerPath, roleName, flowTag, flowStepName }) {
   return `${functionName}:
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
 `;
 }
 
-export function renderEventBridgeFunctionYaml({ functionName, handlerPath, roleName, flowTag, schedules = [] }) {
+export function renderS3FunctionYaml({ functionName, handlerPath, roleName, bucketName, flowTag, flowStepName }) {
+  return `${functionName}:
+  handler: ${handlerPath}
+  name: \${self:custom.iz_resourcePrefix}${functionName}
+  role: ${roleName}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
+  events:
+    - s3:
+        bucket: ${bucketName}
+        event: s3:ObjectCreated:*
+        existing: true
+        rules:
+        #<#${functionName}rules#>
+        #<#/${functionName}rules#>
+          - prefix: uploads/
+          - suffix: .csv
+        forceDeploy: true
+`;
+}
+
+export function renderEventBridgeFunctionYaml({ functionName, handlerPath, roleName, flowTag, flowStepName, schedules = [] }) {
   if (![functionName, handlerPath, roleName, flowTag].every(value => typeof value === 'string' && value !== '') || !Array.isArray(schedules)) {
     throw new TypeError('EventBridge function descriptor must include functionName, handlerPath, roleName, flowTag, and schedules');
   }
@@ -85,11 +105,25 @@ export function renderEventBridgeFunctionYaml({ functionName, handlerPath, roleN
   return `\${self:custom.iz_resourcePrefix}${functionName}:
   handler: ${handlerPath}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
   description: ${flowTag} (EventBridge Schedule)
 ${schedules.length === 0 ? '' : `  events:\n${schedules.map(schedule => `    - schedule:\n        name: \${self:custom.iz_resourcePrefix}${schedule.name}\n        description: '${schedule.description ?? ''}'\n        rate: ${schedule.rate?.[0]}\n        enabled: true`).join('\n')}\n`}`;
 }
 
+function environmentSetting(functionName, flowTag, flowStepName, targetCompleteStepName) {
+  if (flowTag === undefined && flowStepName === undefined && targetCompleteStepName === undefined) return '';
+  let envs = [];
+  if (flowTag !== undefined) envs.push(`    iz_flowTag: ${flowTag === '' ? "''" : flowTag}`);
+  if (flowStepName !== undefined) envs.push(`    iz_flowStepName: ${flowStepName === '' ? "''" : flowStepName}`);
+  if (targetCompleteStepName !== undefined) envs.push(`    iz_targetCompleteStepName: ${flowTag}${targetCompleteStepName}`);
+  
+  if (envs.length === 0) return '';
+  return `  environment:
+${envs.join('\n')}
+    #<#${functionName}Environment#>
+    #<#/${functionName}Environment#>\n`;
+}
+
 function functionSetting(functionName) {
   return `  #<#${functionName}FunctionSetting#>\n  #<#/${functionName}FunctionSetting#>`;
 }

package/src/emit/rbac/emitDynamicRbacFlowSchemas.js

@@ -16,7 +16,7 @@ const RBAC_FLOW_DEFINITIONS = [
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 
 export const dynamicRbacFlowSchemaPaths = RBAC_FLOW_DEFINITIONS.map(
-  ({ flowTag }) => `app/src/schemas/FlowSchemas/generateCode/${flowTag}.js`
+  ({ flowTag }) => `app/src/schemas/FlowSchemas/generateCode/FlowRbac/${flowTag}.js`
 );
 
 export function rbacFlowSchemaManagedPaths(objects = []) {
@@ -25,7 +25,12 @@ export function rbacFlowSchemaManagedPaths(objects = []) {
   }
   return [
     ...dynamicRbacFlowSchemaPaths,
-    ...objects.filter(hasRbacAddOn).map(object => `app/src/schemas/FlowSchemas/generateCode/${rbacFlowTag(object)}.js`)
+    ...objects
+      .filter(hasRbacAddOn)
+      .map(
+        object =>
+          `app/src/schemas/FlowSchemas/generateCode/FlowRbac/${rbacFlowTag(object)}.js`
+      )
   ];
 }
 
@@ -39,31 +44,40 @@ export async function emitDynamicRbacFlowSchemas({ objects, serviceTag }) {
     return [];
   }
   if (typeof serviceTag !== 'string' || serviceTag.trim() === '') {
-    throw new TypeError('GenerationRequest.serviceTag is required when generating RBAC schemas');
+    throw new TypeError(
+      'GenerationRequest.serviceTag is required when generating RBAC schemas'
+    );
   }
 
   return Promise.all([
-    ...RBAC_FLOW_DEFINITIONS.map(({ flowTag, event }) => artifact(
-      flowTag,
-      createSharedRbacFlow(flowTag, event)
-    )),
+    ...RBAC_FLOW_DEFINITIONS.map(({ flowTag, event }) =>
+      artifact(flowTag, createSharedRbacFlow(flowTag, event))
+    ),
     ...rbacObjects.map(object => {
       const flowTag = rbacFlowTag(object);
-      return artifact(flowTag, createUserRbacFlow(flowTag, serviceTag, object.objectType));
+      return artifact(
+        flowTag,
+        createUserRbacFlow(flowTag, serviceTag, object.objectType)
+      );
     })
   ]);
 }
 
 function hasRbacAddOn(object) {
-  return Array.isArray(object?.addOnDataStructure)
-    && object.addOnDataStructure.some(addOn => addOn?.type === 'rbac');
+  return (
+    Array.isArray(object?.addOnDataStructure) &&
+    object.addOnDataStructure.some(addOn => addOn?.type === 'rbac')
+  );
 }
 
 async function artifact(flowTag, flow) {
   return {
-    path: `app/src/schemas/FlowSchemas/generateCode/${flowTag}.js`,
+    path: `app/src/schemas/FlowSchemas/generateCode/FlowRbac/${flowTag}.js`,
     content: ejs.render(
-      await readFile(new URL('DynamicRbacFlowSchema.ejs', TEMPLATE_URL), 'utf8'),
+      await readFile(
+        new URL('DynamicRbacFlowSchema.ejs', TEMPLATE_URL),
+        'utf8'
+      ),
       { flowTag, flow }
     )
   };
@@ -72,7 +86,6 @@ async function artifact(flowTag, flow) {
 function createSharedRbacFlow(flowTag, event) {
   return {
     flowTag,
-    fileName: 'flow-rbac',
     initiateBy: 'system',
     statusType: 'none',
     event,
@@ -97,12 +110,12 @@ function createSharedRbacFlow(flowTag, event) {
 function createUserRbacFlow(flowTag, serviceTag, objectType) {
   return {
     flowTag,
-    fileName: 'flow-rbac',
     objType: { serviceTag, objectType },
-    event: ['lambdaSyncInv'],
+    event: ['ownTopic'],
     initiateBy: 'system',
     handleObj: 'one',
     statusType: 'none',
+    outputTopic: true,
     stepMessageAttributes: {
       userId: { propertyName: 'x-correlation-base-user-id', type: 'string' },
       correlationId: { propertyName: 'x-correlation-id', type: 'string' }