@izara_project/izara-market-library-service-schemas 1.0.54 → 1.0.56

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/functionYaml/data.js

@@ -16,7 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
+
 const path = require('path');
+const fs = require('fs');
+const yaml = require('yaml');
 
 const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
@@ -56,6 +59,11 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
   let handlerType = upperCase(HANDLER.hdrApi)
   let additionalResourcePermission = defaultIamRolePerAction();
 
+  const configPath = path.join(srcPath, '../../config/serverless.config.yml');
+  const serverlessConfig = fs.readFileSync(configPath, 'utf8');
+  const config = yaml.parse(serverlessConfig);
+  const serviceTag = config.main_config.iz_serviceTag;
+
   return {
     templatePath: templatePath,
     templateData: {
@@ -65,7 +73,8 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       roleName: upperCase(flowSchema.flowTag),
-      event: "post"
+      event: "post",
+      serviceTag: serviceTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/functionYaml/template.ejs

@@ -4,13 +4,13 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - httpApi:
-        path: /<%- firstLetterLowerCase(functionName) %>/
+        path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>
         method: <%- event %>
         authorizer: authorizerServiceSchema
         #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
         #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
     - httpApi:
-        path: /<%- firstLetterLowerCase(functionName) %>/{targetUserId}
+        path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>/{targetUserId}
         method: <%- event %>
         authorizer: authorizerServiceSchema
         #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>

package/src/reStructure/TemplateData/flowSchema/register/complete/handler/template.ejs

@@ -52,6 +52,9 @@ module.exports.main = middlewareHandler.wrap(async (event, context, callback) =>
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.TopicArn)
       passOnProperties.push(record.body.Message)
+      //(<additionalParams>)
+      //(</additionalParams>)
+      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)

package/src/reStructure/TemplateData/flowSchema/register/complete/mainFunction/template.ejs

@@ -53,9 +53,9 @@ module.exports.registerCompleteMain = async (
   _izContext,
   topicArn,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
   try {
     _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)

package/src/reStructure/TemplateData/flowSchema/templateByStatusType/storedCacheTemplate.ejs

@@ -5,6 +5,9 @@ let [ cacheMainStatus, cacheMain, cacheExist ] = await storedCacheSharedLib.chec
     //(<keyValueStoredCacheTable>)
     //(</keyValueStoredCacheTable>)
   },
+  //(<additionalAttributesWhenCreateStoredCache>)
+  //(</additionalAttributesWhenCreateStoredCache>),
+  createFlowTypeConcat(_izContext,{flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag}),
   //(<storedCacheConfig>)
   //(</storedCacheConfig>)
 )

package/src/reStructure/TemplateData/flowSchema/templateByStatusType/triggerCacheTemplate.ejs

@@ -5,6 +5,9 @@
       //(<keyValueTriggerCacheTable>)
       //(</keyValueTriggerCacheTable>)
     },
+    //(<additionalAttributesWhenCreateTriggerCache>)
+    //(</additionalAttributesWhenCreateTriggerCache>)
+    createFlowTypeConcat(_izContext,{flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag}),
     //(<triggerCacheConfig>)
     //(</triggerCacheConfig>)
   )

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/handler/template.ejs

@@ -51,7 +51,11 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       );
 
       // add argument (to invoke lambda) to passOnProperties[]
+      passOnProperties.push(record.body.TopicArn)
       passOnProperties.push(record.body.Message)
+      //(<additionalParams>)
+      //(</additionalParams>)
+      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)

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/mainFunction/template.ejs

@@ -56,10 +56,11 @@ const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-librar
 
 module.exports.<%- functionName %> = async (
   _izContext,
+  topicArn,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
 
   try {
@@ -68,15 +69,43 @@ module.exports.<%- functionName %> = async (
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
     let correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID);
+    if (!topicArn) {
+      throw new NoRetryError('not have TopicArn for get FlowSchemas')
+    }
+
+    let topicName = topicArn.spilt(":")[5].split("_")
 
+    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+      flowTag: topicName[2],
+      serviceTag: topicName[0]
+    })
+
+    //(<createIdentifiersFlow>)
+      let identifiers
+    //(</createIdentifiersFlow>)
+
+    if (!flowSchema) {
+      throw new NoRetryError("not have flowSchema in S3")
+    }
 
