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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@izara_project/izara-core-library-core": "^1.0.13",
     "@izara_project/izara-core-library-logger": "^1.0.5",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.13",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.25",
     "@izara_project/izara-shared": "^1.0.96",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.1",

package/src/GenerateCodeLibs/src/Consts.js

@@ -43,18 +43,18 @@ const TOPIC_NAME_GRAPH_HANDLER = {
 }
 
 const TOPIC_NAME_GENERATE_CODE = {
-  updateRelComplete: "UpdateRelationshipComplete",
-  createRelComplete: "CreateRelationshipComplete",
-  deleteRelComplete: "DeleteRelationshipComplete",
-  outUpdateRelComplete: "OutUpdateRelationshipComplete",
-  outCreateRelComplete: "OutCreateRelationshipComplete",
-  outDeleteRelComplete: "OutDeleteRelationshipComplete",
-  updateNodeComplete: "UpdateNodeComplete",
-  outUpdateNodeComplete: "OutUpdateNodeComplete",
-  createNodeComplete: "CreateObjectComplete",
-  outCreateNodeComplete: "OutCreateObjectComplete",
-  deleteNodeComplete: "DeleteNodeComplete",
-  outDeleteNodeComplete: "OutDeleteNodeComplete"
+  updateRelComplete: "UpdateRelComp",
+  createRelComplete: "CreateRelComp",
+  deleteRelComplete: "DeleteRelComp",
+  outUpdateRelComplete: "OutUpdateRelComp",
+  outCreateRelComplete: "OutCreateRelComp",
+  outDeleteRelComplete: "OutDeleteRelComp",
+  updateNodeComplete: "UpdateNodeComp",
+  outUpdateNodeComplete: "OutUpdateNodeComp",
+  createNodeComplete: "CreateObjectComp",
+  outCreateNodeComplete: "OutCreateObjectComp",
+  deleteNodeComplete: "DeleteNodeComp",
+  outDeleteNodeComplete: "OutDeleteNodeComp"
 }
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -48,7 +48,6 @@ const {
 const nodeLabelRegexPattern = "^[a-zA-Z0-9_-]+(?:\:[a-zA-Z0-9_-]+)?$"
 
 
-
 const schemaFunctionPerAction = {
   [consts.ACTIONS.create]: validatorSchema.generateValidatorSchemaForCreate,
   [consts.ACTIONS.update]: validatorSchema.generateValidatorSchemaForUpdate,
@@ -127,7 +126,7 @@ async function validateSchemaPerRecord(
       throw new Error(`Not found function for generateValidatorSchema or function for explodeData of action:${action}`);
     }
 
-    const objectSchema = await getObjectSchema.getObjSchemaFromS3WithHierarchy(record._izContext, objType);
+    const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(record._izContext, objType);
 
     const generateValidatorFunction = schemaFunctionPerAction[action];
     const explodeDataFunction = explodeDataPerAction[action]

package/src/MainLibs/src/Utils.js

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
+const lodash = require("lodash")
 
 module.exports.firstLetterUpperCase = (text) => {
   return text.charAt(0).toUpperCase() + text.slice(1)
@@ -34,4 +35,16 @@ module.exports.checkOverWriteGenerateMainFunction = (objectSchema, action) => {
     overWriteStatus = false
   }
   return overWriteStatus
+}
+
+module.exports.renameObjectType = (objectSchema, srcPath) => {
+  const shortNamePath = path.join(srcPath, "./schemas/ShortNameObjectType.js");
+  const shortName = fs.existsSync(shortNamePath) ? require(shortNamePath) : {};
+
+  let newObjectSchema = lodash.cloneDeep(objectSchema)
+
+  if (shortName[objectSchema.objectType]) {
+    newObjectSchema.shortNameObjectType = shortName[objectSchema.objectType]
+  }
+  return newObjectSchema
 }

package/src/TemplateManager/src/FindData/FindDataYaml/data.js

@@ -23,7 +23,7 @@ const templatePath = path.join(__dirname, "./template.ejs")
 
 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, FUNCTION_NAME } = require("../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, shortNameHandler } = require("../../libs/Consts");
 
 const serviceSchemas = require('@izara_project/izara-core-library-service-schemas');
 const serviceConfig = serviceSchemas.serviceConfig;
@@ -174,7 +174,8 @@ async function data(_izContext, objectSchemas, srcPath) {
       functionName: functionName,
       resourceLocation: SOURCE_PATH.resourceLocationFindData,
       handlerType: HANDLER.hdrSqs,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrSqs))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/FindData/FindDataYaml/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/FindData/Handler/data.js

@@ -31,15 +31,10 @@ const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = req
  * @return {{ templatePath, templateData, setting } }
  */
 function data(_izContext, srcPath) {
-  let functionName = FUNCTION_NAME.findData
-  let handler = HANDLER.hdrSqs
-  let functionNameConfig = upperCase(functionName) + upperCase(handler)
 
   return {
     templatePath: templatePath,
-    templateData: {
-      functionNameConfig
-    },
+    templateData: {},
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.findData),
       saveFileName: upperCase(FUNCTION_NAME.findData) + "_" + upperCase(HANDLER.hdrSqs),

package/src/TemplateManager/src/GenerateCode.js

@@ -120,14 +120,12 @@ const createUpdateRelationshipSchemaCompleteMainFunction = require('./Relationsh
 const createRelationshipSchemaMain = require('./RelationshipPerAction/CreateRelationship/createRelationship/mainFunction/data');
 
 // createRelationsihp Handler
-// const createCreateRelationshipHdrApi = require('./CreateRelationship/createrelationship/perAction/HdrApi/data');
 const createCreateRelationshipHdrDsq = require('./RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrDsq/data');
 const createCreateRelationshipHdrInv = require('./RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrInv/data');
 const createCreateRelationshipHdrSqs = require('./RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrSqs/data');
 const createCreateRelationshipHdrApi = require('./RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrApi/data');
 
 // createRelationshipFunctionYaml
-// const createCreateRelationshipFunctionYamlHdrApi = require('./CreateRelationship/createrelationship/functionYaml/HdrApi/data');
 const createCreateRelationshipFunctionYamlHdrInv = require('./RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrInv/data');
 const createCreateRelationshipFunctionYamlHdrDsq = require('./RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrDsq/data');
 const createCreateRelationshipFunctionYamlHdrSqs = require('./RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrSqs/data');
@@ -502,11 +500,11 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         ...deleteRelationshipCompleteData
       )
     }
-    // console.log("createSourceParams in GenerateCode", createSourceParams)
+    // console.log("createSourceParams templatePath in GenerateCode", createSourceParams.templatePath)
+
     const createFunctionNameConfig = functionNameConfigFile(_izContext, createSourceParams, saveFilePath);
     createSourceParams = createSourceParams.concat(createFunctionNameConfig);
 
-    // console.log("createSourceParams", createSourceParams)
     // delete file .yml before start to prevent confilct of data
     for (let folderPathToEmpty of Object.keys(GENERATECODE_SOURCE_PATH)) {
       await deleteFileInDir(GENERATECODE_SOURCE_PATH[folderPathToEmpty]);
@@ -515,8 +513,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // console.log(""createSourceParams": ", createSourceParams)
     // start create source
     for (let { templatePath, templateData, setting } of createSourceParams) {
+      // console.log("setting.saveFileName in GenerateCode", setting.saveFileName);
       // console.log("templatePath in GenerateCode", templatePath);
-      // console.log("setting.savePath in GenerateCode", setting.savePath);
 
       await createSource(
         readFileSync(templatePath, 'utf8'),

package/src/TemplateManager/src/OutPerActionComplete/OutCreateComplete/functionYaml/data.js

@@ -70,7 +70,7 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationPerAction
+      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -50,7 +50,7 @@ function createParamForCreateSource(srcPath) {
       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/OutCreateComplete/handler/template.ejs

@@ -26,7 +26,7 @@ const izaraShared = require('@izara_project/izara-shared');
 const recordHandlerSharedLib = izaraShared.recordHandlerSharedLib
 const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
 
-const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
+const createObjectComplete = require('./CreateObjectComplete_Main');
 const Logger = require('@izara_project/izara-core-library-logger');
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -36,7 +36,8 @@ let perRecordsValidatorSchema = {
   required: [
     'returnValue',
     'status',
-    'errorFounds'
+    'errorFounds',
+    'graphServiceTag'
   ],
   properties: {
     returnValue: {
@@ -48,6 +49,9 @@ let perRecordsValidatorSchema = {
     errorFounds: {
       type: 'array',
       default: []
+    },
+    graphServiceTag: {
+      type: 'string',
     }
   }
 };
@@ -82,7 +86,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "<%- firstLetterUpperCase(queueName) %>", // queue name that need to retry or send to dlq
+        "CreateObjectComplete", // 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
       );
@@ -91,7 +95,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
       passOnProperties.push(record.body.Message.errorFounds)
-      passOnProperties.push(record.body.Message.graphServerTag)
+      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);
@@ -99,8 +103,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
-        <%- functionName %>.<%- functionName %>, // mainFunction that need to invoke.
-        "<%- firstLetterUpperCase(queueName) %>", // queue name that need to retry or send to dlq
+        createObjectComplete.createObjectComplete, // mainFunction that need to invoke.
+        "CreateObjectComplete", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -123,8 +127,4 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     Logger.error('Unhandled Error, updateNodeCompleteHdrSqs: ', err);
     throw (err);
   }
-});
-
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase()+ text.slice(1)
-} _%>
+});

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

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

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

