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

package/src/TemplateManager/src/OutPerActionComplete/OutUpdateComplete/handler/data.js

@@ -39,7 +39,6 @@ function data(_izContext, srcPath) {
 
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.updateNodeComplete;
-  let functionNameConfig = upperCase(functionName)
 
   return {
     templatePath: templatePath,
@@ -47,10 +46,9 @@ function createParamForCreateSource(srcPath) {
       functionName,
       queueName: upperCase(functionName),
       functionName,
-      functionNameConfig
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
+      savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),
       saveFileName: `${upperCase(functionName)}_${upperCase(HANDLER.hdrSqs)}`,
       fileExtension: ".js",
       isAppend: false

package/src/TemplateManager/src/OutPerActionComplete/OutUpdateComplete/mainFunction/data.js

@@ -42,7 +42,7 @@ function createMainFunctionUpdateComplete(_izContext, srcPath) {
     templatePath: templatePath,
     templateData: {},
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
+      savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),
       saveFileName: `${upperCase(FUNCTION_NAME.updateNodeComplete)}_Main`,
       fileExtension: ".js",
       isAppend: false

package/src/TemplateManager/src/OutPerActionComplete/OutUpdateComplete/mainFunction/template.ejs

@@ -117,7 +117,11 @@ module.exports.updateNodeComplete = async (
       })
     )
 
-    return { returnValue: 'Function:UpdateNodeComplete' };
+    return {
+      objType: returnValue.objType,
+      objInstanceFull: returnValue.objInstanceFull,
+      errorsFound: errorsFound
+    }
 
   } catch (err) {
     _izContext.logger.error("error UpdateNodeComplete : ", err)

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrApi/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, SOURCE_PATH, SAVE_FILE_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, FUNCTION_NAME, 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, SOURCE_PATH, SAVE_FILE_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, FUNCTION_NAME, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../../../libs/Consts");
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -36,12 +36,14 @@ 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.hdrApi)) {
         // create template data
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     } else {
@@ -49,7 +51,7 @@ function data(_izContext, objectSchema, srcPath) {
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
       if (defaultHandler.includes(HANDLER.hdrApi)) {
         // create template data and object for create source
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     }
@@ -58,11 +60,14 @@ function data(_izContext, objectSchema, srcPath) {
 }
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
-  let objectType = objectSchema.objectType;
-  let functionName = objectType + upperCase(action);
+  let objectType = objectSchema.objectType
+  let functionName = upperCase(objectType) + upperCase(action);
   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.hdrApi))
+
   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
@@ -147,7 +152,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       additionalResourcePermission,
       event: event,
       objectType: objectType,
