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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/GenerateCodeLibs/src/Consts.js

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

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -733,46 +733,92 @@ async function createDataDetailsLib(
   for (let [keyFieldName, settingFieldName] of Object.entries(objectSchemas.fieldNames)) {
     // _izContext.logger.debug("Loop fieldNamesObjectSchemas", { keyFieldName });
 
-    // check fiend is identifier
+    // check field is identifier
     if (objectSchemas.identifierFieldNames.includes(keyFieldName)) {
+
+      if (Object.keys(objectSchemas.fieldNames).length == 1) {
+
+        for (const storageIdentifiers of settingFieldName.storageResourceTags) {
+          _izContext.logger.debug("case only 1 fieldNames identifiers in ObjectSchema")
+          if (storageResources[storageIdentifiers].storageType === consts.STORAGE_TYPES.dynamoDB) {
+            if (createDataDetails.hasOwnProperty(storageIdentifiers)) {
+              _izContext.logger.debug("same table")
+              createDataDetails[storageIdentifiers].fieldNames.push(keyFieldName);
+            } else {
+              _izContext.logger.debug("new table")
+              Object.assign(createDataDetails, {
+                [storageResources[storageIdentifiers]]: {
+                  storageType: consts.STORAGE_TYPES.dynamoDB,
+                  tableName: storageResources[storageIdentifiers].tableName,
+                  fieldNames: [keyFieldName]
+                }
+              })
+              if (storageResources[storageIdentifiers].hasOwnProperty("groupByPartitionKeyField")) {
+                Object.assign(createDataDetails[storageIdentifiers], {
+                  groupByPartitionKeyField: storageResources[storageIdentifiers].groupByPartitionKeyField
+                })
+              }
+            }
+          } else if (storageResources[storageIdentifiers].storageType === consts.STORAGE_TYPES.graph) {
+            let getGraphServerTag = await serviceConfig.getGraphServiceTag(
+              _izContext,
+              storageResources[storageIdentifiers].graphServerTag
+            );
+            if (getGraphServerTag) {
+              if (createDataDetails.hasOwnProperty(getGraphServerTag)) {
+                createDataDetails[getGraphServerTag].fieldNames.push(keyFieldName)
+              } else {
+                Object.assign(createDataDetails, {
+                  [getGraphServerTag]: {
+                    storageType: consts.STORAGE_TYPES.graph,
+                    fieldNames: [keyFieldName]
+                  }
+                })
+              }
+            }
+          }
+        }
+      } else {
+        continue
+      }
       continue
     };
+    _izContext.logger.debug("case multiple fieldName");
     // validate storageResourceTags.
     _izContext.logger.debug("storageResourceTags is", settingFieldName.storageResourceTags);
 
-    for (let eachStorageResourceTags of settingFieldName.storageResourceTags) {
-      _izContext.logger.debug("Loop eachStorageResourceTags", eachStorageResourceTags);
+    for (let eachStorageResourceTag of settingFieldName.storageResourceTags) {
+      _izContext.logger.debug("Loop eachStorageResourceTags", eachStorageResourceTag);
 
-      if (!storageResources.hasOwnProperty(eachStorageResourceTags)) {
+      if (!storageResources.hasOwnProperty(eachStorageResourceTag)) {
         throw new Error("storageResources is'n exist"); // should be validata in step uplode in s3
       } else {
-
-        if (storageResources[eachStorageResourceTags].storageType == consts.STORAGE_TYPES.dynamoDB) {
-          if (createDataDetails.hasOwnProperty(eachStorageResourceTags)) {
-            _izContext.logger.debug("SAME STG DB", eachStorageResourceTags);
-            createDataDetails[eachStorageResourceTags].fieldNames.push(keyFieldName);
+        if (storageResources[eachStorageResourceTag].storageType == consts.STORAGE_TYPES.dynamoDB) {
+          if (createDataDetails.hasOwnProperty(eachStorageResourceTag)) {
+            _izContext.logger.debug("SAME STG DB", eachStorageResourceTag);
+            createDataDetails[eachStorageResourceTag].fieldNames.push(keyFieldName);
 
           } else {
-            _izContext.logger.debug("NEW STG DB", eachStorageResourceTags);
+            _izContext.logger.debug("NEW STG DB", eachStorageResourceTag);
             Object.assign(createDataDetails, {
-              [eachStorageResourceTags]: {
+              [eachStorageResourceTag]: {
                 storageType: consts.STORAGE_TYPES.dynamoDB,
-                tableName: storageResources[eachStorageResourceTags].tableName,
+                tableName: storageResources[eachStorageResourceTag].tableName,
                 fieldNames: [keyFieldName]
               }
             });
 
-            if (storageResources[eachStorageResourceTags].hasOwnProperty("groupByPartitionKeyField")) {
-              Object.assign(createDataDetails[eachStorageResourceTags], {
-                groupByPartitionKeyField: storageResources[eachStorageResourceTags].groupByPartitionKeyField
+            if (storageResources[eachStorageResourceTag].hasOwnProperty("groupByPartitionKeyField")) {
+              Object.assign(createDataDetails[eachStorageResourceTag], {
+                groupByPartitionKeyField: storageResources[eachStorageResourceTag].groupByPartitionKeyField
               });
             }
           }
 
-        } else if (storageResources[eachStorageResourceTags].storageType == consts.STORAGE_TYPES.graph) {
+        } else if (storageResources[eachStorageResourceTag].storageType == consts.STORAGE_TYPES.graph) {
           let checkGraphServerTags = await serviceConfig.getGraphServiceTag(
             _izContext,
-            storageResources[eachStorageResourceTags].graphServerTag
+            storageResources[eachStorageResourceTag].graphServerTag
           );
           if (checkGraphServerTags) {
             if (createDataDetails.hasOwnProperty(checkGraphServerTags)) {

package/src/TemplateManager/src/FindData/mainFunction/template.ejs

@@ -87,13 +87,6 @@ exports.findData = async (
       return; // stop process
     };
 
-    let identifiersObject = await identifierObj.concatIdentifiersObjectFromIdentifiersObject(
-      _izContext,
-      objType,
-      identifiers
-    );
-    _izContext.logger.debug("create identifiersObject from identifiers: ", identifiersObject) // object
-
     let errorsFound = [];
 
     let standardErrorParams = [

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

@@ -22,7 +22,7 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 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, externalResourceName, getGraphServiceNameFromAllRelSchema, FUNCTION_NAME, SAVE_FILE_NAME, getGraphServiceNameFromObjectSchema, defaultIamRolePerAction, SQS_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, awaitingMultipleStepsRole } = require("../../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SOURCE_PATH, externalResourceName, getGraphServiceNameFromAllRelSchema, FUNCTION_NAME, SAVE_FILE_NAME, getGraphServiceNameFromObjectSchema, defaultIamRolePerAction, SQS_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, awaitingMultipleStepsRole, SHORT_FUNCTION_NAME } = require("../../../libs/Consts");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -33,8 +33,8 @@ function data(_izContext, srcPath) {
 function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectComplete)
   let additionalResourcePermission = defaultIamRolePerAction();
-  let awaitingTables = ["AwaitingMultipleSteps", "AwaitingMultipleStepByPending"]
   let handlerType = upperCase(HANDLER.hdrSqs)
+  let functionNameConfig = upperCase(SHORT_FUNCTION_NAME.createObjectComplete)
 
   additionalResourcePermission.push(
     createIamRole(
@@ -70,7 +70,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete
+      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete,
+      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
   events:

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

@@ -39,7 +39,6 @@ function data(_izContext, srcPath) {
 
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.createObjectComplete;
-  let functionNameConfig = upperCase(functionName)
 
   return {
     templatePath: templatePath,
@@ -47,7 +46,6 @@ function createParamForCreateSource(srcPath) {
       functionName,
       queueName: upperCase(functionName),
       functionName,
-      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),

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

@@ -62,8 +62,6 @@ module.exports.createObjectComplete = async (
       passBackProperties,
     });
 
-    let errorFounds = [];
-
     if (_.isEmpty(returnValue)) {
       _izContext.logger.debug("message callingFlowProperties is empty");
       throw new NoRetryError("message not an object")
@@ -97,10 +95,10 @@ module.exports.createObjectComplete = async (
       errorFounds = errorFounds.concat(errorsFound);
     };
 
-    let awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId((hash(
-      {
+    let awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
+      (hash({
         objType: returnValue.objType,
-        graphServiceTag: graphServiceTag,
+        graphServerTag: graphServiceTag,
         identifiers: returnValue.objInstanceFull.identifiers
       })),
       PREFIX.CREATE_OBJECT_ASYNC
@@ -146,7 +144,7 @@ module.exports.createObjectComplete = async (
     let messageObject = {
       objType: returnValue.objType,
       objInstanceFull: returnValue.objInstanceFull,
-      errorFounds: errorFounds
+      errorsFound: errorsFound
     };
 
     messageObject = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, messageObject)
@@ -160,6 +158,11 @@ module.exports.createObjectComplete = async (
     _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
     await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
 
+    return {
+      objType: returnValue.objType,
+      objInstanceFull: returnValue.objInstanceFull,
+      errorsFound: errorsFound
+    }
 
   } catch (err) {
     throw (err)

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

@@ -22,7 +22,7 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 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, externalResourceName, getGraphServiceNameFromAllRelSchema, FUNCTION_NAME, SAVE_FILE_NAME, getGraphServiceNameFromObjectSchema, defaultIamRolePerAction, SQS_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE } = require("../../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SOURCE_PATH, externalResourceName, getGraphServiceNameFromAllRelSchema, FUNCTION_NAME, SAVE_FILE_NAME, getGraphServiceNameFromObjectSchema, defaultIamRolePerAction, SQS_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, SHORT_FUNCTION_NAME } = require("../../../libs/Consts");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -32,8 +32,8 @@ function data(_izContext, srcPath) {
 
 function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.deleteNodeComplete)
+  let functionNameConfig = upperCase(SHORT_FUNCTION_NAME.deleteNodeComplete)
   let additionalResourcePermission = defaultIamRolePerAction();
-  let awaitingTables = ["AwaitingMultipleSteps", "AwaitingMultipleStepByPending"]
   let handlerType = upperCase(HANDLER.hdrSqs)
 
   additionalResourcePermission.push(
@@ -67,7 +67,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete
+      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete,
+      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
   events:

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

@@ -39,7 +39,6 @@ function data(_izContext, srcPath) {
 
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.deleteNodeComplete;
-  let functionNameConfig = upperCase(functionName)
 
   return {
     templatePath: templatePath,
@@ -47,7 +46,6 @@ function createParamForCreateSource(srcPath) {
       functionName,
       queueName: upperCase(functionName),
       functionName,
-      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),

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

@@ -79,8 +79,11 @@ module.exports.deleteNodeComplete = async (
     _izContext.logger.debug("Send Message to DeleteNodeComplete::", sendMessageToOutUpdateNodeComplete);
     await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
-
-    return { returnValue: 'Function:DeleteNodeComplete' };
+    return {
+      objType: returnValue.objType,
+      objInstanceFull: returnValue.objInstanceFull,
+      errorsFound: errorsFound
+    }
 
   }
   catch (err) {

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

@@ -22,7 +22,7 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 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, externalResourceName, getGraphServiceNameFromAllRelSchema, FUNCTION_NAME, SAVE_FILE_NAME, getGraphServiceNameFromObjectSchema, defaultIamRolePerAction, SQS_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, awaitingMultipleStepsRole } = require("../../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SOURCE_PATH, externalResourceName, getGraphServiceNameFromAllRelSchema, FUNCTION_NAME, SAVE_FILE_NAME, getGraphServiceNameFromObjectSchema, defaultIamRolePerAction, SQS_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, awaitingMultipleStepsRole, SHORT_FUNCTION_NAME } = require("../../../libs/Consts");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -32,6 +32,7 @@ function data(_izContext, srcPath) {
 
 function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.updateNodeComplete)
+  let functionNameConfig = upperCase(SHORT_FUNCTION_NAME.updateNodeComplete)
   let additionalResourcePermission = defaultIamRolePerAction();
   let handlerType = upperCase(HANDLER.hdrSqs)
 
@@ -69,7 +70,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete
+      resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete,
+      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
   events:

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

@@ -39,7 +39,6 @@ function data(_izContext, srcPath) {
 
 function createParamForCreateSource(srcPath) {
   const functionName = FUNCTION_NAME.updateNodeComplete;
-  let functionNameConfig = upperCase(functionName)
 
   return {
     templatePath: templatePath,
@@ -47,7 +46,6 @@ function createParamForCreateSource(srcPath) {
       functionName,
       queueName: upperCase(functionName),
       functionName,
-      functionNameConfig
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.outPerActionComplete),

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

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

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

@@ -61,7 +61,7 @@ function data(_izContext, objectSchema, srcPath) {
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType
-  let functionName = objectType + upperCase(action);
+  let functionName = upperCase(objectType) + upperCase(action);
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
   let hasGraphStorage = false;

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

@@ -62,7 +62,7 @@ function data(_izContext, objectSchema, srcPath) {
 
 function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
-  let functionName = objectType + upperCase(action);
+  let functionName = upperCase(objectType) + upperCase(action);
   let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let functionNameConfig = upperCase(functionNameObjectType) + upperCase(action) + upperCase(shortNameHandler(HANDLER.hdrDsq))
   console.log("functionNameConfigInFunctionYamlHdrDsq", functionNameConfig)

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

@@ -64,7 +64,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let functionNameObjectType = objectSchema?.shortNameObjectType ? objectSchema.shortNameObjectType : objectSchema.objectType;
   let objectType = objectSchema.objectType;
   let actionHandler = action;
-  let functionName = objectType + upperCase(actionHandler);
+  let functionName = upperCase(objectType) + upperCase(actionHandler);
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
 

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

@@ -62,7 +62,7 @@ function data(_izContext, objectSchema, srcPath) {
 function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
   let actionHandler = action;
-  let functionName = objectType + upperCase(actionHandler);
+  let functionName = upperCase(objectType) + upperCase(actionHandler);
   let additionalResourcePermission = defaultIamRolePerAction();
   let tableForGetItem = [];
   let hasGraphStorage = false;
@@ -108,8 +108,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
           SQS_RESOURCE.getQueueUrl
         ], [RESOURCE_CLASSES.sns]: ["Publish", "Subscribe"]
     }, [
-      resourceNames(RESOURCE_CLASSES.sqs, functionName),
-      resourceNames(RESOURCE_CLASSES.sqs, functionName + "DLQ"),
+      resourceNames(RESOURCE_CLASSES.sqs, functionName + upperCase(HANDLER.hdrSqs)),
+      resourceNames(RESOURCE_CLASSES.sqs, functionName + upperCase(HANDLER.hdrSqs) + "DLQ"),
       resourceNames(RESOURCE_CLASSES.sns, "In" + functionName),
       resourceNames(RESOURCE_CLASSES.sns, "Out" + functionName)
     ]

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

@@ -67,7 +67,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
 
       await validateSchemaPerRecord(
         record,
-        <%- functionName %>,
+        "<%- functionName %><%- firstLetterUpperCase(handler) %>",
         "OBJTYPE,
         <%- action %>"
         //(<validateSchemaSetting>)
@@ -79,7 +79,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
         /*
         await recordHandlerSharedLib.validateRecord(
           record,
-          <%- functionName %>,
+          "<%- functionName %><%- firstLetterUpperCase(handler) %>",
           perRecordsValidatorSchema
         );
         */
@@ -118,3 +118,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
   }
 }
 )
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>

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

@@ -67,7 +67,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
 
       await validateSchemaPerRecord(
         record,
-        <%- functionName %>,
+        "<%- functionName %><%- firstLetterUpperCase(handler) %>",
         OBJTYPE,
         "<%- action %>"
         //(<validateSchemaSetting>)
@@ -79,7 +79,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
         /*
         await recordHandlerSharedLib.validateRecord(
           record,
-          <%- functionName %>,
+          "<%- functionName %><%- firstLetterUpperCase(handler) %>",
           perRecordsValidatorSchema
         );
           */

package/src/TemplateManager/src/PerActionEndpoint/MainFunction/Create/template.ejs

@@ -58,6 +58,7 @@ const PREFIX = {
 const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER, GRAPH_HANDLER_SERVICE_NAME } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const { createDataDetailsLib } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
 const { createLinkTypeId } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
+const { findLinksByObjTypes } = require("@izara_project/izara-core-library-service-schemas/src/libs/RelSchemaLib")
 
 /**
   - all storageType( DB and Graph) use objInstance({identifiers,fields})
@@ -104,6 +105,7 @@ module.exports.<%- functionName %>Main = async (
     const SERVICE_TAG = process.env.iz_serviceTag;
     //(<beforeQuery>)
     //(</beforeQuery>)
+
     const MAIN_OBJTYPE = {
       objectType: OBJECT_TYPE,
       serviceTag: SERVICE_TAG
@@ -124,11 +126,14 @@ module.exports.<%- functionName %>Main = async (
     let createDataDetails = await createDataDetailsLib(_izContext, objectSchemas);
     _izContext.logger.debug("createDataDetails is =", createDataDetails);
 
+    let checkCorrectLinks = [];
+
     //validate linkType
     if ((requestParams.hasOwnProperty("relationships")) && (requestParams.relationships.length > 0)) {
 
       for (let relationshipProperties of requestParams.relationships) {
-        _izContext.logger.debug("relType", relationshipProperties.relType)
+        _izContext.logger.debug("relationshipProperties", relationshipProperties);
+        _izContext.logger.debug("relType", relationshipProperties.relType);
         let getObjectRelationship = await getObjectSchema.getRelationshipSchemaWithCache(
           _izContext,
           relationshipProperties.relType
@@ -142,6 +147,40 @@ module.exports.<%- functionName %>Main = async (
             }
           }
         }
+        const links = await findLinksByObjTypes(_izContext, [MAIN_OBJTYPE, relationshipProperties.targetObjType], getObjectRelationship.links);
+        _izContext.logger.debug("links", links)
+
+        if (!links.length) {
+          errorsFound.push(`not found link between ${JSON.stringify({ mainObjType: MAIN_OBJTYPE })} and ${JSON.stringify({ toObjType: relationshipProperties.targetObjType })} `)
+        }
+
+        for (let link of links) {
+          const { serviceTag: fromServiceTag, objectType: fromObjectType } = MAIN_OBJTYPE;
+          const { serviceTag: toServiceTag, objectType: toObjectType } = relationshipProperties.targetObjType
+
+          const { serviceTag: firstServiceTag, objectType: firstObjectType } = link.from.objType;
+          const { serviceTag: secondServiceTag, objectType: secondObjectType } = link.to.objType
+
+          const matchesFromTo =
+            fromServiceTag === firstServiceTag && fromObjectType === firstObjectType
+            && toServiceTag === secondServiceTag && toObjectType === secondObjectType;
+
+          const matchesToFrom =
+            fromServiceTag === secondServiceTag && fromObjectType === secondObjectType
+            && toServiceTag === firstServiceTag && toObjectType === firstObjectType
+
+          if ((relationshipProperties.relationshipDirection === "from" && matchesFromTo) ||
+            (relationshipProperties.relationshipDirection === "to" && matchesToFrom)) {
+            checkCorrectLinks.push(true)
+          } else {
+            checkCorrectLinks.push(false)
+          }
+        }
+      }
+    }
+    for (const [index, checkCorrectLink] of checkCorrectLinks.entries()) {
+      if (checkCorrectLink === false) {
+        errorsFound.push(`relationship direction ${JSON.stringify(requestParams.relationships[index])} is invalid`)
       }
     }
 
@@ -151,6 +190,7 @@ module.exports.<%- functionName %>Main = async (
     let objectRelationshipSchema = await getObjectSchema.getRequiredOnCreateLinksWithCache(_izContext, MAIN_OBJTYPE);
     _izContext.logger.debug("objectRelationshipSchema", objectRelationshipSchema);
 
+    // validate requiredOnCreateLinks
     let filteredRequiredOnCreatedLinks = [];
 
     await Promise.all(
@@ -181,9 +221,8 @@ module.exports.<%- functionName %>Main = async (
       for (const requireLink of filteredRequiredOnCreatedLinks) {
         const requiredOnCreateLinkTypeId = createLinkTypeId(
           _izContext,
-          [
-            MAIN_OBJTYPE, requireLink.other.objType
-          ],
+          MAIN_OBJTYPE,
+          requireLink.other.objType,
           requireLink.relType
         );
 
@@ -195,9 +234,8 @@ module.exports.<%- functionName %>Main = async (
       for (const createRelationship of requestParams.relationships) {
         const onCreateLinkTypeId = createLinkTypeId(
           _izContext,
-          [
-            MAIN_OBJTYPE, createRelationship.targetObjType
-          ],
+          MAIN_OBJTYPE,
+          createRelationship.targetObjType,
           createRelationship.relType
         );
 
@@ -226,6 +264,7 @@ module.exports.<%- functionName %>Main = async (
     }
     _izContext.logger.debug("createLinkTypeIds", createLinkTypeIds);
     _izContext.logger.debug("requiredOnCreateLinks", requiredOnCreateLinks);
+    // end validate
 
     let objInstanceFull = {
       identifiers: {},
@@ -393,7 +432,7 @@ module.exports.<%- functionName %>Main = async (
           _izContext.logger.debug("::::::Graphanler::::::", { storageTag, objInstanceFull });
 
           // allStorageTagComplete = false;
-          allAwaitingStepsId.push(asyncFlowSharedLib.createAwaitingStepId(
+          allAwaitingStepsId.push(await asyncFlowSharedLib.createAwaitingStepId(
             (hash({
               objType: MAIN_OBJTYPE,
               graphServerTag: storageTag,

package/src/TemplateManager/src/ProcessLogical/ProcessLogicalYaml/data.js

@@ -26,7 +26,7 @@ const serviceConfig = serviceSchemas.serviceConfig;
 
 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, LAMBDA_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, defaultIamRolePerAction, shortNameHandler } = require("../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, LAMBDA_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, SNS_RESOURCE, defaultIamRolePerAction, shortNameHandler, SHORT_FUNCTION_NAME } = require("../../libs/Consts");
 
 /**
  * receive objectSchema
@@ -130,7 +130,7 @@ async function data(_izContext, objectSchemas, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationProcessLogical,
       handlerType: HANDLER.hdrSqs,
       additionalResourcePermission,
-      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrSqs))
+      functionNameConfig: upperCase(SHORT_FUNCTION_NAME.processLogical) + upperCase(shortNameHandler(HANDLER.hdrSqs))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),