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

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

@@ -90,15 +90,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/update/handler/handler.js

@@ -43,12 +43,18 @@ function data(_izContext, srcPath) {
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.updateNodeComplete;
 
+  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/update/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, 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 @@ export const 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 @@ export const main = middleware.wrap(async (event, context, callback) => {
   }
 });
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase()+ text.slice(1)
-} _%>

package/src/generators/fromObjectSchema/endpointComplete/update/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/update/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/update/yaml/yaml.js

@@ -90,15 +90,30 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
   // console.log("additionalResourcePermission in update", JSON.stringify(additionalResourcePermission, null, 2))
   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/findData/findDataYaml/findDataYaml.js

@@ -172,6 +172,12 @@ async function data(_izContext, objectSchemas, appPath, settings) {
 
   // console.log("additionalResourcePermission", additionalResourcePermission)
   // console.log("findData template generated")
+  const functionNameConfig = upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrSqs));
+  const upperFunctionNameConfig = upperCase(functionNameConfig);
+  const upperFunctionName = upperCase(functionName);
+  const upperHandlerType = upperCase(HANDLER.hdrSqs);
+  const handlerPath = path.join(SOURCE_PATH.resourceLocationFindData, `${functionName}_${upperHandlerType}.main`);
+
   return {
     templatePath: templatePath,
     templateData: {
@@ -179,9 +185,12 @@ async function data(_izContext, objectSchemas, appPath, settings) {
       resourceLocation: SOURCE_PATH.resourceLocationFindData,
       handlerType: HANDLER.hdrSqs,
       additionalResourcePermission,
-      functionNameConfig:
-        upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrSqs)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole
+      functionNameConfig,
+      roleName: SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole,
+      upperFunctionNameConfig,
+      upperFunctionName,
+      upperHandlerType,
+      handlerPath
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/findData/findDataYaml/template.ejs

@@ -1,14 +1,10 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
   role: <%- roleName %>Role
-  #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
-  #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#<%- upperFunctionName %><%- upperHandlerType %>FunctionSetting#>
+  #<#/<%- upperFunctionName %><%- upperHandlerType %>FunctionSetting#>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
-        batchSize: 10
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
+        batchSize: 10

package/src/generators/fromObjectSchema/processLogical/yaml/template.ejs

@@ -1,12 +1,10 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
   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}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+      arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
       batchSize: 10
-<%_ function firstLetterUpperCase(text){ return text.charAt(0).toUpperCase() + text.slice(1) } _%>

package/src/generators/fromObjectSchema/processLogical/yaml/yaml.js

@@ -158,17 +158,35 @@ async function data(_izContext, objectSchemas, appPath) {
     )
   );
 
+  const resourceLocation = SOURCE_PATH.resourceLocationProcessLogical;
+  const handlerType = HANDLER.hdrSqs;
+
+  const functionNameConfig = upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.processLogical)) +
+  upperCase(shortNameHandler(HANDLER.hdrSqs));
+
+  const roleName = SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole;
+  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: functionName,
-      resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
-      handlerType: HANDLER.hdrSqs,
+      resourceLocation,
+      handlerType,
       additionalResourcePermission,
-      functionNameConfig:
-        upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.processLogical)) +
-        upperCase(shortNameHandler(HANDLER.hdrSqs)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole
+      functionNameConfig,
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/processLogicalPagination/yaml/dsq/dsq.js

@@ -136,6 +136,20 @@ async function data(_izContext, allObjSchemas, appPath) {
     )
   );
 
+  const resourceLocation = SOURCE_PATH.resourceLocationProcessLogical;
+  const handlerType = HANDLER.hdrDsq;
+
+  const functionNameConfig = upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.paginateProcessLogical)) +
+  upperCase(shortNameHandler(HANDLER.hdrDsq));
+
+  const roleName = SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole;
+  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`);
+
   // additionalResourcePermission.push(
   //   createIamRole(
   //     {
@@ -151,13 +165,17 @@ async function data(_izContext, allObjSchemas, appPath) {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
-      resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
-      handlerType: HANDLER.hdrDsq,
+      resourceLocation,
+      handlerType,
       additionalResourcePermission,
-      functionNameConfig:
-        upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.paginateProcessLogical)) +
-        upperCase(shortNameHandler(HANDLER.hdrDsq)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole
+      functionNameConfig,
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/processLogicalPagination/yaml/dsq/template.ejs

@@ -1,12 +1,10 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
   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}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
         batchSize: 10
-<%_ function firstLetterUpperCase(text){ return text.charAt(0).toUpperCase() + text.slice(1) } _%>

package/src/generators/fromObjectSchema/processLogicalPagination/yaml/sqs/sqs.js

@@ -145,6 +145,20 @@ async function data(_izContext, allObjSchemas, appPath) {
     )
   );
 
+  const resourceLocation = SOURCE_PATH.resourceLocationProcessLogical;
+  const handlerType = HANDLER.hdrSqs;
+
+  const functionNameConfig = upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.paginateProcessLogical)) +
+  upperCase(shortNameHandler(HANDLER.hdrSqs));
+
+  const roleName = SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole;
+  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`);
+
   // additionalResourcePermission.push(
   //   createIamRole(
   //     {
@@ -160,13 +174,17 @@ async function data(_izContext, allObjSchemas, appPath) {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
-      resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
-      handlerType: HANDLER.hdrSqs,
+      resourceLocation,
+      handlerType,
       additionalResourcePermission,
-      functionNameConfig:
-        upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.paginateProcessLogical)) +
-        upperCase(shortNameHandler(HANDLER.hdrSqs)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole
+      functionNameConfig,
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/processLogicalPagination/yaml/sqs/template.ejs

@@ -1,13 +1,11 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
   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}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
         batchSize: 10
 
-<%_ function firstLetterUpperCase(text){ return text.charAt(0).toUpperCase() + text.slice(1) } _%>

package/src/generators/fromObjectSchema/rbac/lambda/handler/handler.js

@@ -56,7 +56,10 @@ function data(
 
   return {
     templatePath: templatePathInv,
-    templateData: { functionName },
+    templateData: {
+      functionName,
+      upperFunctionName: upperCase(functionName)
+    },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.rbac),
       saveFileName: fileName,

package/src/generators/fromObjectSchema/rbac/lambda/mainFunction/main.js

@@ -67,7 +67,8 @@ function data(
   return {
     templatePath,
     templateData: {
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.rbac),
@@ -75,7 +76,7 @@ function data(
       fileExtension: '.js',
       isAppend: true
     }
-  }
+  };
 
 };
 

package/src/generators/fromObjectSchema/rbac/lambda/yaml/yaml.js

@@ -82,14 +82,17 @@ async function data(
       templatePath,
       templateData: {
         functionName: functionName,
+
         handlerPath: path.join(
           SOURCE_PATH.resourceLocationRbac,
           `${functionName}.main`
         ),
+
         additionalResourcePermission,
         roleName: "Authorization",
         hookTagSetting: `${functionName}FunctionSetting`,
-        functionNameConfig: functionName
+        functionNameConfig: functionName,
+        upperFunctionName: upperCase(functionName)
       },
       setting: {
         savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/relationship/changeRelationship/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)
-} _%>

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

@@ -150,17 +150,29 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
     )
   }
 
+  const resourceLocation = SOURCE_PATH.resourceLocationRelationshipPerAction;
+
+  const functionNameConfig = upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.changeRel)) +
+  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.changeRel)) +
-        upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.RelationshipRole,
+      resourceLocation,
+      functionNameConfig,
+      roleName,
+
       resourceApis: resourcesApi.map(api => ({
         path: `/${serviceTag}/${api.event}/${api.action}`,
         pathWithUser: `/${serviceTag}/${api.event}/${api.action}/{targetUserId}`,
@@ -168,7 +180,14 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
         hookTagApp: `${upperCase(api.event)}AppLevelAuthorizer`,
         hookTagUser: `${upperCase(api.event)}UserLevelAuthorizer`
       })),
-      event
+
+      event,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/generators/fromObjectSchema/relationship/changeRelationship/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/changeRelationship/action/handler/templateByHandler/apiTemplate.ejs

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { middlewareHandler as middleware, validatorSchema, response } from "@izara_project/izara-middleware";
 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 params in middleware before into function
 let validator = {
@@ -145,9 +145,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/changeRelationship/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(
@@ -189,9 +189,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/changeRelationship/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 = {
@@ -129,13 +129,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)
 } _%>