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

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

@@ -21,13 +21,11 @@ const fs = require('fs');
 
 const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase, checkOverWriteGenerateMainFunction } = require("../../../../../MainLibs/src/Utils")
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, checkOverWriteGenerateMainFunction } = require("../../../../../MainLibs/src/Utils")
 const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, FUNCTION_NAME } = require("../../../libs/Consts");
 
 
-const getTemplatePath = path.join(__dirname, "./getTemplate.ejs")
-const updateTemplatePath = path.join(__dirname, "./updateTemplate.ejs")
-const createTemplatePath = path.join(__dirname, "./createTemplate.ejs")
+const templatePath = path.join(__dirname, "./template.ejs")
 /**
  * receive objectSchema
  * create data for hdrInv template
@@ -42,30 +40,18 @@ function data(_izContext, objectSchema, srcPath) {
     if (objectSchema.overWriteHandlers?.[action]) {
       // if have overWriteHander of action check hdrInv inside
       if (objectSchema.overWriteHandlers[action].includes(HANDLER.hdrInv)) {
-        if (action == ACTIONS.get) {
-          // create template data
-          const createHandlerGet = createParamForCreateHandlerGet(objectSchema, action, HANDLER.hdrInv, srcPath)
-          createHandlerGet && createSourceArray.push(createHandlerGet)
-        } else if (action == ACTIONS.update) {
-          const createHandlerUpdate = createParamForCreateHandlerUpdate(objectSchema, action, HANDLER.hdrInv, srcPath)
-          createHandlerUpdate && createSourceArray.push(createHandlerUpdate)
-        } else if (action == ACTIONS.create) {
-          const createHandlerCreate = createParamForCreateHandlerCreate(objectSchema, action, HANDLER.hdrInv, srcPath)
-          createHandlerCreate && createSourceArray.push(createHandlerCreate)
-        }
+        // create template data
+        const createHandlerGet = createParamForCreateHandlerGet(objectSchema, action, HANDLER.hdrInv, srcPath)
+        createHandlerGet && createSourceArray.push(createHandlerGet)
       }
     } else {
       // if not have overWriteHander of action will use default handler
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
-      if (action == ACTIONS.get) {
-        if (defaultHandler.includes(HANDLER.hdrInv)) {
-          // create template data and object for create source
-          const createHandlerGet = createParamForCreateHandlerGet(objectSchema, action, HANDLER.hdrInv, srcPath)
-          createHandlerGet && createSourceArray.push(createHandlerGet)
-        }
-      } else if (action == ACTIONS.update) {
-        const createHandlerUpdate = createParamForCreateHandlerUpdate(objectSchema, action, HANDLER.hdrInv, srcPath)
-        createHandlerUpdate && createSourceArray.push(createHandlerUpdate);
+
+      if (defaultHandler.includes(HANDLER.hdrInv)) {
+        // create template data and object for create source
+        const createHandlerGet = createParamForCreateHandlerGet(objectSchema, action, HANDLER.hdrInv, srcPath)
+        createHandlerGet && createSourceArray.push(createHandlerGet)
       }
     }
   }
@@ -78,12 +64,12 @@ function createParamForCreateHandlerGet(objectSchema, action, handler, srcPath)
   let objectType = objectSchema.objectType;
   let functionName = objectType + upperCase(action);
   return {
-    templatePath: getTemplatePath,
+    templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
       action: action,
-      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action)
+      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
@@ -94,44 +80,5 @@ function createParamForCreateHandlerGet(objectSchema, action, handler, srcPath)
   }
 }
 
-function createParamForCreateHandlerUpdate(objectSchema, action, handler, srcPath) {
-  let objectType = objectSchema.objectType;
-  let functionName = objectType + upperCase(action);
-  return {
-    templatePath: updateTemplatePath,
-    templateData: {
-      functionName,
-      objectType,
-      action,
-      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action)
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectType)}${upperCase(action)}_${upperCase(handler)}`,
-      fileExtension: ".js",
-      isAppend: false
-    }
-  }
-}
-
-function createParamForCreateHandlerCreate(objectSchema, action, handler, srcPath) {
-  let objectType = objectSchema.objectType;
-  let functionName = objectType + upperCase(action);
-  return {
-    templatePath: createTemplatePath,
-    templateData: {
-      functionName,
-      objectType,
-      action,
-      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action)
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectType)}${upperCase(action)}_${upperCase(handler)}`,
-      fileExtension: ".js",
-      isAppend: false
-    }
-  }
-}
 
 module.exports = data;

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

@@ -30,7 +30,7 @@ const {
 <%_ if (isCreateMainFunction == true) { _%>
   // user generate main function
   <%_ } else { %>
- const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(actionHandler) %>_Main')
+ const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
 //(<globalVariable>
@@ -40,12 +40,11 @@ const {
 //validate event params in middleware before into function
 validateSchemaMiddleware(
   middleware,
-  "<%- firstLetterUpperCase(objectType) %>",                      // objectType
-  "<%- actionHandler %>",                                         // action
+  "<%- 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

@@ -24,8 +24,7 @@ const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase, checkOverWriteGenerateMainFunction } = require("../../../../../MainLibs/src/Utils")
 const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH } = require("../../../libs/Consts");
 
-const getTemplatePath = path.join(__dirname, "./getTemplate.ejs")
-const updateTemplatePath = path.join(__dirname, "./updateTemplate.ejs")
+const templatePath = path.join(__dirname, "./template.ejs")
 
 /**
  * receive objectSchema
@@ -41,27 +40,16 @@ function data(_izContext, objectSchema, srcPath) {
     if (objectSchema.overWriteHandlers?.[action]) {
       // if have overWriteHander of action check hdrInv inside
       if (objectSchema.overWriteHandlers[action].includes(HANDLER.hdrSqs)) {
-        if (action == ACTIONS.get) {
-          // create template data
-          const createSourceParamHandlerGet = createParamForCreateSourceGetHandler(objectSchema, action, HANDLER.hdrSqs, srcPath)
-          createSourceParamHandlerGet && createSourceArray.push(createSourceParamHandlerGet)
-        } else if (action == ACTIONS.update) {
-          const createSourceParamHandlerUpdate = createParamForCreateSourceUpdateHandler(objectSchema, action, HANDLER.hdrSqs, srcPath)
-          createSourceParamHandlerUpdate && createSourceArray.push(createSourceParamHandlerUpdate)
-        }
+        // create template data
+        const createSourceParam = createParamForCreateSourceGetHandler(objectSchema, action, HANDLER.hdrSqs, srcPath)
+        createSourceParam && createSourceArray.push(createSourceParam)
       }
     } else {
       // if not have overWriteHander of action will use default handler
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
-      if (defaultHandler.includes(HANDLER.hdrSqs)) {
-        if (action == ACTIONS.get) {
-          // create template data and object for create source
-          const createSourceParam = createParamForCreateSourceGetHandler(objectSchema, action, srcPath)
-          createSourceParamHandlerGet && createSourceArray.push(createSourceParam)
-        } else if (action == ACTIONS.update) {
-          const createSourceParamHandlerUpdate = createParamForCreateSourceUpdateHandler(objectSchema, action, HANDLER.hdrSqs, srcPath)
-          createSourceParamHandlerUpdate && createSourceArray.push(createSourceParamHandlerUpdate)
-        }
+      if (defaultHandler.includes(HANDLER.hdrSqs)) {          // create template data and object for create source
+        const createSourceParam = createParamForCreateSourceGetHandler(objectSchema, action, HANDLER.hdrSqs, srcPath)
+        createSourceParam && createSourceArray.push(createSourceParam)
       }
     }
   }
@@ -73,38 +61,16 @@ 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 queueName = functionName + upperCase(handler);
   return {
-    templatePath: getTemplatePath,
+    templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
       queueName,
       action,
-      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action)
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectType)}${upperCase(action)}_${upperCase(handler)}`,
-      fileExtension: '.js',
-      isAppend: false
-    }
-  }
-}
-
-
-function createParamForCreateSourceUpdateHandler(objectSchema, action, handler, srcPath) {
-  let objectType = objectSchema.objectType;
-  let functionName = objectType + upperCase(action);
-  let queueName = functionName + handler
-  return {
-    templatePath: updateTemplatePath,
-    templateData: {
-      objectType,
-      functionName,
-      queueName,
-      action,
-      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action)
+      isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
+      handler
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),

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

@@ -19,103 +19,108 @@ 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) { _%>
   // user generate main function
   <%_ } else { %>
- const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(actionHandler) %>_Main')
+ const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
 //(<globalVarible>
 //</globalVarible>)
 
-const perRecordValidatorSchema = {
-  type: "object",
-  required: ['identifiers'],
-  properties: {
-    identifiers: {
-      type: 'object'
-    }
-  }
-}
+//validate event params in middleware before into main function
+middleware.setValidatorSchema(
+  recordHandlerSharedLib.baseValidatorSchema(),
+  //(<middlewareSettings>)
+  //(</middlewareSettings>)
+)
 
-const messageAttributeValidatorSchema = {
-  type: "object",
-  require: ['msgAtrrParam1','msgAtrrParam2'],
-  properties: {
-    msgAtrrParam1: {
-      type: 'string'
-    },
-    msgAtrrParam2: {
-      type: 'string'
+  //(<globalValidatorSchema>)
+   const perRecordsValidatorSchema = {
+     type: "object",
+     required: [],
+     properties: {},
     }
-  }
-};
+  //(</globalValidatorSchema>)
 
-//validate event params in middleware before into main function
-validateSchemaMiddleware(
-  middleware,
-  "<%- firstLetterUpperCase(objectType) %>",
-  "<%- actionHandler %>"
-  //(<validateSchemaSetting>
-  //</validateSchemaSetting>)
-)
 // 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/PerActionEndpoint/MainFunction/Create/data.js

@@ -45,14 +45,13 @@ async function data(_izContext, objectSchema, srcPath) {
 
 async function createParamForCreateSource(_izContext, objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
-  let actionHandler = action;
   let functionName = objectType + upperCase(action);
   return {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
-      actionHandler: actionHandler,
+      actionHandler: action,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),