@@ -35,9 +35,8 @@ const PREFIX = {
  * @param {*} returnValue
  * @param {*} status
  * @param {*} errorsFounds
- * @param {*} graphServerTag
+ * @param {*} graphServiceTag
  * @param {*} passBackProperties
- * @param {*} callingFlowConfig
     returnValue = {
       queryResult: returnCreateNode,
       objType,
@@ -51,18 +50,16 @@ module.exports.createObjectComplete = async (
   returnValue,
   status,
   errorsFound,
-  graphServerTag,
+  graphServiceTag,
   passBackProperties,
-  callingFlowConfig
 ) => {
   try {
     _izContext.logger.debug("function createObjectComplete:", {
       returnValue,
       status,
       errorsFound,
-      graphServerTag,
+      graphServiceTag,
       passBackProperties,
-      callingFlowConfig
     });
 
     let errorFounds = [];
@@ -91,7 +88,7 @@ module.exports.createObjectComplete = async (
     if (status === "complete" && errorsFound.length > 0) {
       errorFounds.push("[Invalid] status is commplete should be not have errorsFound");
     };
-    if (graphServerTag == null) {
+    if (graphServiceTag == null) {
       errorFounds.push("[Invalid] graphServerTag is not empty string");
     };
 
@@ -103,7 +100,7 @@ module.exports.createObjectComplete = async (
     let awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId((hash(
       {
         objType: returnValue.objType,
-        graphServerTag: graphServerTag,
+        graphServiceTag: graphServiceTag,
         identifiers: returnValue.objInstanceFull.identifiers
       })),
       PREFIX.CREATE_OBJECT_ASYNC

package/src/TemplateManager/src/OutPerActionComplete/OutDeleteComplete/functionYaml/data.js

@@ -67,7 +67,7 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationPerAction
+      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -50,7 +50,7 @@ function createParamForCreateSource(srcPath) {
       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/OutDeleteComplete/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.deleteNodeComplete)}_Main`,
       fileExtension: ".js",
       isAppend: false

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

@@ -52,7 +52,7 @@ module.exports.deleteNodeComplete = async (
       passBackProperties: passBackProperties
     });
 
-    let updateCompleteMsg = {
+    let deleteNodeComplete = {
       objType: {
         objectType: returnValue.objType.objectType,
         serviceTag: returnValue.objType.serviceTag
@@ -65,14 +65,14 @@ module.exports.deleteNodeComplete = async (
       errorsFound: errorsFound
     };
 
-    updateCompleteMsg = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, updateCompleteMsg);
+    deleteNodeComplete = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, updateCompleteMsg);
     _izContext.logger.debug("after addCallingFlow to SnsResponseMessageObject", updateCompleteMsg);
 
     let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {});
     _izContext.logger.debug("after addCallingFlow to SnsResponseMessageAttributes", updateCompleteMsg);
 
     let sendMessageToOutUpdateNodeComplete = {
-      Message: JSON.stringify(updateCompleteMsg),
+      Message: JSON.stringify(deleteNodeComplete),
       MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
       TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
     };

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

@@ -69,7 +69,7 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationPerAction
+      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -50,7 +50,7 @@ function createParamForCreateSource(srcPath) {
       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/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 objectType = objectSchema.objectType
   let functionName = 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 = 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,6 +61,7 @@ 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);
@@ -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: