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

package/src/generators/fromObjectSchema/relationship/delete/action/handler/templateByHandler/apiTemplate.ejs

@@ -23,7 +23,7 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js'
+import <%- functionName %> from './<%- upperFunctionName %>_Main.js'
 
 // validate event params in middleware before into function
 let validator = {
@@ -128,9 +128,6 @@ export const main = middleware.wrap(async (event, context) => {
     return (response.failure(err));
   }
 });
-<%_ 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/relationship/delete/action/handler/templateByHandler/dsqTemplate.ejs

@@ -25,7 +25,7 @@ import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-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(
@@ -171,9 +171,6 @@ let validatorSchema = {
         throw (err);
       }
     });
-  <%_ 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/relationship/delete/action/handler/templateByHandler/invTemplate.ejs

@@ -23,7 +23,7 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js'
+import <%- functionName %> from './<%- upperFunctionName %>_Main.js'
 
 
 // validate event params in middlewware before into function.
@@ -109,13 +109,10 @@ export const main = middleware.wrap(async (event, context) => {
     );
 
   } catch (err) {
-    event._izContext.logger.error('Error, <%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handler) %> : ', err);
+    event._izContext.logger.error('Error, <%- upperFunctionName %><%- upperHandler %> : ', err);
     throw (err);
   }
 });
-<%_ 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/relationship/delete/action/handler/templateByHandler/sqsTemplate.ejs

@@ -26,7 +26,7 @@ import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-import <%- functionName %>  from './<%- firstLetterUpperCase(functionName) %>_Main.js';
+import <%- functionName %>  from './<%- upperFunctionName %>_Main.js';
 
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
@@ -115,7 +115,7 @@ export const 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
           validator // schema for record.Message
           // messageAttributeValidatorSchema        // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
         );
@@ -139,7 +139,7 @@ export const main = middleware.wrap(async (event, context, callback) => {
         let recordPromise = recordHandlerSharedLib.recordHandler(
           record, // one record will send to mainFunction
           <%- functionName %>.<%- 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');
@@ -162,9 +162,6 @@ export const main = middleware.wrap(async (event, context, callback) => {
     throw err;
   }
 });
-<%_ 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/relationship/delete/action/mainFunction/main.js

@@ -45,7 +45,8 @@ function createParamForCreateSource(srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.relationshipPerAction),

package/src/generators/fromObjectSchema/relationship/delete/action/sns-in-sqs/snsTemplate.ejs

@@ -48,12 +48,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrSqs
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ 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/relationship/delete/action/sns-in-sqs/sqsTemplate.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) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromObjectSchema/relationship/delete/complete/functionYaml/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 %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
-  #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#<%- functionName %><%- upperHandlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- upperHandlerType %>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/relationship/delete/complete/functionYaml/yaml.js

@@ -96,17 +96,35 @@ function createParamForCreateSource(srcPath) {
   );
   additionalResourcePermission.push(awaitingMultipleStepsRole());
 
+  const resourceLocation = SOURCE_PATH.resourceLocationRelationshipPerAction;
+
+  const functionNameConfig = upperCase(
+    SHORT_FUNCTION_NAME(FUNCTION_NAME.deleteRelComplete)
+  );
+
+  const roleName = SOURCE_GENERATE_IAM_ROLE.RelationshipCompleteRole;
+  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.resourceLocationRelationshipPerAction,
-      functionNameConfig: upperCase(
-        SHORT_FUNCTION_NAME(FUNCTION_NAME.deleteRelComplete)
-      ),
-      roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipCompleteRole
+      resourceLocation,
+      functionNameConfig,
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/relationship/delete/complete/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/relationship/delete/complete/sns-out/snsOut.js

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

package/src/generators/fromObjectSchema/relationship/delete/complete/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/relationship/get/action/functionYaml/template.ejs

@@ -1,10 +1,9 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPathUpperFunctionName %>
+  name: ${self:custom.iz_resourcePrefix}<%- upperFunctionName %><%- upperHandlerType %>
   role: <%- roleName %>Role
-  #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
-  #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#<%- functionName %><%- upperHandlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- upperHandlerType %>FunctionSetting#>
 <%_ if (handlerType === 'hdrDsq' || handlerType === 'hdrSqs') { _%>
   events:
     - sqs:
@@ -22,6 +21,3 @@
 <%_ }) _%>
 <%_ } _%>
 
-<%_ function firstLetterUpperCase(text) {
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>

package/src/generators/fromObjectSchema/relationship/get/action/functionYaml/yaml.js

@@ -186,23 +186,42 @@ function createParamForCreateSource(
 
   const event = resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType));
 
+  const resourceLocation = SOURCE_PATH.resourceLocationRelationshipPerAction;
+
+  const functionNameConfig = upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.getRel)) +
+  upperCase(shortNameHandler(handlerType));
+
+  const roleName = SOURCE_GENERATE_IAM_ROLE.RelationshipRole;
+  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.resourceLocationRelationshipPerAction,
-      functionNameConfig:
-        upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.getRel)) +
-        upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
+      resourceLocation,
+      functionNameConfig,
+      roleName,
+
       resourceApis: resourcesApi.map(api => ({
         path: `/${ownServiceTag}/${api.event}/${api.action}`,
         method: api.method,
         hookTagApp: `${upperCase(api.event)}AppLevelAuthorizer`,
       })),
