@izara_project/izara-core-generate-service-code 1.0.61 → 1.0.63

package/src/codeGenerators/app/src/generatedCode/Flow/{FlowSchemas → FlowObjects}/templates/step/FlowEndpointComplete_Main.ejs

@@ -39,7 +39,7 @@ const PREFIX = {
  * @param {*} graphServiceTag
  * @param {*} errorsFound
  */
-function validateInput(returnValue, status, graphServiceTag, errorsFound) {
+function _validateInput(returnValue, status, graphServiceTag, errorsFound) {
   if (!Object.prototype.hasOwnProperty.call(returnValue, 'queryResult')) {
     errorsFound.push(
       'message is not have property queryResult, should be not happen',
@@ -83,7 +83,7 @@ function validateInput(returnValue, status, graphServiceTag, errorsFound) {
 /**
  * @param {*} value
  */
-function isEmpty(value) {
+function _isEmpty(value) {
   if (value == null) return true;
 
   if (
@@ -108,7 +108,7 @@ function isEmpty(value) {
  * @param {*} returnValue
  * @returns {object|null}
  */
-function buildExistsNode(returnValue) {
+function _buildExistsNode(returnValue) {
   const { existsNode } = returnValue.queryResult.return<%- upperCaseFlowTag %>Node;
   if (!existsNode || !Object.keys(existsNode).length) return null;
 
@@ -129,7 +129,7 @@ function buildExistsNode(returnValue) {
  * @param {*} errorsFound
  * @returns {object}
  */
-function buildMessageObject(returnValue, existsNode, status, errorsFound) {
+function _buildMessageObject(returnValue, existsNode, status, errorsFound) {
   const { objType } = returnValue.requestParams;
   const { return<%- upperCaseFlowTag %>Node } = returnValue.queryResult;
 
@@ -152,15 +152,14 @@ function buildMessageObject(returnValue, existsNode, status, errorsFound) {
  * @param {*} passBackProperties
  * @param {*} messageObject
  */
-async function sendSnsMessage(_izContext, passBackProperties, messageObject) {
+async function _sendSnsMessage(_izContext, passBackProperties, messageObject) {
   const enrichedMessage =
     callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
       passBackProperties,
       messageObject,
     );
   const messageAttributes =
-    callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttribu
-tes(
+    callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
       passBackProperties,
       {},
     );
@@ -211,19 +210,19 @@ export default async function <%- functionName %>(
       passBackProperties,
     });
 
-    if (isEmpty(returnValue.requestParams)) {
+    if (_isEmpty(returnValue.requestParams)) {
       _izContext.logger.debug('message callingFlowProperties is empty');
       throw new NoRetryError('message not an object');
     }
 
-    validateInput(returnValue, status, graphServiceTag, errorsFound);
+    _validateInput(returnValue, status, graphServiceTag, errorsFound);
 
     if (errorsFound.length > 0) {
       _izContext.logger.debug('Have error form graphServerTag:', errorsFound);
       errorsFound.push(errorsFound.join(','));
     }
 
-    const existsNode = buildExistsNode(returnValue);
+    const existsNode = _buildExistsNode(returnValue);
 
     const awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
       parentFlowId,
@@ -231,67 +230,77 @@ export default async function <%- functionName %>(
     );
     _izContext.logger.debug('awaitingStepId:', awaitingStepId);
 
-    const recordAwaitingSteps = await dynamodbSharedLib.query(
+    const recordAwaitingStep = await asyncFlowSharedLib.findPendingStepAwaitingMultipleSteps(
       _izContext,
-      await dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-      { awaitingStepId },
+      awaitingStepId
     );
-    _izContext.logger.debug('record awaitingSteps::', recordAwaitingSteps);
-
-    await Promise.all(
-      recordAwaitingSteps.Items.map(async (recordAwaitingStep) => {
-        if (
-          await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-            _izContext,
-            recordAwaitingStep.pendingStepId,
-            awaitingStepId,
-            errorsFound,
-          )
-        ) {
-          _izContext.logger.debug('finish all awaitingStep');
-
-          await Promise.all(
-            recordAwaitingStep.listOfRecords.map(async (listOfRecords) => {
-              if (status ===  'complete') {
-              Object.entries(listOfRecords).map(async ([_, record]) => {
-                await dynamodbSharedLib.putItem(
-                  _izContext,
-                  dynamodbSharedLib.tableName(_izContext,
-                    record.tableName,
-                    record.serviceTag
-                  ),
-                  {
-                    ...record.objInstanceFull.identifiers,
-                    ...record.objInstanceFull.fields
-                  }
-                );
-              })
-            }
-            }))
-
-          const messageObject = buildMessageObject(
-            returnValue,
-            existsNode,
-            status,
-            errorsFound,
-          );
-
-          //(<beforeSendMessage>)
-          //(</beforeSendMessage>)
-
-          await sendSnsMessage(_izContext, passBackProperties, messageObject);
-
-          //(<afterSendMessage>)
-          //(</afterSendMessage>)
-        }
-
-        await asyncFlowSharedLib.removeAwaitingMultipleStep(
-          _izContext,
-          awaitingStepId,
-          recordAwaitingStep.pendingStepId,
-          errorsFound,
-        );
-      }),
+    _izContext.logger.debug('recordAwaitingStep:', recordAwaitingStep);
+
+    const {
+      isComplete,
+      collectedAttributes,
+      collectedErrors,
+      returnValues: _rvs,
+      additionalAttributes
+    } = await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
+      _izContext,
+      recordAwaitingStep.pendingStepId,
+      awaitingStepId,
+      errorsFound,
+    );
+
+    _izContext.logger.debug('checkAllAwaitingStepsFinishedWithReturnParams:', {
+      isComplete,
+      collectedAttributes,
+      collectedErrors,
+      returnValues: _rvs,
+      additionalAttributes
+    });
+
+    if (isComplete) {
+      _izContext.logger.debug('finish all awaitingStep');
+
+      await Promise.all(
+        (recordAwaitingStep.listOfRecords ?? []).map(async (listOfRecords) => {
+          if (status === 'complete') {
+            Object.entries(listOfRecords).map(async ([_, record]) => {
+              await dynamodbSharedLib.putItem(
+                _izContext,
+                dynamodbSharedLib.tableName(_izContext,
+                  record.tableName,
+                  record.serviceTag
+                ),
+                {
+                  ...record.objInstanceFull.identifiers,
+                  ...record.objInstanceFull.fields
+                }
+              );
+            });
+          }
+        })
+      );
+
+      const messageObject = _buildMessageObject(
+        returnValue,
+        existsNode,
+        status,
+        errorsFound,
+      );
+
+      //(<beforeSendMessage>)
+      //(</beforeSendMessage>)
+
+      await _sendSnsMessage(_izContext, passBackProperties, messageObject);
+
+      //(<afterSendMessage>)
+      //(</afterSendMessage>)
+    }
+
+    await asyncFlowSharedLib.removeAwaitingMultipleStep(
+      _izContext,
+      awaitingStepId,
+      recordAwaitingStep.pendingStepId,
+      errorsFound,
     );
 
     //(<beforeReturn>)

package/src/codeGenerators/app/src/generatedCode/Flow/FlowRelationships/templates/relationship/ProcessChangeRelationship_Main.ejs

@@ -171,8 +171,8 @@ export default async function <%- functionName %> (
       const matchToFrom = fromServiceTag === secondServiceTag && fromObjectType === secondObjectType &&
         toServiceTag === firstServiceTag && toObjType === firstObjectType;
 
-      if ((newRelationshipSchema.relationshipDirection === "from" && matchFromTo) ||
-        (newRelationshipSchema.relationshipDirection === "to" && matchToFrom)) {
+      if ((oldRelTypeAndDirection.relationshipDirection === "from" && matchFromTo) ||
+        (oldRelTypeAndDirection.relationshipDirection === "to" && matchToFrom)) {
         checkCorrectLink = true
         break;
       }

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/endpoint/FlowEndpoint_HdrWbs.ejs

@@ -27,7 +27,7 @@ const { createFlowTypeConcat } = utils;
 import { webSocket } from '@izara_project/izara-core-library-external-request';
 const { postToConnection } = webSocket;
 
-import <%- upperCaseFlowTag %> from './<%- upperCaseFlowTag %>_Main.js';
+import <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> from './<%- typeof mainFileName !== 'undefined' ? mainFileName : `${upperCaseFlowTag}_Main` %>.js';
 
 export const main = middleware.wrap(async (event, context) => {
 
@@ -82,7 +82,7 @@ export const main = middleware.wrap(async (event, context) => {
           }
 
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
-          await <%- upperCaseFlowTag %>(
+          await <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
             event._izContext,
             eventParams,
             //(<additionalParams>)

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/endpoint/FlowEndpoint_Main.ejs

@@ -56,7 +56,7 @@ const { createFlowTypeConcat } = utils;
  * @returns {object} description of return value
  */
 
-export default async function Process<%- upperCaseFlowTag %>(
+export default async function <%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %>(
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -65,11 +65,15 @@ export default async function Process<%- upperCaseFlowTag %>(
 ) {
 
   try {
-    _izContext.logger.debug("Process<%- upperCaseFlowTag %> _izContext", _izContext)
-    _izContext.logger.debug("Process<%- upperCaseFlowTag %> requestParams", requestParams)
-    _izContext.logger.debug("Process<%- upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> _izContext", _izContext)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> requestParams", requestParams)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> callingFlowConfig", callingFlowConfig)
 
 <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
+
+    //(<beforeCheckCache>)
+    //(</beforeCheckCache>)
+
     let [ cacheMainStatus, cacheMain, cacheExist ] = await storedCacheSharedLib.checkStoredCacheStatus(
       _izContext,
       "<%= tableName %>",

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/endpoint/FlowMain_Wbs.ejs

@@ -48,7 +48,7 @@ const { postToConnection } = webSocket;
  * @returns {object} description of return value
  */
 
-export default async function <%- upperCaseFlowTag %>(
+export default async function <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
   _izContext,
   requestParams,
   //(<additionalParams>)
@@ -57,9 +57,9 @@ export default async function <%- upperCaseFlowTag %>(
 ) {
 
   try {
-    _izContext.logger.debug("<%- upperCaseFlowTag %> _izContext", _izContext)
-    _izContext.logger.debug("<%- upperCaseFlowTag %> requestParams", requestParams)
-    _izContext.logger.debug("<%- upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> _izContext", _izContext)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> requestParams", requestParams)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
 
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: "<%- flowTag %>",

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3/CreatePreSignUrl_Main.ejs

@@ -26,7 +26,7 @@ import { lambda, sns } from '@izara_project/izara-core-library-external-request'
 
 import { S3Client } from '@aws-sdk/client-s3';
 import { createPresignedPost } from '@aws-sdk/s3-presigned-post';
-const client = new S3Client({ region: 'us-east-2' });
+const client = new S3Client({ region: process.env.AWS_REGION });
 import { consts } from '@izara_project/izara-middleware';
 
 import { postToConnection, getNestObject } from '../../../../libs/source/GenerateCodeLibs.js'

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3/ProcessS3File_Main.ejs

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { S3Client, GetObjectCommand, DeleteObjectCommand, PutObjectCommand, CopyObjectCommand } from '@aws-sdk/client-s3';
-const s3 = new S3Client({ region: 'us-east-2' });
+const s3 = new S3Client({ region: process.env.AWS_REGION });
 
 //(<optionalRequired>)
 //(</optionalRequired>)

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/BaseDsqHandler.js

@@ -1,6 +1,7 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export async function generateDsqHandler(flow, stepName, suffix, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -27,26 +28,16 @@ export async function generateDsqHandler(flow, stepName, suffix, flowOutputDir,
 
     let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const startStep = flow.flowSteps.find(s => s.stepName === 'start');
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
         if (startStep) {
             startConfig = { ...startStep };
             // Map properties
             if (startConfig.properties && Array.isArray(startConfig.properties)) {
-                startConfig.properties = startConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
             if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
-                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/BaseSqsHandler.js

@@ -1,18 +1,27 @@
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicFunctionName, processFunctionName } from '../shared/flowNaming.js';
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export async function generateSqsHandler(flow, stepName, suffix, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
     const flowTag = flow.flowTag;
 
+    const isOwnTopic = !stepName && !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && flow.event && flow.event.includes('ownTopic');
+
     // For entry point stepName is empty
-    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
+    const handlerFileName = stepName
+        ? `${flowTag}${stepName}_${suffix}`
+        : (isOwnTopic ? `${upperCase(flowTag)}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`);
 
     // Function name: matches default export in the referenced _Main.js
     // For entry point: Process${upperCase(flowTag)} (e.g. ProcessOwnTopicFlow)
     // For steps:      ${flowTag}${flowStepName} (e.g. OwnTopicFlowProcess)
-    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+    const functionName = stepName
+        ? `${flowTag}${stepName}`
+        : (isOwnTopic ? ownTopicFunctionName(flowTag) : processFunctionName(flowTag));
 
     // Queue name: keep the full handler suffix so handler code matches
     // the generated queue/resource names.
@@ -30,26 +39,16 @@ export async function generateSqsHandler(flow, stepName, suffix, flowOutputDir,
 
     let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const startStep = flow.flowSteps.find(s => s.stepName === 'start');
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
         if (startStep) {
             startConfig = { ...startStep };
             // Map properties
             if (startConfig.properties && Array.isArray(startConfig.properties)) {
-                startConfig.properties = startConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
             if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
-                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/lambdaSyncApi.js

@@ -1,6 +1,7 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -15,26 +16,16 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
 
     let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const startStep = flow.flowSteps.find(s => s.stepName === 'start');
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
         if (startStep) {
             startConfig = { ...startStep };
             // Map properties
             if (startConfig.properties && Array.isArray(startConfig.properties)) {
-                startConfig.properties = startConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
             if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
-                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/lambdaSyncInv.js

@@ -1,6 +1,7 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -15,26 +16,16 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
 
     let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const startStep = flow.flowSteps.find(s => s.stepName === 'start');
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
         if (startStep) {
             startConfig = { ...startStep };
             // Map properties
             if (startConfig.properties && Array.isArray(startConfig.properties)) {
-                startConfig.properties = startConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
             if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
-                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/ownTopic.js

@@ -1,4 +1,6 @@
 import { generateSqsHandler } from './BaseSqsHandler.js';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicWebSocketMainFileName, ownTopicWebSocketFunctionName } from '../shared/flowNaming.js';
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
@@ -15,9 +17,18 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
     // ownTopic flows ALWAYS generate the WebSocket entry + SNS-publish main file,
     // regardless of initiateBy (legacy behavior: WebSocket is the universal entry point).
     if (!stepName) {
+        const isOwnTopicConvention = !isCrudFlow(flow.flowTag) && !isRbacFlow(flow.flowTag) && !isRelationshipFlow(flow.flowTag);
+        let entryPointFileName;
+        let wbsFunctionName;
+
+        if (isOwnTopicConvention) {
+            entryPointFileName = ownTopicWebSocketMainFileName(flow.flowTag);
+            wbsFunctionName = ownTopicWebSocketFunctionName(flow.flowTag);
+        } else {
+            entryPointFileName = `${upperCase(flow.flowTag)}_Main`;
+            wbsFunctionName = upperCase(flow.flowTag);
+        }
         const handlerFileName = `${upperCase(flow.flowTag)}_HdrWbs`;
-        const functionName = `${flow.flowTag}Main`;
-        const entryPointFileName = `${upperCase(flow.flowTag)}_Main`;
 
         // 1. Render HdrWbs.js
         const handlerContent = ejs.render(templates.endpointHdrWbs, {
@@ -25,7 +36,7 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
             upperCaseFlowTag: upperCase(flow.flowTag),
             flowStepName: '',
             mainFileName: entryPointFileName,
-            functionName: functionName,
+            functionName: wbsFunctionName,
             route: flow.flowTag
         });
         await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');
@@ -35,7 +46,8 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
             flowTag: flow.flowTag,
             upperCaseFlowTag: upperCase(flow.flowTag),
             topicArn: `${upperCase(flow.flowTag)}_In`,
-            generateCode: generateCode
+            generateCode: generateCode,
+            functionName: wbsFunctionName
         });
         await fs.writeFile(path.join(flowOutputDir, `${entryPointFileName}.js`), mainContent, 'utf-8');
     }