@izara_project/izara-market-library-service-schemas 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -14,19 +14,20 @@
   "license": "AGPL-3.0-or-later",
   "homepage": "https://bitbucket.org/izara-market-libraries/izara-market-library-service-schemas/src/master/README.md",
   "devDependencies": {
-    "jest": "^23.6.0"
+    "jest": "^29.7.0"
   },
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@izara_project/izara-core-library-core": "^1.0.14",
+    "@izara_project/izara-core-library-core": "^1.0.16",
     "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.41",
-    "@izara_project/izara-shared": "^1.0.116",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.43",
+    "@izara_project/izara-shared": "^1.0.125",
     "ejs": "^3.1.10",
-    "js-beautify": "^1.15.1",
+    "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",
-    "object-hash": "^3.0.0"
+    "object-hash": "^3.0.0",
+    "yaml": "^2.7.0"
   }
 }

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -46,6 +46,8 @@ const {
 const Logger = require("@izara_project/izara-core-library-logger");
 
 const nodeLabelRegexPattern = "^[a-zA-Z0-9_-]+(?:\:[a-zA-Z0-9_-]+)?$"
+const { validateObjType } = require('@izara_project/izara-core-library-service-schemas').validateObjType;
+
 
 
 const schemaFunctionPerAction = {
@@ -931,6 +933,99 @@ function createFieldForUpdateDynamoDb(_izContext, objectSchema, dynamoDataDetail
   return fieldsForUpdateDynamo
 }
 
+
+/**
+ *
+ * @param {Object} from
+ * @param {String} from.objectType
+ * @param {String} from.serviceTag
+ * @param {String} from.linkType
+ * @param {String} from.requiredOnCreate
+ * @param {Object} to
+ * @param {String} to.objectType
+ * @param {String} to.serviceTag
+ * @param {String} to.linkType
+ * @param {String} to.requiredOnCreate
+ * @param {Object} storageResources
+ * @param {Boolean} topLevelParent
+ */
+function createBasicRelationshipsProperties(from, to, storageResources, baseDirection, topLevelParent = false) {
+  validateObjType({ objectType: from.objectType, serviceTag: from.serviceTag });
+  validateObjType({ objectType: to.objectType, serviceTag: to.serviceTag });
+
+  let otherDirection;
+  if (baseDirection === "to") {
+    otherDirection = "from"
+  } else if (baseDirection === "from") {
+    otherDirection = "to"
+  }
+
+  let relationshipProperties = {
+    fieldNames: {
+      originTimeStamp: {
+        type: 'number',
+        requiredOnCreate: true,
+        canUpdate: false,
+        validation: {
+          minimum: 1111111111111,
+          maximum: 9999999999999
+        }
+      }
+    },
+    storageResources: storageResources,
+    links: [
+      {
+        storageResourceTags: Object.keys(storageResources),
+        from: {
+          objType: {
+            objectType: from.objectType,
+            serviceTag: from.serviceTag
+          },
+          linkType: from.linkType,
+          direction: baseDirection,
+          requiredOnCreate: from.requiredOnCreate
+        },
+        to: {
+          objType: {
+            objectType: to.objectType,
+            serviceTag: to.serviceTag
+          },
+          linkType: to.linkType,
+          direction: otherDirection,
+          requiredOnCreate: to.requiredOnCreate
+        }
+      }
+    ],
+  }
+
+  if (topLevelParent === true) {
+    relationshipProperties.links.push(
+      {
+        storageResourceTags: Object.keys(storageResources),
+        from: {
+          objType: {
+            serviceTag: to.serviceTag,
+            objectType: to.objectType
+          },
+          linkType: "one",
+          direction: "from",
+          requiredOnCreate: false
+        },
+        to: {
+          objType: {
+            serviceTag: to.serviceTag,
+            objectType: to.objectType
+          },
+          linkType: "many",
+          direction: "to",
+          requiredOnCreate: false
+        }
+      }
+    )
+  }
+  return relationshipProperties
+}
+
 module.exports = {
   sendMsgOutComplete,
   messageToDlq,
@@ -948,7 +1043,8 @@ module.exports = {
   createDataDetailsLib,
   createDeleteDataDetail,
 
-  createFieldForUpdateDynamoDb
+  createFieldForUpdateDynamoDb,
+  createBasicRelationshipsProperties
 }
 
 

package/src/SourceManager/src/CreateSource.js

@@ -86,10 +86,20 @@ function generateDataFromTemplate(template, data,) {
  * @param {string} setting.initialData // initialData can use when isAppend = true
  * @returns
  */
-async function createSource(template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false }) {
+async function createSource(template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false }) {
 
   try {
 
+    if (checkCreateSourcePass) {
+      try {
+        generateDataFromTemplate(template, data);
+        return [true, {}];
+      } catch (errors) {
+        return [false, errors];
+      }
+    }
+
+
     let dataToSave = generateDataFromTemplate(template, data);
 
     let anyDoubleTagClass

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

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const path = require('path');
 
-const { SOURCE_PATH, FUNCTION_NAME } = require("../../libs/Consts");
+const { SOURCE_PATH, FUNCTION_NAME, ADD_ON_DATA_STRUCTURE_TYPE } = require("../../libs/Consts");
 const { firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
 
 const serviceSchemas = require('@izara_project/izara-core-library-service-schemas');
@@ -43,10 +43,11 @@ const NoRetryError = require("@izara_project/izara-core-library-core/src/NoRetry
 
 async function data(_izContext, srcPath) {
 
+  let schemaPath = path.join(srcPath, "schemas")
   let datas = [];
 
   // 1. get objectTypes for check objType param
-  let getObjectTypes = await getObjectSchemas.getAllLocalObjectSchemas(_izContext, srcPath);
+  let getObjectTypes = await getObjectSchemas.getAllLocalObjectSchemas(_izContext, schemaPath);
   // console.log(("getObjectTypes: ", getObjectTypes.fieldLookup)
 
   for (const objectType of Object.keys(getObjectTypes.fieldLookup)) {
@@ -56,7 +57,7 @@ async function data(_izContext, srcPath) {
     let objectSchemaRecord = await getObjectSchemas.getLocalObjectSchemasWithHierarchy(
       _izContext,
       objectType,
-      srcPath
+      schemaPath
     );
     // console.log("objectSchemaRecord: ", objectSchemaRecord)
 
@@ -154,42 +155,42 @@ async function data(_izContext, srcPath) {
     // fieldName in versionedData
     if (objectSchema.hasOwnProperty("addOnDataStructure")) { // array
       // console.log(("objectSchemas have addOnDataStructure: ", objectSchema.addOnDataStructure)
-
       for (const versionedData of objectSchema.addOnDataStructure) { // object // loop versionedData
         // console.log("versionedData: ", versionedData)
+        if (versionedData === ADD_ON_DATA_STRUCTURE_TYPE.versionedData) {
 
-        let versionedStorageDetail = {};
-        let versioendStorageResourceTag = versionedData.storageResourceTag;
-        let versionedFieldNames = versionedData.fieldNames; // array
+          let versionedStorageDetail = {};
+          let versioendStorageResourceTag = versionedData.storageResourceTag;
+          let versionedFieldNames = versionedData.fieldNames; // array
 
-        Object.entries(storageResources).map(([storageTag, storageDetail]) => {
+          Object.entries(storageResources).map(([storageTag, storageDetail]) => {
 
-          if (versioendStorageResourceTag === storageTag) {
-            if (storageDetail.storageType === STORAGE_TYPES.graph) {
-              versionedStorageDetail = {
-                [storageDetail.storageType]: {
-                  graphServerTag: storageDetail.graphServerTag,
-                  versionedDataLabel: versionedData.versionedDataLabel
+            if (versioendStorageResourceTag === storageTag) {
+              if (storageDetail.storageType === STORAGE_TYPES.graph) {
+                versionedStorageDetail = {
+                  [storageDetail.storageType]: {
+                    graphServerTag: storageDetail.graphServerTag,
+                    versionedDataLabel: versionedData.versionedDataLabel
+                  }
                 }
+              } else {
+                throw new NoRetryError(`storageType of versionedData isn't graph`)
               }
-            } else {
-              throw new NoRetryError(`storageType of versionedData isn't graph`)
             }
-          }
-        })
-        // console.log(("versionedStorageDetail: ", versionedStorageDetail)
-
-        for (const versionedFieldName of versionedFieldNames) { // object // loop versionedFieldNames
+          })
+          // console.log(("versionedStorageDetail: ", versionedStorageDetail)
 
-          if (versionedFieldName.type === "string" || versionedFieldName.type === "number") {
-            fieldNameDatas.push({ [versionedFieldName.fieldName]: versionedStorageDetail })
-          }
+          for (const versionedFieldName of versionedFieldNames) { // object // loop versionedFieldNames
 
-        } // end loop versionedFieldNames
+            if (versionedFieldName.type === "string" || versionedFieldName.type === "number") {
+              fieldNameDatas.push({ [versionedFieldName.fieldName]: versionedStorageDetail })
+            }
 
-      } // end loop versionedData
-      //fieldNameDatas.push(collectVersionedFieldNames)
+          } // end loop versionedFieldNames
 
+        } // end loop versionedData
+        //fieldNameDatas.push(collectVersionedFieldNames)
+      }
     }
     // console.log(("fieldNameDatas: ", fieldNameDatas)
 

package/src/TemplateManager/src/GenerateCode.js

@@ -23,7 +23,8 @@ const { readFileSync } = require('fs');
 
 const {
   getAllLocalObjectSchemasWithHierarchy,
-  getAllLocalRelationshipSchemas,
+  // getAllLocalRelationshipSchemas,
+  getAllLocalRelationshipSchema,
   getAllLocalFlowSchemas
 } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 
@@ -227,7 +228,6 @@ const functionNameConfigYamldata = require('./externalService/FunctionNameConfig
 // create shared resource
 const { createSharedResource } = require('./Role/createSharedResource');
 
-
 //lib of generateCode
 const { checkValidTableYaml,
 } = require('./libs/GenerateCodeUtils');
@@ -261,7 +261,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       externalService: join(saveFilePath, SOURCE_PATH.externalService),
       relationshipPerAction: join(saveFilePath, SOURCE_PATH.relationshipPerAction),
       webSocketEndpoint: join(saveFilePath, SOURCE_PATH.webSocket),
-      generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib)
+      generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
     };
 
     let createSourceParams = [];
@@ -277,7 +277,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     const processLogicalPaginateFunctionYamlHdrDsq = await createProcessLogicalPaginateFunctionYamlHdrDsq(_izContext, allObjSchemas, saveFilePath);
     const processLogicalPaginateFunctionYamlHdrSqs = await createProcessLogicalPaginateFunctionYamlHdrSqs(_izContext, allObjSchemas, saveFilePath);
 
-    const allObjectRelationships = await getAllLocalRelationshipSchemas(_izContext, objSchemaPath);
+    const allObjectRelationships = await getAllLocalRelationshipSchema(_izContext, objSchemaPath);
     // _izContext.logger.debug("allObjectRelationships::", allObjectRelationships);
 
     const allLocalFlowSchemas = await getAllLocalFlowSchemas(_izContext, objSchemaPath);
@@ -631,6 +631,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       )
     }
     // console.log("createSourceParams templatePath in GenerateCode", createSourceParams.templatePath)
+    // console.log("template Data createSourceParams:", createSourceParams.templateData)
 
     const createFunctionNameConfig = functionNameConfigYamldata(_izContext, createSourceParams, saveFilePath);
     createSourceParams = createSourceParams.concat(...createFunctionNameConfig);
@@ -645,9 +646,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // for (const flowSchema of allLocalFlowSchemas.records) {
     //   await createHookFunction(_izContext, flowSchema, saveFilePath);
     // }
-    // console.log(""createSourceParams": ", createSourceParams)
     // start create source
     for (let { templatePath, templateData, setting } of createSourceParams) {
+      // console.log("templateData in generateCode", templateData)
       // console.log("setting.saveFileName in GenerateCode", setting.saveFileName);
       // console.log("templatePath in GenerateCode", templatePath);
 

package/src/TemplateManager/src/GenerateSchema.js

@@ -0,0 +1,103 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+'use strict';
+const join = require('path').join;
+const { readFileSync } = require('fs');
+const { SOURCE_PATH, ADD_ON_DATA_STRUCTURE_TYPE } = require('./libs/Consts')
+const { createSource } = require("../../SourceManager/src/CreateSource");
+const { deleteFileInDir } = require('../../SourceManager/src/Utils')
+const {
+  getAllLocalObjectSchemasWithHierarchy,
+} = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
+
+const createAttributeTreeObjSchemas = require('./attributeTree/objectSchema/data');
+const createAttributeTreeObjRelationship = require('./attributeTree/relationshipSchema/data');
+
+/**
+ *
+ * get template and send to
+ *
+ * @param {object} objSchemaPath
+ * @returns
+ *
+ * add another param
+ *  {string[]} objectTypes
+ *  {string[]} templates
+ *  {string} saveFilePath
+ */
+
+async function generateSchemaWithTemplate(_izContext, objSchemaPath) {
+  try {
+
+    let saveFilePath = join(objSchemaPath, `../`);
+
+    // define path for store yml file
+    const GENERATECODE_SOURCE_PATH = {
+      generateAttributeTree: join(saveFilePath, SOURCE_PATH.generatedAttributeTree)
+    };
+
+    let createSourceParams = [];
+
+    const allObjectSchemas = await getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
+
+    for (const objectSchema of allObjectSchemas.records) {
+
+      const attributeTreeObjSchema = createAttributeTreeObjSchemas(_izContext, objectSchema, saveFilePath);
+
+      const attributeTreeGenerator = [...attributeTreeObjSchema]
+      if (objectSchema.hasOwnProperty("addOnDataStructure")) {
+        for (const versionedData of objectSchema.addOnDataStructure) {
+          if (versionedData.type === ADD_ON_DATA_STRUCTURE_TYPE.attributeTree) {
+            const attributeTreeObjRelationship = createAttributeTreeObjRelationship(_izContext, objectSchema, saveFilePath);
+            createSourceParams = createSourceParams.concat(attributeTreeObjRelationship)
+          }
+        }
+      }
+
+      createSourceParams.push(...attributeTreeGenerator)
+
+    }
+
+
+    console.log("createSourceParams in generateSchema", createSourceParams)
+
+    for (let folderPathToEmpty of Object.keys(GENERATECODE_SOURCE_PATH)) {
+      await deleteFileInDir(GENERATECODE_SOURCE_PATH[folderPathToEmpty]);
+    }
+
+    // console.log("createSourceParams", createSourceParams)
+    for (let { templatePath, templateData, setting } of createSourceParams) {
+      // console.log("templateData in generateSchema", templateData);
+      // console.log("setting.savePath in GenerateSchema", setting.savePath)
+      await createSource(
+        readFileSync(templatePath, 'utf8'),
+        templateData,
+        setting,
+      );
+    }
+
+    return "Generate Schema Complete"
+
+
+  } catch (err) {
+    console.log('error templateManager: ', err);
+    throw (err);
+  }
+}
+
+module.exports = { generateSchemaWithTemplate };

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

@@ -57,7 +57,9 @@ function data(_izContext, objectSchema, srcPath) {
 }
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
-  let objectType = objectSchema.objectType
+  // let objectType = objectSchema.objectType
+  let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = upperCase(objectType) + upperCase(action);
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
@@ -160,15 +162,16 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       additionalResourcePermission,
       event: event,
       objectType: objectType,
+      roleName: groupBy,
       action: action,
       functionNameConfig,
     },
-setting: {
-  savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-    saveFileName: SAVE_FILE_NAME.functionPerActionYaml,
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      saveFileName: SAVE_FILE_NAME.functionPerActionYaml,
       fileExtension: '.yml',
-        isAppend: true
-}
+      isAppend: true
+    }
   }
 }
 

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

@@ -9,7 +9,7 @@
         cors: true
         #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>Authorizer#>
         #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>Authorizer#>
-  role: <%- firstLetterUpperCase(objectType) %>Role
+  role: <%- firstLetterUpperCase(roleName) %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

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

@@ -59,7 +59,10 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
+  // let objectType = objectSchema.objectType;
+
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = upperCase(objectType) + upperCase(action);
   let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionNameConfig = upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrDsq))
@@ -169,7 +172,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       handlerType: HANDLER.hdrDsq,
       additionalResourcePermission,
       functionNameConfig,
-      roleName: `${objectType}`,
+      roleName: objectType,
+      roleName: groupBy,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -61,7 +61,9 @@ function data(_izContext, objectSchema, srcPath) {
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
   let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let actionHandler = action;
   let functionName = upperCase(objectType) + upperCase(actionHandler);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -150,7 +152,9 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationPerAction,
       handlerType: HANDLER.hdrInv,
       additionalResourcePermission,
-      objectType,
+      objectType: objectType,
+      roleName: groupBy,
+
       // functionNameConfig: upperCase(objectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrInv))
       functionNameConfig: upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrInv)),
     },

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

@@ -2,7 +2,7 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
-  role: <%- firstLetterUpperCase(objectType) %>Role
+  role: <%- firstLetterUpperCase(roleName) %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

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

@@ -59,7 +59,9 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let actionHandler = action;
   let functionName = upperCase(objectType) + upperCase(actionHandler);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -173,7 +175,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
       additionalResourcePermission,
       functionNameConfig,
       objectType,
-      roleName: `${objectType}`,
+      roleName: groupBy,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -60,13 +60,17 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateSource(objectSchema, action, handler, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
+
   let functionName = objectType + firstLetterUpperCase(action);
   return {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
+      roleName: groupBy,
       action: action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
     },

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

@@ -59,7 +59,9 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateSourceHandlerGet(objectSchema, action, handler, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = objectType + upperCase(action);
   let queueName = objectType + firstLetterUpperCase(action) + upperCase(handler);
   return {
@@ -67,6 +69,7 @@ function createParamForCreateSourceHandlerGet(objectSchema, action, handler, src
     templateData: {
       functionName: functionName,
       objectType: objectType,
+      roleName: groupBy,
       queueName,
       action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),

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

@@ -61,13 +61,16 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateHandlerGet(objectSchema, action, handler, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = objectType + upperCase(action);
   return {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
+      roleName: groupBy,
       action: action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),
     },

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

@@ -59,7 +59,9 @@ function data(_izContext, objectSchema, srcPath) {
 
 
 function createParamForCreateSourceGetHandler(objectSchema, action, handler, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = objectType + firstLetterUpperCase(action);
   let queueName = functionName + upperCase(handler);
   return {
@@ -67,6 +69,7 @@ function createParamForCreateSourceGetHandler(objectSchema, action, handler, src
     templateData: {
       functionName: functionName,
       objectType: objectType,
+      roleName: groupBy,
       queueName,
       action,
       isCreateMainFunction: checkOverWriteGenerateMainFunction(objectSchema, action),

package/src/TemplateManager/src/PerActionEndpoint/MainFunction/Create/data.js

@@ -44,13 +44,16 @@ async function data(_izContext, objectSchema, srcPath) {
 }
 
 async function createParamForCreateSource(_izContext, objectSchema, action, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = objectType + upperCase(action);
   return {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
+      roleName: groupBy,
       actionHandler: action,
     },
     setting: {

package/src/TemplateManager/src/PerActionEndpoint/MainFunction/Delete/data.js

@@ -44,13 +44,16 @@ async function data(_izContext, objectSchema, srcPath) {
 }
 
 async function createParamForCreateSource(_izContext, objectSchema, action, srcPath) {
+  // let objectType = objectSchema.objectType;
   let objectType = objectSchema.objectType;
+  let groupBy = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionName = objectType + upperCase(action);
   return {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
       objectType: objectType,
+      roleName: groupBy,
       action: action
     },
     setting: {