@izara_project/izara-core-generate-service-code 1.0.46 → 1.0.48

package/src/generators/fromFlowSchema/webSocket/webSocket/connect/functionYaml/yaml.js

@@ -68,12 +68,15 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
     templatePath: templatePath,
     templateData: {
       functionName,
+
       handlerFilePath: path.join(
         SOURCE_PATH.resourceLocationWebSocketMain,
         functionName
       ),
+
       additionalResourcePermission,
-      roleName: 'WebSocketMain'
+      roleName: 'WebSocketMain',
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/webSocket/webSocket/connect/handler/handler.js

@@ -21,6 +21,8 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 import consts from '#libs/Consts.js';
+import utils from '#libs/Utils.js';
+const { firstLetterUpperCase: upperCase } = utils;
 
 const { SOURCE_PATH } = consts;
 
@@ -38,7 +40,8 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.WebSocketMain),

package/src/generators/fromFlowSchema/webSocket/webSocket/dynamoDb/WebSocketTaskData.js

@@ -24,10 +24,7 @@ import consts from '#libs/Consts.js';
 
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 
-const templatePath = path.join(
-  __dirname,
-  '../../../../resourceYamlComponent/dynamodb/template.ejs'
-);
+const templatePath = path.join(__dirname, './template.ejs');
 
 /**
  *
@@ -41,6 +38,8 @@ function data(_izContext, srcPath) {
     {
       tableName: 'WebSocketTask',
       resourceName: 'WebSocketTask',
+      ttl: true,
+      ttlAttributeName: 'expirationTime',
       attributes: [
         {
           keyType: 'partitionKey',

package/src/generators/fromFlowSchema/webSocket/webSocket/dynamoDb/template.ejs

@@ -0,0 +1,28 @@
+  <%- resourceName %>Table:
+    Type: "AWS::DynamoDB::Table"
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      <%_ attributes.forEach(attribute => { -%>
+      - AttributeName: <%- attribute['AttributeName'] %>
+        AttributeType: <%- attribute['AttributeType'] %>
+      <%_ }) _%>
+      KeySchema:
+      <%_ attributes.forEach(attribute => { -%>
+      <%_ if (attribute.keyType === 'partitionKey' || attribute.keyType === "identifier") { -%>
+      - AttributeName: <%- attribute["AttributeName"] %>
+        KeyType: HASH
+        <%_ } -%>
+      <%_ if(attribute.keyType === "sortKey") { -%>
+      - AttributeName: <%- attribute["AttributeName"] %>
+        KeyType: RANGE
+        <%_ } -%>
+      <%_ }) _%>
+      <%_ if (typeof ttl !== 'undefined' && ttl && typeof ttlAttributeName !== 'undefined' && ttlAttributeName) { _%>
+      TimeToLiveSpecification:
+        AttributeName: <%- ttlAttributeName %>
+        Enabled: true
+      <%_ } _%>
+        #<#<%- tableName %>DynamoDbSetting#>
+        #<#/<%- tableName %>DynamoDbSetting#>

package/src/generators/fromFlowSchema/webSocket/webSocket/dynamoDb/ttlDynamoTemplate.ejs

@@ -22,11 +22,8 @@
       TimeToLiveSpecification:
         AttributeName: expirationTime
         Enabled: true
-        #<#<%- firstLetterUpperCase(tableName) %>DynamoDbSetting#>
-        #<#/<%- firstLetterUpperCase(tableName) %>DynamoDbSetting#>
-<%_ function firstLetterUpperCase(text){
-return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
+        #<#<%- tableName %>DynamoDbSetting#>
+        #<#/<%- tableName %>DynamoDbSetting#>
 <%_ function firstLetterLowerCase(str) {
 return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromFlowSchema/webSocket/webSocketComplete/functionYaml/yaml.js

@@ -120,13 +120,19 @@ function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
         SOURCE_PATH.resourceLocationWebSocketMain,
         `${upperCase(functionName)}_${upperCase(handlerType)}`
       ),
+
       functionName,
       handlerType,
       additionalResourcePermission,
+
       functionNameConfig:
         upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+
       roleName: 'WebSocketMain',
-      queueName: queueName
+      queueName: queueName,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType),
+      upperQueueName: upperCase(queueName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/webSocket/webSocketComplete/handler/handler.js

@@ -45,7 +45,10 @@ function createParamsForCreateSource(_izContext, srcPath) {
     templateData: {
       functionName,
       handlerType,
-      queueName
+      queueName,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType),
+      upperQueueName: upperCase(queueName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.WebSocketMain),

package/src/generators/fromFlowSchema/webSocket/webSocketComplete/mainFunction/main.js

@@ -20,6 +20,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 import consts from '#libs/Consts.js';
+import utils from '#libs/Utils.js';
+const { firstLetterUpperCase: upperCase } = utils;
 
 const { SOURCE_PATH } = consts;
 
@@ -37,7 +39,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.WebSocketMain),

package/src/generators/fromFlowSchema/webSocket/webSocketComplete/sqs/sqs.js

@@ -67,11 +67,14 @@ function createDataForDefaultSnsInSqs(_izContext, allFlowSchema, srcPath) {
 }
 
 function createSubscriptionForWebSocketComplete(subscribeTo, srcPath) {
+  const queueName = `WebSocketComplete` + upperCase(HANDLER.hdrSqs);
+  const upperQueueName = upperCase(queueName);
   return {
     templatePath: templateSub,
     templateData: {
       subscribeTo,
-      queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs)
+      queueName,
+      upperQueueName
     },
     setting: {
       initialData: 'Resources:\n',
@@ -84,10 +87,13 @@ function createSubscriptionForWebSocketComplete(subscribeTo, srcPath) {
 }
 
 function createWebSocketCompleteQueue(srcPath) {
+  const queueName = 'WebSocketComplete' + upperCase(HANDLER.hdrSqs);
+  const upperQueueName = upperCase(queueName);
   return {
     templatePath: templatePath,
     templateData: {
-      queueName: 'WebSocketComplete' + upperCase(HANDLER.hdrSqs)
+      queueName,
+      upperQueueName
     },
     setting: {
       initialData: 'Resources:\n',

package/src/generators/fromFlowSchema/webSocket/webSocketComplete/sqs/template.ejs

@@ -32,12 +32,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-  <%_ function firstLetterUpperCase(text){
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
-  <%_ function firstLetterLowerCase(str) {
+    <%_ function firstLetterLowerCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1)
   } _%>

package/src/generators/fromObjectSchema/endpoint/index.js

@@ -141,7 +141,8 @@ async function endpointComponent(
             handler: upperCase(type),
             queueName,
             functionMainName: action + 'Main',
-            fileMainName: upperCase(action) + '_Main.js'
+            fileMainName: upperCase(action) + '_Main.js',
+            upperQueueName: upperCase(queueName)
           }
         });
         createSourceParams.push(...params);

package/src/generators/fromObjectSchema/endpoint/main/beforeLogical/beforeLogical.js

@@ -32,12 +32,15 @@ const templatePath = path.join(__dirname, 'template.ejs');
 function createSource(_izContext, appPath, action, generatedCodeConfig = []) {
   const functionName = upperCase(action);
 
+  const upperFunctionName = upperCase(functionName);
+
   return {
     templatePath: templatePath,
     templateData: {
       action,
       functionName,
-      generatedCodeConfig
+      generatedCodeConfig,
+      upperFunctionName
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.endpointPerService),

package/src/generators/fromObjectSchema/endpoint/main/create/create.js

@@ -31,11 +31,14 @@ const templatePath = path.join(__dirname, 'template.ejs');
 function createSource(_izContext, appPath, generatedCodeConfig = []) {
   const functionName = upperCase(ACTIONS.create);
 
+  const upperFunctionName = upperCase(functionName);
+
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
-      generatedCodeConfig
+      generatedCodeConfig,
+      upperFunctionName
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.endpointPerService),

package/src/generators/fromObjectSchema/endpoint/main/delete/delete.js

@@ -34,7 +34,8 @@ function createSource(_izContext, appPath, generatedCodeConfig = []) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      generatedCodeConfig
+      generatedCodeConfig,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.endpointPerService),

package/src/generators/fromObjectSchema/endpoint/main/get/get.js

@@ -34,7 +34,8 @@ function createSource(_izContext, appPath, generatedCodeConfig = []) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.endpointPerService),

package/src/generators/fromObjectSchema/endpoint/main/update/update.js

@@ -35,7 +35,8 @@ function createSource(_izContext, appPath, generatedCodeConfig = []) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      generatedCodeConfig
+      generatedCodeConfig,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.endpointPerService),

package/src/generators/fromObjectSchema/endpointComplete/create/handler/handler.js

@@ -48,7 +48,8 @@ function createParamForCreateSource(srcPath) {
     templateData: {
       functionName,
       queueName: upperCase(functionName),
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),

package/src/generators/fromObjectSchema/endpointComplete/create/sns-in-sqs/template.ejs

@@ -34,14 +34,11 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
 
-  <%_ function firstLetterUpperCase(text){
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
-  <%_ function firstLetterLowerCase(str) {
+    <%_ function firstLetterLowerCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1)
   } _%>
 

package/src/generators/fromObjectSchema/endpointComplete/create/sns-out/snsOut.js

@@ -50,10 +50,13 @@ function data(_izContext, srcPath) {
 
 function createParamsForCreateSource(_izContext, srcPath) {
   let queueName = FUNCTION_NAME.createObjectComplete;
+  queueName = upperCase(queueName);
+  const upperQueueName = upperCase(queueName);
   return {
     templatePath: templatePath,
     templateData: {
-      queueName: upperCase(queueName)
+      queueName,
+      upperQueueName
     },
     setting: {
       initialData: 'Resources:\n',

package/src/generators/fromObjectSchema/endpointComplete/create/sns-out/template.ejs

@@ -1,10 +1,8 @@
 ##--------- [Create Topic Out]
-  Out<%- firstLetterUpperCase(queueName) %>:
+  Out<%- queueName %>:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_Out
 
-  <%_ function firstLetterUpperCase(text) {
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
+  

package/src/generators/fromObjectSchema/endpointComplete/create/yaml/template.ejs

@@ -1,21 +1,17 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPathUpperFunctionName %>
+  name: ${self:custom.iz_resourcePrefix}<%- upperFunctionName %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- upperFunctionName %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
-          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- upperFunctionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromObjectSchema/endpointComplete/create/yaml/yaml.js

@@ -89,15 +89,30 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
 
   additionalResourcePermission.push(awaitingMultipleStepsRole());
 
+  const resourceLocation = SOURCE_PATH.resourceLocationOutPerActionComplete;
+  const roleName = SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole;
+  const upperFunctionName = upperCase(functionName);
+  const upperHandlerType = upperCase(handlerType);
+  const upperFunctionNameConfig = upperCase(functionNameConfig);
+  const upperRoleName = upperCase(roleName);
+  const handlerPath = path.join(resourceLocation, `${functionName}_${upperHandlerType}.main`);
+  const handlerPathUpperFunctionName = path.join(resourceLocation, `${upperFunctionName}_${upperHandlerType}.main`);
+
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete,
+      resourceLocation,
       functionNameConfig,
-      roleName: SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/endpointComplete/delete/handler/handler.js

@@ -43,12 +43,18 @@ function data(_izContext, srcPath) {
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.deleteNodeComplete;
 
+  const queueName = upperCase(functionName);
+  const upperFunctionName = upperCase(functionName);
+  const upperQueueName = upperCase(queueName);
+
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
-      queueName: upperCase(functionName),
-      functionName
+      queueName,
+      functionName,
+      upperFunctionName,
+      upperQueueName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),

package/src/generators/fromObjectSchema/endpointComplete/delete/handler/template.ejs

@@ -22,7 +22,7 @@ import Logger from '@izara_project/izara-core-library-logger';
 import { recordHandlerSharedLib } from "@izara_project/izara-core-library-record-handler";
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 
-import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js';
+import <%- functionName %> from './<%- upperFunctionName %>_Main.js';
 
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -78,7 +78,7 @@ export const main = middleware.wrap(async (event, context) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "<%- firstLetterUpperCase(queueName) %>", // queue name that need to retry or send to dlq
+        "<%- queueName %>", // queue name that need to retry or send to dlq
         perRecordsValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -95,7 +95,7 @@ export const main = middleware.wrap(async (event, context) => {
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
         <%- functionName %>, // mainFunction that need to invoke.
-        "<%- firstLetterUpperCase(queueName) %>", // queue name that need to retry or send to dlq
+        "<%- queueName %>", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -120,6 +120,3 @@ export const main = middleware.wrap(async (event, context) => {
   }
 });
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase()+ text.slice(1)
-} _%>

package/src/generators/fromObjectSchema/endpointComplete/delete/sns-in-sqs/template.ejs

@@ -34,14 +34,11 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
 
-  <%_ function firstLetterUpperCase(text){
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
-  <%_ function firstLetterLowerCase(str) {
+    <%_ function firstLetterLowerCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1)
   } _%>
 

package/src/generators/fromObjectSchema/endpointComplete/delete/yaml/template.ejs

@@ -1,20 +1,16 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPathUpperFunctionName %>
+  name: ${self:custom.iz_resourcePrefix}<%- upperFunctionName %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- upperFunctionName %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
-          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- upperFunctionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromObjectSchema/endpointComplete/delete/yaml/yaml.js

@@ -87,15 +87,30 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
     )
   );
 
+  const resourceLocation = SOURCE_PATH.resourceLocationOutPerActionComplete;
+  const roleName = SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole;
+  const upperFunctionName = upperCase(functionName);
+  const upperHandlerType = upperCase(handlerType);
+  const upperFunctionNameConfig = upperCase(functionNameConfig);
+  const upperRoleName = upperCase(roleName);
+  const handlerPath = path.join(resourceLocation, `${functionName}_${upperHandlerType}.main`);
+  const handlerPathUpperFunctionName = path.join(resourceLocation, `${upperFunctionName}_${upperHandlerType}.main`);
+
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete,
+      resourceLocation,
       functionNameConfig,
-      roleName: SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/endpointComplete/get/handler/handler.js

@@ -43,12 +43,18 @@ function data(_izContext, srcPath) {
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.getNodeComplete;
 
+  const queueName = upperCase(functionName);
+  const upperFunctionName = upperCase(functionName);
+  const upperQueueName = upperCase(queueName);
+
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
-      queueName: upperCase(functionName),
-      functionName
+      queueName,
+      functionName,
+      upperFunctionName,
+      upperQueueName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),

package/src/generators/fromObjectSchema/endpointComplete/get/handler/template.ejs

@@ -22,7 +22,7 @@ import Logger from '@izara_project/izara-core-library-logger';
 import { recordHandlerSharedLib } from "@izara_project/izara-core-library-record-handler";
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 
-import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js';
+import <%- functionName %> from './<%- upperFunctionName %>_Main.js';
 
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -78,7 +78,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "<%- firstLetterUpperCase(queueName) %>", // queue name that need to retry or send to dlq
+        "<%- queueName %>", // queue name that need to retry or send to dlq
         perRecordsValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -95,7 +95,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
         <%- functionName %>, // mainFunction that need to invoke.
-        "<%- firstLetterUpperCase(queueName) %>", // queue name that need to retry or send to dlq
+        "<%- queueName %>", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -120,6 +120,3 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
   }
 });
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase()+ text.slice(1)
-} _%>

package/src/generators/fromObjectSchema/endpointComplete/get/sns-in-sqs/template.ejs

@@ -34,14 +34,11 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
 
-  <%_ function firstLetterUpperCase(text){
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
-  <%_ function firstLetterLowerCase(str) {
+    <%_ function firstLetterLowerCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1)
   } _%>
 

package/src/generators/fromObjectSchema/endpointComplete/get/yaml/template.ejs

@@ -1,21 +1,17 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPathUpperFunctionName %>
+  name: ${self:custom.iz_resourcePrefix}<%- upperFunctionName %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- upperFunctionName %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
-          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- upperFunctionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>