-    let wbsTasks = await dynamodbSharedLib.query(
-      _izContext,
-      await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
-      {
-        taskKey: correlationId,
+    let wbsTasks; 
+    if (flowSchema.statusType === "statusField" || flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
+      wbsTasks = await dynamodbSharedLib.query(
+        _izContext,
+        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
+        {
+          taskKey: `${createFlowTypeConcat(_izContext,{flowTag: topicName[2],serviceTag: topicName[0]})}${identifiers}`
+        }
+      )
+    } else if (flowSchema.statusType === "none") {
+      wbsTasks = await dynamodbSharedLib.query(
+        _izContext,
+        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
+        {
+          taskKey: correlationId,
+        }
+      )
       }
-    )
 
     if (wbsTasks.Items.length) {
       await Promise.all(wbsTasks.Items.map(async ({ connectionId }) => {

package/src/reStructure/TemplateData/perActionEndpoint/handler/api/template.ejs

@@ -29,8 +29,8 @@ const {
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
 validateSchemaMiddleware(

package/src/reStructure/TemplateData/perActionEndpoint/handler/dsq/template.ejs

@@ -29,8 +29,8 @@ const recordHandlerSharedLib = require('@izara_project/izara-core-library-record
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
 middleware.setValidatorSchema(

package/src/reStructure/TemplateData/perActionEndpoint/handler/sqs/template.ejs

@@ -29,8 +29,8 @@ const recordHandlerSharedLib = require('@izara_project/izara-core-library-record
  const <%- functionName %> =require('./<%- firstLetterUpperCase(objectType) %><%- firstLetterUpperCase(action) %>_Main')
   <%_ } _%>
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
 middleware.setValidatorSchema(

package/src/reStructure/TemplateData/perActionEndpoint/yaml/api/data.js

@@ -18,6 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 const path = require('path');
+const fs = require('fs');
+const yaml = require('yaml');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
@@ -56,14 +58,14 @@ function data(_izContext, objectSchema, srcPath) {
   let createSourceArray = [];
   for (const action of Object.values(ACTIONS)) {
     if (objectSchema.overWriteHandlers?.[action]) {
-      // if have overWriteHander of action check hdrApi inside
+      // if have overWriteHandler of action check hdrApi inside
       if (objectSchema.overWriteHandlers[action].includes(HANDLER.hdrApi)) {
         // create template data
         const createSourceParam = createParamForCreateSource(objectSchema, action, srcPath)
         createSourceArray.push(createSourceParam)
       }
     } else {
-      // if not have overWriteHander of action will use default handler
+      // if not have overWriteHandler of action will use default handler
       const defaultHandler = DEFAULT_HANDLER_PER_ACTION[action]
       if (defaultHandler.includes(HANDLER.hdrApi)) {
         // create template data and object for create source
@@ -86,6 +88,11 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType
   let functionNameConfig = upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrApi))
 
+  const configPath = path.join(srcPath, '../../config/serverless.config.yml');
+  const serverlessConfig = fs.readFileSync(configPath, 'utf8');
+  const config = yaml.parse(serverlessConfig);
+  const serviceTag = config.main_config.iz_serviceTag;
+
   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
@@ -184,6 +191,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       roleName: groupBy,
       action: action,
       functionNameConfig,
+      serviceTag: serviceTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/perActionEndpoint/yaml/api/template.ejs

@@ -4,7 +4,7 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - http:
-        path: <%- firstLetterUpperCase(objectType) %>/<%- firstLetterUpperCase(action) %>
+        path: /<%- serviceTag%>/<%- firstLetterUpperCase(objectType) %>/<%- firstLetterUpperCase(action) %>
         method: <%- event %>
         cors: true
         #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>Authorizer#>

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/data.js

@@ -88,8 +88,7 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
   // const objectType = objectSchema.objectType; // main objectType
   let propertyValue = settings.propertyValueTag
   const storageResources = objectSchema.storageResources // storageResource from main objectType
-  const serviceTag = getLocalConfig(srcPath, "iz_serviceTag")
-
+  const serviceTag = getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag")
   attributeRelationships.push(
     { // has{objectType}propertyValue
       relationshipTag: PREFIX_RELATIONSHIP.has + upperCase(propertyValue) + PROPERTY_VALUE_TAG.property,

package/src/reStructure/TemplateData/relationshipPerAction/create/action/handler/api/template.ejs

@@ -89,8 +89,8 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 // validate event params in middleware before into main function
 validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);

package/src/reStructure/TemplateData/relationshipPerAction/create/action/handler/dsq/template.ejs

@@ -110,8 +110,8 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-  //</globalVarible>)
+//(<globalVariable>
+  //</globalVariable>)
 
   // validate event params in middleware before into main function
   validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);

package/src/reStructure/TemplateData/relationshipPerAction/create/action/handler/sqs/template.ejs

@@ -94,8 +94,8 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-  //</globalVarible>)
+//(<globalVariable>
+  //</globalVariable>)
 
   // validate event params in middleware before into main function
   validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);

package/src/reStructure/TemplateData/relationshipPerAction/create/action/mainFunction/template.ejs

@@ -348,7 +348,15 @@ module.exports.createRelationship = async (
         _izContext,
         awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({ linkTypeId, relationshipProperties, correlationId: _izContext.correlationIds.get("id") }), // hash id
+          hash({
+            linkTypeId,
+            relationshipProperties,
+            correlationId: _izContext.correlationIds.get("id"),
+            callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
+            firstObject: firstObject,
+            secondObject: secondObject,
+            relType: relType
+            }), // hash id
           PREFIX.createRel // prefix, use constant further
         )
       );

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/handler/sqs/template.ejs

@@ -93,7 +93,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
-      passOnProperties.push(record.body.Message.errorsFound)
+      passOnProperties.push(record.body.Message.errorsFound),
+      passOnProperties.push(record.body.Message.graphServiceTag),
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/mainFunction/template.ejs

@@ -34,8 +34,10 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   PREFIX
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+
 //(<optionalRequire>)
 //(</optionalRequire>)
+
 module.exports.createRelationshipComplete = async (
   _izContext,
   returnValue,
@@ -122,6 +124,8 @@ module.exports.createRelationshipComplete = async (
           _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutCreateRelationshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutCreateRelationshipComplete);
 
+        //(<afterCheckAwaitingStep>)
+        //(</afterCheckAwaitingStep>)
         } // check pendingStepId finished
 
         // remove awaitingMultipleStep after finished
@@ -134,6 +138,8 @@ module.exports.createRelationshipComplete = async (
       }) // end per pendingStep
     );
 
+    //(<afterCheckAllAwaitingStep>)
+    //(</afterCheckAllAwaitingStep>)
 
     return {
       returnValue,

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/handler/api/template.ejs

@@ -89,8 +89,8 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 // validate event params in middleware before into main function
 validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/handler/dsq/template.ejs

@@ -110,8 +110,8 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-  //</globalVarible>)
+//(<globalVariable>
+  //</globalVariable>)
 
   // validate event params in middleware before into main function
   validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/handler/sqs/template.ejs

@@ -90,8 +90,8 @@ let validatorSchema = {
   }
 };
 
-//(<globalVarible>
-  //</globalVarible>)
+//(<globalVariable>
+  //</globalVariable>)
 
   // validate event params in middleware before into main function
   validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);

package/src/reStructure/TemplateData/relationshipPerAction/get/action/handler/api/template.ejs

@@ -16,16 +16,18 @@ 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 { middlewareHandler, validatorSchema, response } = require("@izara_project/izara-middleware");
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
-const {
-  validateSchemaMiddleware
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
+
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
-// validate event params in middleware before into function
-let validatorSchema =  {
+
+
+// validate event params in middlewareHandler before into function
+let basicValidatorSchema =  {
   type: "object",
   required: ["firstObject", "secondObject", "relType", 'relId'],
   properties: {
@@ -37,8 +39,8 @@ let validatorSchema =  {
           type: "object",
           required: ["serviceTag", "objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty()
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
@@ -55,8 +57,8 @@ let validatorSchema =  {
           type: "object",
           required: ["serviceTag", "objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty()
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
@@ -69,7 +71,7 @@ let validatorSchema =  {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
       properties: {
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        relationshipTag: validatorSchema.stringNotEmpty(),
         serviceTag: {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
@@ -87,21 +89,19 @@ let validatorSchema =  {
   }
 };
 
+//(<globalVariable>
+//</globalVariable>)
 
-
-//(<globalVarible>
-//</globalVarible>)
-
-// validate event params in middleware before into main function
-validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);
-middleware.setValidatorSchema(validatorSchema)
+// validate event params in middlewareHandler before into main function
+basicValidatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(basicValidatorSchema);
+middlewareHandler.setValidatorSchema(basicValidatorSchema)
 // if need to validate authorizer or additional params , add code to hook tag below
 
 //(<afterValidateWith>)
 //(</afterValidateWith>)
 
 
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
   event._izContext.logger.debug('Event:', event);
   try {
     // invoke LambdaFunction
@@ -119,15 +119,15 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
 
     // return error to client
     if (lambdaFunctionResponse instanceof Error) {
-      return (izara.response.failure(lambdaFunctionResponse));
+      return (response.failure(lambdaFunctionResponse));
     }
 
     // return success to client
-    return (izara.response.success(lambdaFunctionResponse));
+    return (response.success(lambdaFunctionResponse));
 
   } catch (err) {
     event._izContext.logger.error('Error, <%- functionName %>HdrApi: ', err);
-    return (izara.response.failure(err));
+    return (response.failure(err));
   }
 });
 <%_ function firstLetterUpperCase(text) {

package/src/reStructure/TemplateData/relationshipPerAction/get/action/handler/dsq/template.ejs

@@ -17,8 +17,7 @@ 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 { middlewareHandler, validatorSchema, response } = require("@izara_project/izara-middleware");
 
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 
@@ -27,10 +26,13 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 const Logger = require('@izara_project/izara-core-library-logger');
 const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
+
 // validate event properties in body.Message of sqs event
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
   {
     type: "object",
     required: ['body', 'messageAttributes'],
@@ -45,8 +47,8 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
   }
 ));
 
-// validate event params in middlewware before into function.
-let validatorSchema = {
+// validate event params in middleware before into function.
+let basicValidatorSchema = {
   type: "object",
   required: ["firstObject", "secondObject", "relType", 'relId'],
   properties: {
@@ -58,8 +60,8 @@ let validatorSchema = {
           type: "object",
           required: ["serviceTag", "objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty()
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
@@ -76,8 +78,8 @@ let validatorSchema = {
           type: "object",
           required: ["serviceTag", "objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty()
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
@@ -90,7 +92,7 @@ let validatorSchema = {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
       properties: {
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        relationshipTag: validatorSchema.stringNotEmpty(),
         serviceTag: {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
@@ -109,18 +111,18 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-  //</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
-  // validate event params in middleware before into main function
-  validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);
+  // validate event params in middlewareHandler before into main function
+  basicValidatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(basicValidatorSchema);
   // if need to validate authorizer or additional params , add code to hook tag below
 
   //(<afterValidateWith>)
   //(</afterValidateWith>)
 
 
-  module.exports.main = middleware.wrap(async (event, context, callback) => {
+  module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
     Logger.debug('event:', event);
     Logger.debug('context:', context);
     try {
@@ -140,7 +142,7 @@ let validatorSchema = {
         await recordHandlerSharedLib.validateRecord(
           record, // one record will send to mainFunction
           "<%- queueName %>",                       // queue name that need to retry or send to dlq
-          validatorSchema, // schema for record.Message
+          basicValidatorSchema, // schema for record.Message
           // messageAttributeValidatorSchema        // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
         );