-      event
+
+      event,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/relationship/get/action/handler/handler.js

@@ -59,7 +59,10 @@ function createParamForCreateSource(handler, srcPath) {
       dsqTemplate,
       invTemplate,
       sqsTemplate,
-      handler
+      handler,
+      upperFunctionName: upperCase(functionName),
+      upperHandler: upperCase(handler),
+      upperQueueName: upperCase(queueName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.relationshipPerAction),

package/src/generators/fromObjectSchema/relationship/get/action/handler/templateByHandler/apiTemplate.ejs

@@ -23,7 +23,7 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js'
+import <%- functionName %> from './<%- upperFunctionName %>_Main.js'
 
 // validate event params in middlewareHandler before into function
 let basicValidatorSchema =  {
@@ -129,9 +129,6 @@ export const main = middlewareHandler.wrap(async (event, context) => {
     return (response.failure(err));
   }
 });
-<%_ 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/relationship/get/action/handler/templateByHandler/dsqTemplate.ejs

@@ -22,7 +22,7 @@ import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
 
-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(
@@ -170,9 +170,6 @@ let validator = {
         throw (err);
       }
     });
-  <%_ 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/relationship/get/action/handler/templateByHandler/invTemplate.ejs

@@ -23,7 +23,7 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-import <%- functionName %> from './<%- firstLetterUpperCase(functionName) %>_Main.js'
+import <%- functionName %> from './<%- upperFunctionName %>_Main.js'
 
 // validate event params in middlewware before into function.
 let validator = {
@@ -110,13 +110,10 @@ export const main = middleware.wrap(async (event, context) => {
     );
 
   } catch (err) {
-    event._izContext.logger.error('Error, <%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handler) %> : ', err);
+    event._izContext.logger.error('Error, <%- upperFunctionName %><%- upperHandler %> : ', err);
     throw (err);
   }
 });
-<%_ 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/relationship/get/action/handler/templateByHandler/sqsTemplate.ejs

@@ -25,7 +25,7 @@ import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-import <%- functionName %>  from './<%- firstLetterUpperCase(functionName) %>_Main.js';
+import <%- functionName %>  from './<%- upperFunctionName %>_Main.js';
 
 middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
@@ -118,7 +118,7 @@ let basicValidatorSchema = {
         // --- 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
           basicValidatorSchema, // schema for record.Message
           // messageAttributeValidatorSchema        // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
         );
@@ -135,7 +135,7 @@ let basicValidatorSchema = {
         let recordPromise = recordHandlerSharedLib.recordHandler(
           record, // one record will send to mainFunction
           <%- functionName %>.<%- 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');
@@ -155,9 +155,6 @@ let basicValidatorSchema = {
         throw (err);
       }
     });
-  <%_ 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/relationship/get/action/mainFunction/main.js

@@ -44,7 +44,8 @@ function createParamForCreateSource(srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.relationshipPerAction),

package/src/generators/fromObjectSchema/relationship/get/action/sns-in-sqs/snsTemplate.ejs

@@ -48,12 +48,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrSqs
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ 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/relationship/get/action/sns-in-sqs/sqsTemplate.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) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromObjectSchema/relationship/get/complete/functionYaml/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 %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
-  #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#<%- functionName %><%- upperHandlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- upperHandlerType %>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/relationship/get/complete/functionYaml/yaml.js

@@ -97,17 +97,35 @@ function createParamForCreateSource(srcPath) {
 
   additionalResourcePermission.push(awaitingMultipleStepsRole());
 
+  const resourceLocation = SOURCE_PATH.resourceLocationRelationshipPerAction;
+
+  const functionNameConfig = upperCase(
+    SHORT_FUNCTION_NAME(FUNCTION_NAME.getRelComplete)
+  );
+
+  const roleName = SOURCE_GENERATE_IAM_ROLE.RelationshipCompleteRole;
+  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.resourceLocationRelationshipPerAction,
-      functionNameConfig: upperCase(
-        SHORT_FUNCTION_NAME(FUNCTION_NAME.getRelComplete)
-      ),
-      roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipCompleteRole
+      resourceLocation,
+      functionNameConfig,
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/relationship/get/complete/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/relationship/get/complete/sns-out/snsOut.js

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

package/src/generators/fromObjectSchema/relationship/get/complete/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/relationship/moveRelationship/action/functionYaml/template.ejs

@@ -1,10 +1,9 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPathUpperFunctionName %>
+  name: ${self:custom.iz_resourcePrefix}<%- upperFunctionName %><%- upperHandlerType %>
   role: <%- roleName %>Role
-  #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
-  #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#<%- functionName %><%- upperHandlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- upperHandlerType %>FunctionSetting#>
 <%_ if (handlerType === 'hdrDsq' || handlerType === 'hdrSqs') { _%>
   events:
     - sqs:
@@ -28,6 +27,3 @@
 <%_ }) _%>
 <%_ } _%>
 
-<%_ function firstLetterUpperCase(text) {
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>