@izara_project/izara-market-library-service-schemas 1.0.13 → 1.0.14

package/package.json

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

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -154,11 +154,11 @@ async function validateSchemaPerRecord(
 
     // if not pass validate will sent messsage to dlq and throw NoRetryError
     if (!validateStatus.pass) {
-      await messageToDlq(record, `Invalid: ${validateStatus.error}`, sqsSharedLib.sqsQueueUrlDLQ(lambdaFunctionName));
+      await messageToDlq(record, `Invalid: ${validateStatus.error}`, await sqsSharedLib.sqsQueueUrlDLQ(record._izContext, lambdaFunctionName));
       record._izError = new Error(validateStatus.error)
     }
   } catch (error) {
-    await messageToDlq(record, error.message, sqsSharedLib.sqsQueueUrlDLQ(lambdaFunctionName));
+    await messageToDlq(record, error.message, await sqsSharedLib.sqsQueueUrlDLQ(record._izContext, lambdaFunctionName));
     record._izError = new Error(error)
   }
 
@@ -176,7 +176,7 @@ async function sendMsgOutComplete(_izContext, topicName, messageObj, callingFlow
     let sendMessageOutComplete = {
       Message: JSON.stringify(messageObj),
       MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-      TopicArn: snsSharedLib.snsTopicArn(topicName),
+      TopicArn: await snsSharedLib.snsTopicArn(_izContext, topicName),
     };
 
     _izContext.logger.debug(`Send message to ${topicName} :`, sendMessageOutComplete);
@@ -214,7 +214,7 @@ async function messageToDlq(record, messageFailError, queueUrl) {
 
   record._izContext.logger.debug('messageToDlq, params before sending DLQ', params);
 
-  await sqs.sendMessage(record._izContext, params).promise();
+  sqs.sendMessage(record._izContext, params);
   record._izContext.logger.debug("----- messageToDlq sendMessage success -----");
 };
 

package/src/TemplateManager/src/GenerateCode.js

@@ -178,7 +178,7 @@ const createProcessLogicalPaginateFunctionYamlHdrDsq = require('./ProcessLogical
 const createProcessLogicalPaginateFunctionYamlHdrSqs = require('./ProcessLogicalPagination/FunctionYaml/HdrSqs/data')
 
 //get functionNameConfig
-const functionNameConfigFile = require('./externalService/FunctionNameConfig/data')
+const functionNameConfigYamldata = require('./externalService/FunctionNameConfig/data')
 
 //lib of generateCode
 const { checkValidTableYaml } = require('./libs/GenerateCodeUtils');
@@ -479,8 +479,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     }
     // console.log("createSourceParams templatePath in GenerateCode", createSourceParams.templatePath)
 
-    const createFunctionNameConfig = functionNameConfigFile(_izContext, createSourceParams, saveFilePath);
-    createSourceParams = createSourceParams.concat(createFunctionNameConfig);
+    const createFunctionNameConfig = functionNameConfigYamldata(_izContext, createSourceParams, saveFilePath);
+    createSourceParams = createSourceParams.concat(...createFunctionNameConfig);
 
     // delete file .yml before start to prevent confilct of data
     for (let folderPathToEmpty of Object.keys(GENERATECODE_SOURCE_PATH)) {

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

@@ -68,8 +68,8 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
       await validateSchemaPerRecord(
         record,
         "<%- functionName %><%- firstLetterUpperCase(handler) %>",
-        "OBJTYPE,
-        <%- action %>"
+        OBJTYPE,
+        "<%- action %>"
         //(<validateSchemaSetting>)
         //(</validateSchemaSetting>)
       )

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

@@ -40,7 +40,7 @@ async function data(_izContext, objectSchema, srcPath) {
 async function createMainFunctionUpdateEndpoint(_izContext, objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType
   let actionHandler = action;
-  let functionName = upperCase(objectType) + upperCase(actionHandler);
+  let functionName = (objectType) + upperCase(actionHandler);
   return {
     templatePath: templatePath,
     templateData: {

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

@@ -83,6 +83,8 @@ module.exports.<%- functionName %>Main = async (
     _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
+    let errorFounds = [];
+    
     _izContext.correlationIds.set(coreConsts.BASE_USER_ID, "BasDev");
     const userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID)
     if (!userId) {
@@ -115,7 +117,6 @@ module.exports.<%- functionName %>Main = async (
 
     let originTimestamp = Date.now();
 
-    let errorFounds = [];
 
     let messageAttributes
 
@@ -136,7 +137,7 @@ module.exports.<%- functionName %>Main = async (
 
       updateNodeCompleteMessage = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, updateNodeCompleteMessage);
       messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {})
-      
+
       let messageParams = {
         Message: JSON.stringify(updateNodeCompleteMessage),
         MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/functionYaml/HdrInv/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 { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../MainLibs/src/Utils")
-const { createIamRole, resourceNames, RESOURCE_CLASSES, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, SHORT_FUNCTION_NAME } = require("../../../../../libs/Consts");
+const { createIamRole, resourceNames, RESOURCE_CLASSES, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, SHORT_FUNCTION_NAME, shortNameHandler } = require("../../../../../libs/Consts");
 
 const templatePath = path.join(__dirname, './template.ejs')
 
@@ -68,7 +68,7 @@ function createParamForCreateSource(srcPath) {
       handlerType,
       additionalResourcePermission,
       resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
-      functionNameConfig: upperCase(SHORT_FUNCTION_NAME.deleteRel) + upperCase(handlerType)
+      functionNameConfig: upperCase(SHORT_FUNCTION_NAME.deleteRel) + upperCase(shortNameHandler(handlerType))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/mainFunction/template.ejs

@@ -60,7 +60,7 @@ const {
  *
  * @returns {object} description of return value
  */
-module.exports.<%- functionName %> = async (
+module.exports.deleteRelationship = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -70,15 +70,17 @@ module.exports.<%- functionName %> = async (
 
 
   try {
-    _izContext.logger.debug('createRelationship _izContext: ', _izContext);
-    _izContext.logger.debug('createRelationship requestParams: ', requestParams);
-    _izContext.logger.debug('createRelationship callingFlowConfig: ', callingFlowConfig);
+    _izContext.logger.debug('deleteRelationship _izContext: ', _izContext);
+    _izContext.logger.debug('deleteRelationship requestParams: ', requestParams);
+    _izContext.logger.debug('deleteRelationship callingFlowConfig: ', callingFlowConfig);
 
 
     const {
-      objects,
+      firstObject,
+      secondObject,
       relType,
-      relationshipProperties
+      relationshipProperties,
+      relationshipDirection
       //(<requestparamDeleteRel>)
       //(</requestparamDeleteRel>)
     } = requestParams;
@@ -114,8 +116,8 @@ module.exports.<%- functionName %> = async (
       }
     }
 
-    await validateIdentifiersExists(_izContext, objects[0].objType, objects[0].identifiers);
-    await validateIdentifiersExists(_izContext, objects[1].objType, objects[1].identifiers);
+    await validateIdentifiersExists(_izContext, firstObject.objType, firstObject.identifiers);
+    await validateIdentifiersExists(_izContext, secondObject.objType, secondObject.identifiers);
     // finished validate object and identifiers
 
     //(<afterValidateDeleteRel>)
@@ -136,8 +138,8 @@ module.exports.<%- functionName %> = async (
           const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
           const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
 
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = objects[0].objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = objects[1].objType;
+          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
+          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
 
           // find exists link
           if (
@@ -189,7 +191,7 @@ module.exports.<%- functionName %> = async (
       }
 
       // validate canCreate properties relationship
-      for (const [propName, propSetting] of Object.entries(relationshipSchema.properties)) {
+      for (const [propName, propSetting] of Object.entries(relationshipSchema.fieldNames)) {
         if (propSetting.requiredOnCreate === true) {
           if (!relationshipProperties.hasOwnProperty(propName)) {
             errorsFound.push(`Missing requiredOnCreate property:${propKey}`);
@@ -210,9 +212,11 @@ module.exports.<%- functionName %> = async (
     if (errorsFound.length) {
 
       let deleteRelCompleteMsg = {
-        objects: objects,
+        firstObject: firstObject,
+        secondObject: secondObject,
         relType: relType,
         relationshipProperties: relationshipProperties,
+        relationshipDirection: relationshipDirection,
         //(<inDeleteRelCompleteMsg>)
         //(</inDeleteRelCompleteMsg>)
         status: 'error',
@@ -241,7 +245,7 @@ module.exports.<%- functionName %> = async (
 
 
     // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(_izContext, [objects[0].objType, objects[1].objType], relType);
+    const linkTypeId = createLinkTypeId(_izContext, objects[0].objType, objects[1].objType, relType, relationshipDirection);
 
     let usedGraphServiceTag = []; // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
@@ -277,9 +281,11 @@ module.exports.<%- functionName %> = async (
 
       // prepare message body
       let deleteRelMessageBody = {
-        objects: objects,
+        firstObject: firstObject,
+        secondObject: secondObject,
         relType: relType,
-        relationshipProperties
+        relationshipProperties: relationshipProperties,
+        relationshipDirection: relationshipDirection,
         //(<inDeleteRelMessageBody>)
         //(</inDeleteRelMessageBody>)
       }
@@ -315,10 +321,12 @@ module.exports.<%- functionName %> = async (
     }
 
     return {
-      objects,
+      firstObject,
+      secondObject,
       relType,
       relationshipProperties,
-      errorFounds: errorsFound
+      relationshipDirection,
+      errorsFound
     };
 
 

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/perAction/HdrApi/template.ejs

@@ -27,31 +27,44 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      Items: {
-        type: "object",
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minproperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -67,6 +80,10 @@ let validatorSchema = {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };
@@ -94,7 +111,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
         objects: event.objects,
         relType: event.relType,
         relId: event.relId,
-        relationshipProperties: event.relationshipProperties
+        relationshipProperties: event.relationshipProperties,
+        relationshipDirection: event.relationshipDirection
       }
     );
 

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/perAction/HdrDsq/template.ejs

@@ -46,33 +46,46 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 ));
 
 // validate event params in middlewware before into function.
-let validatorSchema =  {
+let validatorSchema = {
   type: "object",
-  required: ["objects", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      Items: {
-        type: "object",
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minproperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -88,6 +101,10 @@ let validatorSchema =  {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/perAction/HdrInv/template.ejs

@@ -29,33 +29,46 @@ const callingFlowSharedLib = require('@izara_project/izara-shared/src/CallingFlo
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
 
 // validate event params in middlewware before into function.
-let validatorSchema =  {
+let validatorSchema = {
   type: "object",
-  required: ["objects", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      Items: {
-        type: "object",
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minproperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -71,6 +84,10 @@ let validatorSchema =  {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };
@@ -84,12 +101,13 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
 
   try {
     // invoke LambdaFunction
-    return await createRelationship.createRelationship(
+    return await <%- functionName %>.<%- functionName %>(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       {
         objects: event.objects,
         relType: event.relType,
         relationshipProperties: event.relationshipProperties,
+        relationshipDirection: event.relationshipDirection
       },
       callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/perAction/HdrSqs/template.ejs

@@ -30,33 +30,46 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 // validate event params in middleware before into function
-let validatorSchema =  {
+let validatorSchema = {
   type: "object",
-  required: ["objects", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      Items: {
-        type: "object",
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minproperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -72,11 +85,14 @@ let validatorSchema =  {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };
 
-
 //(<globalVarible>
   //</globalVarible>)
 

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/functionYaml/HdrApi/data.js

@@ -65,7 +65,7 @@ function createParamForCreateSource(srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.relationshipPerAction,
+      resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME.updateRel) + upperCase(shortNameHandler(handlerType))
     },
     setting: {

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/mainFunction/template.ejs

@@ -67,7 +67,7 @@ const {
  *
  * @returns {object} description of return value
  */
-module.exports.<%- functionName %> = async (
+module.exports.updateRelationship = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -83,10 +83,12 @@ module.exports.<%- functionName %> = async (
 
 
     const {
-      objects,
+      firstObject,
+      secondObject,
       relType,
       relId,
-      relationshipProperties
+      relationshipProperties,
+      relationshipDirection
       //(<requestparamUpdateRel>)
       //(</requestparamUpdateRel>)
     } = requestParams;
@@ -121,8 +123,8 @@ module.exports.<%- functionName %> = async (
       }
     }
 
-    await validateIdentifiersExists(_izContext, objects[0].objType, objects[0].identifiers);
-    await validateIdentifiersExists(_izContext, objects[1].objType, objects[1].identifiers);
+    await validateIdentifiersExists(_izContext, firstObject.objType, firstObject.identifiers);
+    await validateIdentifiersExists(_izContext, secondObject.objType, secondObject.identifiers);
     // finished validate object and identifiers
 
     //(<afterValidateUpdateRel>)
@@ -142,8 +144,8 @@ module.exports.<%- functionName %> = async (
           const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
           const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
 
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = objects[0].objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = objects[1].objType;
+          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
+          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
 
           // find exists link
           if (
@@ -210,8 +212,11 @@ module.exports.<%- functionName %> = async (
     if (errorsFound.length) {
 
       let updateCompleteMsg = {
+        firstObject: firstObject,
+        secondObject: secondObject,
         relId: relId,
         relType: relType,
+        relationshipDirection,
         status: 'error',
         errorFounds: errorsFound
         //(<inUpdateCompleteMsgUpdateRel>)
@@ -240,7 +245,7 @@ module.exports.<%- functionName %> = async (
 
 
     // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(_izContext, [objects[0].objType, objects[1].objType], relType);
+    const linkTypeId = createLinkTypeId(_izContext, firstObject.objType, secondObject.objType, relType, relationshipDirection);
 
     let usedGraphServiceTag = []; // collect used graph serviceName, use to check duplicate graph serviceName across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
@@ -276,10 +281,12 @@ module.exports.<%- functionName %> = async (
 
       // prepare message body
       let updateRelMessageBody = {
-        objects: objects,
+        firstObject,
+        secondObject,
         relId,
         relType: relType,
-        relationshipProperties
+        relationshipProperties,
+        relationshipDirection
         //(<inUpdateRelMessageBodyUpdateRel>)
         //(</inUpdateRelMessageBodyUpdateRel>)
       }
@@ -318,9 +325,12 @@ module.exports.<%- functionName %> = async (
     }
 
     return {
+      firstObject,
+      secondObject,
       relId: relId,
       relType: relType,
-      errorFounds: errorsFound
+      relationshipDirection,
+      errorsFound
     };
 
   } catch (err) {

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/perAction/HdrApi/template.ejs

@@ -27,31 +27,44 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relId", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      Items: {
-        type: "object",
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minproperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -68,6 +81,10 @@ let validatorSchema = {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/perAction/HdrDsq/template.ejs

@@ -47,31 +47,44 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relId", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      items: {
-        type: 'object',
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minProperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -81,14 +94,18 @@ let validatorSchema = {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
           enum: [process.env.iz_serviceTag]
-        },
+        }
       }
     },
     relId: izara.validatorSchema.stringNotEmpty(),
     relationshipProperties: {
-      type: 'object',
-      minProperties: 1,
+      type: "object",
+      minProperties: 1
     },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
+    }
   }
 };
 

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/perAction/HdrInv/template.ejs

@@ -29,31 +29,44 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middlewware before into function.
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relId", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      items: {
-        type: 'object',
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minProperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -63,14 +76,18 @@ let validatorSchema = {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
           enum: [process.env.iz_serviceTag]
-        },
+        }
       }
     },
     relId: izara.validatorSchema.stringNotEmpty(),
     relationshipProperties: {
-      type: 'object',
-      minProperties: 1,
+      type: "object",
+      minProperties: 1
     },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
+    }
   }
 };
 

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/perAction/HdrSqs/template.ejs

@@ -32,31 +32,44 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relId", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      items: {
-        type: 'object',
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minProperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -66,14 +79,18 @@ let validatorSchema = {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
           enum: [process.env.iz_serviceTag]
-        },
+        }
       }
     },
     relId: izara.validatorSchema.stringNotEmpty(),
     relationshipProperties: {
-      type: 'object',
-      minProperties: 1,
+      type: "object",
+      minProperties: 1
     },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
+    }
   }
 };
 

package/src/TemplateManager/src/externalService/FunctionNameConfig/data.js

@@ -21,30 +21,63 @@ const fs = require('fs');
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
 const { SOURCE_PATH } = require('../../libs/Consts');
-const templatePath = path.join(__dirname, "./template.ejs");
+const templateYamlPath = path.join(__dirname, "./templateYaml.ejs");
+const templatePathIntTestPath = path.join(__dirname, "./templateIntTesting.ejs");
 
 
 function data(_izContext, createSourceParams, srcPath) {
   // console.log("createSourceParams in Data", createSourceParams);
   const functionNameConfigs = new Set();
+  let createFunctionNameConfig = []
   for (let { templatePath, templateData, setting } of createSourceParams) {
     if (templateData.functionNameConfig !== undefined) {
       functionNameConfigs.add(templateData.functionNameConfig)
     }
   }
+  let createFunctionNameConfigYaml = createFunctionNameConfigFileYaml(functionNameConfigs, srcPath);
+  let createFunctionNameConfigJs = createFunctionNameConfigFileJs(functionNameConfigs, srcPath);
+  createFunctionNameConfig.push(...createFunctionNameConfigYaml, ...createFunctionNameConfigJs)
+  return createFunctionNameConfig
 
-  return {
-    templatePath: templatePath,
-    templateData: {
-      functionNameConfigs: functionNameConfigs
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: "FunctionNameConfig",
-      fileExtension: ".yml",
-      isAppend: true
+}
+
+function createFunctionNameConfigFileYaml(functionNameConfigs, srcPath) {
+  let createFunctionNameConfigYaml = []
+  createFunctionNameConfigYaml.push(
+    {
+      templatePath: templateYamlPath,
+      templateData: {
+        functionNameConfigs: functionNameConfigs
+      },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+        saveFileName: "FunctionNameConfig",
+        fileExtension: ".yml",
+        isAppend: true
+      }
     }
-  }
+  )
+  return createFunctionNameConfigYaml
+}
+
+function createFunctionNameConfigFileJs(functionNameConfigs, srcPath) {
+  let createFunctionNameConfigJs = []
+  createFunctionNameConfigJs.push(
+    {
+      templatePath: templatePathIntTestPath,
+      templateData: {
+        functionNameConfigs: functionNameConfigs
+      },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.externalService),
+        saveFileName: "FunctionNameConfig",
+        fileExtension: ".js",
+        isAppend: true
+      }
+    }
+  )
+
+  return createFunctionNameConfigJs
 }
 
 module.exports = data;

package/src/TemplateManager/src/externalService/FunctionNameConfig/templateIntTesting.ejs

@@ -0,0 +1,31 @@
+/*
+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';
+
+module.exports.generatedIntTestFunctionNameConfig = () => {
+let functionNameConfigIntTest = [
+  <% functionNameConfigs.forEach(functionNameConfig => { _%>
+    "<%- firstLetterUpperCase(functionNameConfig) %>",
+    <% }) _%>
+    ]
+    return functionNameConfigIntTest
+  }
+
+<%_function firstLetterUpperCase(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} %>

package/src/TemplateManager/src/externalService/FunctionNameConfig/templateYaml.ejs

@@ -0,0 +1,10 @@
+# for createIamRole
+
+<% functionNameConfigs.forEach(functionNameConfig => { _%>
+- ${self:custom.iz_prefixIamRole}<%- firstLetterUpperCase(functionNameConfig) %>${self:custom.iz_suffixIamRole}
+<% }) _%>
+
+
+<%_function firstLetterUpperCase(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} %>

package/src/TemplateManager/src/externalService/LambdaRole/data.js

@@ -20,7 +20,9 @@ const path = require('path');
 const fs = require('fs');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { getGraphServiceNameFromGraphServerTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
+const { getGraphServiceNameFromGraphServerTagWithCache,
+  getGraphServiceTagWithCache
+} = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, renameObjectType } = require("../../../../MainLibs/src/Utils")
 const {
@@ -87,15 +89,12 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
 
     // ... another external lambda role data
 
-    // processTranslateId Request
-    const externalLambdaIamRoleTranslateId = await externalLambdaIamRoleDataTranslateId(_izContext, allRelSchemas, allObjSchemas)
-    externalLambdaIamRoleTranslateId && externalLambdaIamRoleArray.push(externalLambdaIamRoleTranslateId)
-
+    // ProcessLogical
     const externalLambdaIamRoleProcessLogical = await externalLambdaIamRoleDataProcessLogical(_izContext, allObjSchemas);
     externalLambdaIamRoleProcessLogical && externalLambdaIamRoleArray.push(externalLambdaIamRoleProcessLogical)
   }
 
-
+  console.log("externalLambdaIamRoleArray", externalLambdaIamRoleArray)
   // console.log("createSourceArrayIamRole", JSON.stringify(externalLambdaIamRoleArray))
   // return externalLambdaIamRoleArray
 
@@ -117,7 +116,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, objectSchema, acti
   const graphServiceNames = [];
   for (const storgaeResource of Object.values(objectSchema.storageResources)) {
     if (storgaeResource.storageType === STORAGE_TYPES.graph) {
-      let getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storgaeResource.graphServerTag)
+      let getGraphServiceName = await getGraphServiceTagWithCache(_izContext, storgaeResource.graphServerTag)
       if (!graphServiceNames.includes(getGraphServiceName)) {
         getGraphServiceName && graphServiceNames.push(getGraphServiceName)
       }
@@ -241,52 +240,17 @@ async function externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, all
 
 // delete Relationship
 async function externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, allRelSchemas, handler) {
-  // const functionName = upperCase(FUNCTION_NAME.deleteRel) + upperCase(handler)
-  // const additionalResourcePermission = [];
-  // const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
-
-  // additionalResourcePermission.push(
-  //   createIamRole(
-  //     {
-  //       [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
-  //     },
-  //     graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-  //       externalResourceSns("InDeleteRelationship", graphServiceName)
-  //     )
-  //   )
-  // )
-  // return {
-  //   functionName,
-  //   additionalResourcePermission
-  // }
-}
-
-// Process TranslateIds Request
-async function externalLambdaIamRoleDataTranslateId(_izContext, allRelSchemas, allObjSchemas) {
-  let functionName = upperCase(SHORT_FUNCTION_NAME.translateIdsProcess) + upperCase(shortNameHandler(HANDLER.hdrDsq));
+  const functionName = upperCase(SHORT_FUNCTION_NAME.deleteRel) + upperCase(shortNameHandler(handler))
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
-  let complexFilterServiceTags = getComplexFilterServiceTag(allObjSchemas);
 
   additionalResourcePermission.push(
     createIamRole(
       {
-        [RESOURCE_CLASSES.lambda]: [LAMBDA_RESOURCE.invokeFunction]
-      },
-      graphServiceNamesFromAllRelSchemas.map(graphServiceName => (
-        externalResourceName(RESOURCE_CLASSES.lambda, "GetNodeAndRelationshipsV2HdrInv", graphServiceName)
-      )
-      )
-    )
-  )
-  additionalResourcePermission.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.query]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
-      complexFilterServiceTags.map(complexFilterServiceTag => (
-        externalResourceName(RESOURCE_CLASSES.dynamoDbTable, "FilterData", complexFilterServiceTag)
-      )
+      graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
+        externalResourceSns("InDeleteRelationship", graphServiceName)
       )
     )
   )

package/src/TemplateManager/src/libs/Consts.js

@@ -23,7 +23,7 @@ const {
   STORAGE_TYPES
 } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
-const { getGraphServiceNameFromGraphServerTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
+const { getGraphServiceNameFromGraphServerTagWithCache, getGraphServiceTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
 
 const DEFAULT_HANDLER_PER_ACTION = {
   [ACTIONS.create]: [HANDLER.hdrApi, HANDLER.hdrSqs],
@@ -219,7 +219,7 @@ const getGraphServiceNameFromAllRelSchema = async (_izContext, allRelSchemas) =>
 
     await Promise.all(Object.values(relSchemaData.storageResources).map(async storageResource => {
       if (storageResource.storageType === STORAGE_TYPES.graph) {
-        const getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storageResource.graphServerTag);
+        const getGraphServiceName = await getGraphServiceTagWithCache(_izContext, storageResource.graphServerTag);
         graphServiceNameSet.add(getGraphServiceName)
       }
     }))
@@ -272,7 +272,7 @@ async function getGraphServiceNameFromObjectSchema(_izContext, allObjSchemas) {
   for (const objectSchema of allObjSchemas) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.graph) {
-        let getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storageResource.graphServerTag)
+        let getGraphServiceName = await getGraphServiceTagWithCache(_izContext, storageResource.graphServerTag)
         graphServiceName.add(getGraphServiceName)
       }
     }