-      action: action
+      action: action,
+      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/PerActionEndpoint/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/PerActionEndpoint/FunctionYaml/HdrDsq/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, DYNAMO_RESOURCE, SNS_RESOURCE, FUNCTION_NAME, 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, DYNAMO_RESOURCE, SNS_RESOURCE, FUNCTION_NAME, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../../../libs/Consts");
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -36,12 +36,14 @@ 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.hdrDsq)) {
         // create template data
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     } else {
@@ -49,7 +51,7 @@ function data(_izContext, objectSchema, srcPath) {
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
       if (defaultHandler.includes(HANDLER.hdrDsq)) {
         // create template data and object for create source
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     }
@@ -60,9 +62,10 @@ function data(_izContext, objectSchema, srcPath) {
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
-  let actionHandler = action;
-  let functionName = objectType + upperCase(actionHandler);
-
+  let functionName = upperCase(objectType) + upperCase(action);
+  let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
+  let functionNameConfig = upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrDsq))
+  console.log("functionNameConfigInFunctionYamlHdrDsq", functionNameConfig)
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
 
@@ -156,7 +159,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       functionName: functionName,
       resourceLocation: SOURCE_PATH.resourceLocationPerAction,
       handlerType: HANDLER.hdrDsq,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrDsq/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/FunctionYaml/HdrInv/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, SOURCE_PATH, SAVE_FILE_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, FUNCTION_NAME, 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, SOURCE_PATH, SAVE_FILE_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, FUNCTION_NAME, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require('../../../libs/Consts');
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -34,20 +34,15 @@ const templatePath = path.join(__dirname, "./template.ejs")
  * @return {{ templatePath, templateData, setting } }
  */
 function data(_izContext, objectSchema, srcPath) {
-
-  // const shortNamePath = path.join(srcPath, "./schemas/ShortNameObjectType.js");
-  // const shortName = fs.existsSync(shortNamePath) ? require(shortNamePath) : {};
-  // console.log("objectSchema in mainFunction: ", objectSchema)
-
-
   let createSourceArray = [];
+  let newObjectSchema = renameObjectType(objectSchema, srcPath);
 
   for (const action of Object.values(ACTIONS)) {
     if (objectSchema.overWriteHandlers?.[action]) {
       // if have overWriteHander of action check hdrInv inside
       if (objectSchema.overWriteHandlers[action].includes(HANDLER.hdrInv)) {
         // create template data
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     } else {
@@ -55,7 +50,7 @@ function data(_izContext, objectSchema, srcPath) {
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
       if (defaultHandler.includes(HANDLER.hdrInv)) {
         // create template data and object for create source
-        const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
+        const createSourceParam = createParamForCreateSource(newObjectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     }
@@ -66,9 +61,10 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
+  let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let objectType = objectSchema.objectType;
   let actionHandler = action;
-  let functionName = objectType + upperCase(actionHandler);
+  let functionName = upperCase(objectType) + upperCase(actionHandler);
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
 
@@ -144,7 +140,9 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationPerAction,
       handlerType: HANDLER.hdrInv,
       additionalResourcePermission,
-      objectType
+      objectType,
+      // functionNameConfig: upperCase(objectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrInv))
+      functionNameConfig: upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrInv))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrInv/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) %>
   iamRoleStatements:

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)
       }
     }
@@ -61,10 +62,13 @@ function data(_izContext, objectSchema, srcPath) {
 function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
   let actionHandler = action;
-  let functionName = objectType + upperCase(actionHandler);
+  let functionName = upperCase(objectType) + upperCase(actionHandler);
   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
@@ -104,8 +108,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
           SQS_RESOURCE.getQueueUrl
         ], [RESOURCE_CLASSES.sns]: ["Publish", "Subscribe"]
     }, [
-      resourceNames(RESOURCE_CLASSES.sqs, functionName),
-      resourceNames(RESOURCE_CLASSES.sqs, functionName + "DLQ"),
+      resourceNames(RESOURCE_CLASSES.sqs, functionName + upperCase(HANDLER.hdrSqs)),
+      resourceNames(RESOURCE_CLASSES.sqs, functionName + upperCase(HANDLER.hdrSqs) + "DLQ"),
       resourceNames(RESOURCE_CLASSES.sns, "In" + functionName),
       resourceNames(RESOURCE_CLASSES.sns, "Out" + functionName)
     ]
@@ -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,96 @@ 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
+// if need to validate authorizer or additional params , add code to hook tag below
 
-      // --- reforming record.body for Dsq request
-      record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);
-      record._izContext.logger.debug('record LambdaFunctionHdrDsq after reform', record);
+module.exports.main = middleware.wrap(async (event,context, callback) => {
 
-      let passOnProperties = []
-
-      // --- 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 %><%- firstLetterUpperCase(handler) %>",
+        "OBJTYPE,
+        <%- action %>"
+        //(<validateSchemaSetting>)
+        //(</validateSchemaSetting>)
+      )
+
+      //for validate additional params
+      //(<afterGenerateValidatorSchema>)
+        /*
+        await recordHandlerSharedLib.validateRecord(
+          record,
+          "<%- functionName %><%- firstLetterUpperCase(handler) %>",
+          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');
 
+  } catch (err) {
+    Logger.debug('unhandled error <%- functionName %><%- handler %>')
+    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/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),