@izara_project/izara-market-library-service-schemas 1.0.8 → 1.0.9

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrSqs/data.js

@@ -21,8 +21,8 @@ const fs = require('fs');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, SNS_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole } = require("../../../libs/Consts");
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, renameObjectType } = require("../../../../../MainLibs/src/Utils")
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, SNS_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../../../libs/Consts");
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -35,12 +35,13 @@ const templatePath = path.join(__dirname, "./template.ejs")
  */
 function data(_izContext, objectSchema, srcPath) {
   let createSourceArray = [];
+  let newObjectSchema = renameObjectType(objectSchema, srcPath)
   for (const action of Object.values(ACTIONS)) {
     if (objectSchema.overWriteHandlers?.[action]) {
       // if have overWriteHander of action check hdrApi inside
       if (objectSchema.overWriteHandlers[action].includes(HANDLER.hdrSqs)) {
         // create template data
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     } else {
@@ -48,7 +49,7 @@ function data(_izContext, objectSchema, srcPath) {
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
       if (defaultHandler.includes(HANDLER.hdrSqs)) {
         // create template data and object for create source
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     }
@@ -65,6 +66,9 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
   let hasGraphStorage = false;
+  let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType
+  let functionNameConfig = upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrSqs))
+
   for (let storageResource of Object.values(objectSchema.storageResources)) {
     if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
       // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
@@ -156,7 +160,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       actionHandler: actionHandler,
       resourceLocation: SOURCE_PATH.resourceLocationPerAction,
       handlerType: HANDLER.hdrSqs,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrSqs/template.ejs

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrApi/data.js

@@ -62,7 +62,6 @@ function data(_izContext, objectSchema, srcPath) {
 function createParamForCreateSource(objectSchema, action, handler, srcPath) {
   let objectType = objectSchema.objectType;
   let functionName = objectType + firstLetterUpperCase(action);
-  let functionNameConfig = `${objectType + upperCase(action)}${upperCase(handler)}`
   return {
     templatePath: templatePath,
     templateData: {
@@ -70,7 +69,6 @@ function createParamForCreateSource(objectSchema, action, handler, srcPath) {
       objectType: objectType,
       action: action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
-      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrDsq/data.js

@@ -62,7 +62,6 @@ function createParamForCreateSourceHandlerGet(objectSchema, action, handler, src
   let objectType = objectSchema.objectType;
   let functionName = objectType + upperCase(action);
   let queueName = objectType + firstLetterUpperCase(action) + upperCase(handler);
-  let functionNameConfig = `${objectType + upperCase(action)}${upperCase(handler)}`
   return {
     templatePath: templatePath,
     templateData: {
@@ -71,7 +70,7 @@ function createParamForCreateSourceHandlerGet(objectSchema, action, handler, src
       queueName,
       action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
-      functionNameConfig
+      handler
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrDsq/template.ejs

@@ -18,12 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
-const callingFlowSharedLib = require('@izara_project/izara-shared/src/CallingFlowSharedLib');
-const recordHandlerSharedLib = require('@izara_project/izara-shared').recordHandlerSharedLib;
-const {
-  validateSchemaMiddleware
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
+const callingFlowSharedLib = require('@izara_project/izara-shared/src/CallingFlowSharedLib')
 const Logger = require('@izara_project/izara-core-library-logger');
+const {validateSchemaPerRecord} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
+const recordHandlerSharedLib = require('@izara_project/izara-shared').recordHandlerSharedLib
 
 <%_ if (isCreateMainFunction == true) { _%>
   // user generate main function
@@ -31,78 +29,92 @@ const Logger = require('@izara_project/izara-core-library-logger');
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-  //validate event params in middleware before into main function
-  validateSchemaMiddleware(
-    middleware,
-    "<%- firstLetterUpperCase(objectType) %>",
-    "<%- action %>"
-    //(<validateSchemaSetting>
-    //</validateSchemaSetting>)
-  )
-  // if need to validate authorizer or additional params , add code to hook tag below
+//(<globalVarible>
+//</globalVarible>)
 
-  //(<afterValidateWith>)
-  //(</afterValidateWith>)
+//validate event params in middleware before into main function
+middleware.setValidatorSchema(
+  recordHandlerSharedLib.baseValidatorSchema(),
+  //(<middlewareSettings>)
+  //(</middlewareSettings>)
+)
 
-module.exports.main = middleware.wrap(async(event,context,callback) => {
+  //(<globalValidatorSchema>)
+   const perRecordsValidatorSchema = {
+     type: "object",
+     required: [],
+     properties: {},
+    }
+  //(</globalValidatorSchema>)
 
-  try {
-
-    let recordPromises = []; // final return
-
-    // loop each record and send to mainFunction
-    await Promise.all(event.Records.map(async record => { // promise.all for map() function
-
-      // --- reforming record.body for Dsq request
-      record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);
-      record._izContext.logger.debug('record LambdaFunctionHdrDsq after reform', record);
+// if need to validate authorizer or additional params , add code to hook tag below
 
-      let passOnProperties = []
+module.exports.main = middleware.wrap(async (event,context, callback) => {
 
-      // --- validate message (and MessageAttributes)
-      await recordHandlerSharedLib.validateRecord(
-        record,                             // one record will send to mainFunction
-        "<%- 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
-      );
+  try {
 
-      // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message)
+    let recordPromises = [];
+
+    await Promise.all(event.Records.map(async record => {
+      record._izContext.logger.debug('record RecieveMsgOutHdrSqs', record);
+
+      let passOnProperties = [];
+
+      const OBJTYPE = {
+        objectType: "<%- objectType %>",
+        serviceTag: process.env.iz_serviceTag
+      }
+
+      await validateSchemaPerRecord(
+        record,
+        <%- functionName %>,
+        "OBJTYPE,
+        <%- action %>"
+        //(<validateSchemaSetting>)
+        //(</validateSchemaSetting>)
+      )
+
+      //for validate additional params
+      //(<afterGenerateValidatorSchema>)
+        /*
+        await recordHandlerSharedLib.validateRecord(
+          record,
+          <%- functionName %>,
+          perRecordsValidatorSchema
+        );
+        */
+      //(</afterGenerateValidatorSchema>)
+
+      //(<additionalParams>)
+      //(</additionalParams>)
+
+      passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
-      // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
-        record,                         // one record will send to mainFunction
-        <%- functionName %>.<%- functionName %>Main,  // mainFunction that need to invoke.
-        "<%- queueName %>",               // queue name that need to retry or send to dlq
-        passOnProperties,               // all parameters that mainFunction needed.
+        record,
+        <%- functionName %>.<%- functionName %>Main,               // mainFunction
+        '<%- firstLetterUpperCase(queueName) %>',                 // queueName
+        passOnProperties
       );
-      record._izContext.logger.debug('after recordPromise in handler');
-      recordPromises.push(recordPromise); // push promise to recordPromises
-    })) //end record
+      record._izContext.logger.debug('after record Promise in handler');
+      recordPromises.push(recordPromise);
+    }))
 
-    Logger.debug('before Promise.all(recordPromises) in handler');
+    Logger.debug('before Promise.all(recordPromise) in handler');
     try {
-      await Promise.all(recordPromises); // await all promises
-      return event.Records // return all for local test
-  } catch {
-    Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
-  }
-  Logger.debug('after Promise.all(recordPromises) in handler');
-} catch (err) {
-  Logger.error('Unhandled Error, <%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>Dsq :', err);
-  throw (err);
-}
-})
-
-
+      await Promise.all(recordPromises);
 
+      return event.Records
+    } catch {
+      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
 
-
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
-<%_ function firstLetterLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1)
-} _%>
+  } catch (err) {
+    Logger.debug('unhandled error <%- functionName %><%- handler %>')
+    throw err
+  }
+}
+)

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrInv/data.js

@@ -63,7 +63,6 @@ function data(_izContext, objectSchema, srcPath) {
 function createParamForCreateHandlerGet(objectSchema, action, handler, srcPath) {
   let objectType = objectSchema.objectType;
   let functionName = objectType + upperCase(action);
-  let functionNameConfig = `${objectType + upperCase(action)}${upperCase(handler)}`
   return {
     templatePath: templatePath,
     templateData: {
@@ -71,7 +70,6 @@ function createParamForCreateHandlerGet(objectSchema, action, handler, srcPath)
       objectType: objectType,
       action: action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
-      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrInv/template.ejs

@@ -40,12 +40,11 @@ const {
 //validate event params in middleware before into function
 validateSchemaMiddleware(
   middleware,
-  "<%- firstLetterUpperCase(objectType) %>",                      // objectType
+  "<%- firstLetterUpperCase(objectType) %>",                // objectType
   "<%- action %>",                                         // action
   //(<validateSchemaSetting>)
   //(</validateSchemaSetting>)
   )
-
   // if need to validate authorizer or additional params, add code to hook tag below
 
   //(<afterValidateWithGenereatedSchema>)

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrSqs/data.js

@@ -61,8 +61,7 @@ function data(_izContext, objectSchema, srcPath) {
 function createParamForCreateSourceGetHandler(objectSchema, action, handler, srcPath) {
   let objectType = objectSchema.objectType;
   let functionName = objectType + firstLetterUpperCase(action);
-  let queueName = functionName + handler;
-  let functionNameConfig = `${objectType + upperCase(action)}${upperCase(handler)}`
+  let queueName = functionName + upperCase(handler);
   return {
     templatePath: templatePath,
     templateData: {
@@ -71,7 +70,7 @@ function createParamForCreateSourceGetHandler(objectSchema, action, handler, src
       queueName,
       action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
-      functionNameConfig
+      handler
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrSqs/template.ejs

@@ -19,10 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const callingFlowSharedLib = require('@izara_project/izara-shared/src/CallingFlowSharedLib')
-const {
-  validateSchemaMiddleware
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 const Logger = require('@izara_project/izara-core-library-logger');
+const {validateSchemaPerRecord} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
 const recordHandlerSharedLib = require('@izara_project/izara-shared').recordHandlerSharedLib
 
 <%_ if (isCreateMainFunction == true) { _%>
@@ -35,83 +33,94 @@ const recordHandlerSharedLib = require('@izara_project/izara-shared').recordHand
 //</globalVarible>)
 
 //validate event params in middleware before into main function
-validateSchemaMiddleware(
-  middleware,
-  "<%- firstLetterUpperCase(objectType) %>",
-  "<%- action %>"
-  //(<validateSchemaSetting>
-  //</validateSchemaSetting>)
+middleware.setValidatorSchema(
+  recordHandlerSharedLib.baseValidatorSchema(),
+  //(<middlewareSettings>)
+  //(</middlewareSettings>)
 )
-// if need to validate authorizer or additional params , add code to hook tag below
-    // if need to validate authorizer or additional params, add code to hook tag below
-
-    //(<afterValidateWithGenereatedSchema>)
-    //(</afterValidateWithGenereatedSchema>)
-
-const messageAttributeValidatorSchema = {
-  type: "object",
-  require: ['msgAtrrParam1','msgAtrrParam2'],
-  properties: {
-    msgAtrrParam1: {
-      type: 'string'
-    },
-    msgAtrrParam2: {
-      type: 'string'
+
+  //(<globalValidatorSchema>)
+   const perRecordsValidatorSchema = {
+     type: "object",
+     required: [],
+     properties: {},
     }
-  }
-};
+  //(</globalValidatorSchema>)
 
 // if need to validate authorizer or additional params , add code to hook tag below
 
-//(<afterValidateWith)
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+module.exports.main = middleware.wrap(async (event,context, callback) => {
+
   try {
 
     let recordPromises = [];
 
     await Promise.all(event.Records.map(async record => {
+      record._izContext.logger.debug('record RecieveMsgOutHdrSqs', record);
 
       let passOnProperties = [];
-      record._izContext.logger.debug('record ReceiveMesOutHdrSqs' , record);
 
-      // validate message (and MessageAttributes)
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        "<%- functionName %>",
-        perRecordValidatorSchema,
-        // messageAttributeValidatorSchema
-      );
+      const OBJTYPE = {
+        objectType: "<%- objectType %>",
+        serviceTag: process.env.iz_serviceTag
+      }
 
-      // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message)
-      record._izContext.logger.debug("passOnProperties in handler", passOnProperties);
+      await validateSchemaPerRecord(
+        record,
+        <%- functionName %>,
+        OBJTYPE,
+        "<%- action %>"
+        //(<validateSchemaSetting>)
+        //(</validateSchemaSetting>)
+      )
+
+      //for validate additional params
+      //(<afterGenerateValidatorSchema>)
+        /*
+        await recordHandlerSharedLib.validateRecord(
+          record,
+          <%- functionName %>,
+          perRecordsValidatorSchema
+        );
+          */
+      //(</afterGenerateValidatorSchema>)
+
+      //(<additionalParams>)
+      //(</additionalParams>)
+
+      passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
+      record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
-      // call recordHandlerSharedLib.recordHandler with 3 parameters and return Promise (resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record,
-        <%- functionName %>.<%- functionName %>Main,
-       "<%- queueName %>",
-        passOnProperties,
+        <%- functionName %>.<%- functionName %>Main,          // mainFunction
+        '<%- firstLetterUpperCase(queueName) %>',             // queueName
+        passOnProperties
       );
-      record._izContext.logger.debug('after recoedPromise in handler');
+      record._izContext.logger.debug('after record Promise in handler');
       recordPromises.push(recordPromise);
     }))
 
-    Logger.debug('before Promise.all(recordPromises) in handler');
+    Logger.debug('before Promise.all(recordPromise) in handler');
     try {
-      // --- main await all Promises
-      await Promise.all(recordPromises); // await all Promises
+      await Promise.all(recordPromises);
 
-      return event.Records // return all for local testing
+      return event.Records
     } catch {
-      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did not resolve)');
+      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
     }
-    Logger.debug('after Promise,all(recordPromises) in handler');
+    Logger.debug('after Promise.all(recordPromises) in handler');
+
   } catch (err) {
-  Logger.error('unhandler Error , <%- functionName %>:', err);
-  throw (err);
+    Logger.debug('unhandled error <%- functionName %><%- handler %>')
+    throw err
+  }
 }
-})
+)
+
+
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/TemplateManager/src/ProcessLogical/Handler/data.js

@@ -37,7 +37,6 @@ function data(_izContext, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionNameConfig: `${upperCase(FUNCTION_NAME.processLogical)}${upperCase(HANDLER.hdrSqs)}`
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.processLogical),

package/src/TemplateManager/src/ProcessLogical/ProcessLogicalYaml/data.js

@@ -26,7 +26,7 @@ const serviceConfig = serviceSchemas.serviceConfig;
 
 const { HANDLER, STORAGE_TYPES, ACTIONS } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
-const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, LAMBDA_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, defaultIamRolePerAction } = require("../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, LAMBDA_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, defaultIamRolePerAction, shortNameHandler } = require("../../libs/Consts");
 
 /**
  * receive objectSchema
@@ -129,7 +129,8 @@ async function data(_izContext, objectSchemas, srcPath) {
       functionName: functionName,
       resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
       handlerType: HANDLER.hdrSqs,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrSqs))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/ProcessLogical/ProcessLogicalYaml/template.ejs

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- functionName %><%- firstLetterUpperCase(handlerType) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
   events:

package/src/TemplateManager/src/ProcessLogicalPagination/FunctionYaml/HdrDsq/data.js

@@ -22,7 +22,7 @@ const path = require('path');
 const templatePath = path.join(__dirname, "./template.ejs")
 
 const { HANDLER, STORAGE_TYPES, ACTIONS } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, defaultIamRolePerAction } = require("../../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, defaultIamRolePerAction, shortNameHandler } = require("../../../libs/Consts");
 const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils');
 
 /**
@@ -122,7 +122,8 @@ async function data(_izContext, objectSchemas, srcPath) {
       functionName: functionName,
       resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
       handlerType: HANDLER.hdrDsq,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrDsq))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/ProcessLogicalPagination/FunctionYaml/HdrDsq/template.ejs

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- functionName %><%- firstLetterUpperCase(handlerType) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
   events:

package/src/TemplateManager/src/ProcessLogicalPagination/FunctionYaml/HdrSqs/data.js

@@ -22,7 +22,7 @@ const path = require('path');
 const templatePath = path.join(__dirname, "./template.ejs")
 
 const { HANDLER, STORAGE_TYPES, ACTIONS } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, SNS_RESOURCE } = require("../../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, SNS_RESOURCE, shortNameHandler } = require("../../../libs/Consts");
 const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils');
 
 /**
@@ -124,7 +124,8 @@ async function data(_izContext, objectSchemas, srcPath) {
       functionName: functionName,
       resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
       handlerType: HANDLER.hdrSqs,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrSqs))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/ProcessLogicalPagination/FunctionYaml/HdrSqs/template.ejs

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- functionName %><%- firstLetterUpperCase(handlerType) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
   events:

package/src/TemplateManager/src/ProcessLogicalPagination/Handler/HdrDsq/data.js

@@ -35,9 +35,7 @@ function data(_izContext, srcPath) {
 
   return {
     templatePath: templatePath,
-    templateData: {
-      functionNameConfig: `${upperCase(FUNCTION_NAME.paginateProcessLogical)}${upperCase(HANDLER.hdrDsq)}`
-    },
+    templateData: {},
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.processLogical),
       saveFileName: `${upperCase(FUNCTION_NAME.paginateProcessLogical)}_${upperCase(HANDLER.hdrDsq)}`,

package/src/TemplateManager/src/ProcessLogicalPagination/Handler/HdrSqs/data.js

@@ -35,9 +35,7 @@ function data(_izContext, srcPath) {
 
   return {
     templatePath: templatePath,
-    templateData: {
-      functionNameConfig: `${upperCase(FUNCTION_NAME.paginateProcessLogical)}${upperCase(HANDLER.hdrSqs)}`
-    },
+    templateData: {},
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.processLogical),
       saveFileName: `${upperCase(FUNCTION_NAME.paginateProcessLogical)}_${upperCase(HANDLER.hdrSqs)}`,

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrApi/data.js

@@ -22,7 +22,7 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../MainLibs/src/Utils")
-const { createIamRole, resourceNames, RESOURCE_CLASSES, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole } = require("../../../../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../../../../../libs/Consts");
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -69,7 +69,8 @@ function createParamForCreateSource(srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction
+      resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrApi/template.ejs

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrDsq/data.js

@@ -22,7 +22,7 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../MainLibs/src/Utils")
-const { createIamRole, resourceNames, RESOURCE_CLASSES, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole } = require("../../../../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../../../../../libs/Consts");
 
 const templatePath = path.join(__dirname, './template.ejs')
 
@@ -82,7 +82,8 @@ function createParamForCreateSource(srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction
+      resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),