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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.12",
+  "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

@@ -160,22 +160,6 @@ const createDeleteRelationshipCompleteHandler = require('./RelationshipPerAction
 const createDeleteRelationshipCompleteSnsAndSqs = require('./RelationshipPerAction/DeleteRelationship/DeleteRelationshipComplete/sns-in-sqs/data');
 const createDeleteRelationshipCompleteSnsOut = require('./RelationshipPerAction/DeleteRelationship/DeleteRelationshipComplete/sns-out/data');
 
-// TranslateIdRequest
-const createTranslateIdsCacheMainTable = require('./TranslateIdReq/TranslateIds/resourceYaml/dynamoDb/data');
-const createTranslateIdsRequestMainFunction = require('./TranslateIdReq/TranslateIds/mainFunction/data');
-const createTranslateIdsHandlerDsq = require('./TranslateIdReq/TranslateIds/handler/HdrDsq/data');
-const createTranslateIdsHandlerSqs = require('./TranslateIdReq/TranslateIds/handler/HdrSqs/data');
-const createTranslateIdFunctionYamlHdrDsq = require('./TranslateIdReq/TranslateIds/functionYaml/HdrDsq/data');
-const createTranslateIdFunctionYamlHdrSqs = require('./TranslateIdReq/TranslateIds/functionYaml/HdrSqs/data');
-const createSnsAndSqsTranslateId = require('./TranslateIdReq/TranslateIds/resourceYaml/sns-sqs/data');
-
-
-// processTranslateIds
-const createProcessTranslateIdsCompleteSnsOut = require('./TranslateIdReq/ProcessingTranslateIds/sns-out/data');
-const createTranslateIdsProcessSnsQueue = require('./TranslateIdReq/ProcessingTranslateIds/sqs-sns/data');
-const createTranslateIdsProcessFunctionYaml = require('./TranslateIdReq/ProcessingTranslateIds/functionYaml/data');
-const createTranslateIdsProcessHandler = require('./TranslateIdReq/ProcessingTranslateIds/handler/dataHdrDsq');
-const createTranslateIdsProcessMainFunction = require('./TranslateIdReq/ProcessingTranslateIds/mainFunction/data')
 // findData
 const createFindDataFunctionYaml = require('./FindData/FindDataYaml/data');
 const createFindDataHandler = require('./FindData/Handler/data');
@@ -194,7 +178,12 @@ 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');
+
+const { NoRetryError } = require('@izara_project/izara-core-library-core');
 
 /**
  *
@@ -225,7 +214,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       lamdaPerCombindActionPath: join(saveFilePath, `/generatedCode/lamdaPerCombindAction/source/`), // test
       lambdaPerObjectTypePath: join(saveFilePath, `/generatedCode/lambdaPerObjectType/source/`),  // test
       updateRelationship: join(saveFilePath, `../src/generatedCode/RelationshipPerAction/source/`),
-      translateId: join(saveFilePath, `../src/generatedCode/TranslateId/source/`)
     };
 
 
@@ -248,6 +236,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     let createSourceParams = [];
 
+    // use to check dynamoDB table yaml, to prevent duplicate tableName
+    let createdTableYaml = {};
+
     for (const relTag in allObjectRelationships) {
       // const relTagData = allObjectRelationships[relTag];
 
@@ -288,12 +279,19 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       const createFunctionYaml = [...createFunctionYamlHdrApi, ...createFunctionYamlHdrDsq, ...createFunctionYamlHdrInv, ...createFunctionYamlHdrSqs];
 
       // generate Resource ..via dynamoDb sns-in-sqs sns-put
-      const createResourceDynamo = createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath);
+      let [createResourceDynamo, newCreatedTableYaml] = checkValidTableYaml(
+        _izContext,
+        createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath),
+        createdTableYaml
+      );
+
+      createdTableYaml = newCreatedTableYaml;
+      _izContext.logger.debug("createResourceDynamo: ", createResourceDynamo);
+
       const createResourceSnsInSqs = createSourceSnsAndSqs(_izContext, objectSchema, saveFilePath);
       const createResourceSnsOut = createDataForCreateSourceSnsOut(_izContext, objectSchema, saveFilePath);
 
       // translateIdsMainFunction
-      const translateIdsMainFunction = await createTranslateIdsRequestMainFunction(_izContext, objectSchema, saveFilePath);
 
       // wrap main Resource
       const createMainResource = [...createResourceDynamo, ...createResourceSnsInSqs, ...createResourceSnsOut];
@@ -301,11 +299,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
       createSourceParams = createSourceParams.concat([
         // ...createSourceMainResourcesObjectSchema,
-        ...createSourceHandler,                                                                                   // create handler function
-        ...createMainFunction,                                                                                 // create main function
-        ...createFunctionYaml,                                                                                    // create function.yaml
-        ...createMainResource,                                                                                     // create resource yaml
-        ...translateIdsMainFunction,
+        ...createSourceHandler,       // create handler function
+        ...createMainFunction,        // create main function
+        ...createFunctionYaml,        // create function.yaml
+        ...createMainResource,        // create resource yaml
       ]);
 
       // console.log("createSourceParams after concat: ", createSourceParams);
@@ -446,24 +443,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     const deleteRelationshipCompleteData = [...deleteRelationshipCompleteFunctionYaml, ...deleteRelationshipCompleteMainFunction, ...deleteRelationshipCompleteHandler, ...deleteRelationshipCompleteSnsAndSqs, ...deleteRelationshipCompleteSnsOut]
 
-    const translateIdsCacheIdsMainTable = createTranslateIdsCacheMainTable(_izContext, saveFilePath);
-    const translateIdsHandlerFunctionDsq = createTranslateIdsHandlerDsq(_izContext, saveFilePath);
-    const translateIdsHandlerFunctionSqs = createTranslateIdsHandlerSqs(_izContext, saveFilePath);
-    const translateIdsFunctionYamlDsq = createTranslateIdFunctionYamlHdrDsq(_izContext, saveFilePath);
-    const translateIdsFunctionYamlSqs = createTranslateIdFunctionYamlHdrSqs(_izContext, saveFilePath);
-    const translateIdsSnsAndSqsResourceQueue = createSnsAndSqsTranslateId(_izContext, saveFilePath);
-
-    const createTranslateIdsResourece = [...translateIdsCacheIdsMainTable, ...translateIdsHandlerFunctionDsq, ...translateIdsHandlerFunctionSqs,
-    ...translateIdsFunctionYamlDsq, ...translateIdsFunctionYamlSqs, ...translateIdsSnsAndSqsResourceQueue
-    ]
-
-    const translateIdsProcessingSnsOut = createProcessTranslateIdsCompleteSnsOut(_izContext, saveFilePath);
-    const translateIdsProcessingQueue = createTranslateIdsProcessSnsQueue(_izContext, saveFilePath);
-    const translateIdsProcessingFunctionYaml = createTranslateIdsProcessFunctionYaml(_izContext, saveFilePath);
-    const translateIdsProcessingHandler = createTranslateIdsProcessHandler(_izContext, saveFilePath);
-    const translateIdsProcessingMainFunction = createTranslateIdsProcessMainFunction(_izContext, saveFilePath);
-    const createTranslateIdsProcessing = [...translateIdsProcessingQueue, ...translateIdsProcessingFunctionYaml, ...translateIdsProcessingHandler, ...translateIdsProcessingMainFunction, ...translateIdsProcessingSnsOut]
-
     const findDataHandlerSqs = createFindDataHandler(_izContext, saveFilePath);
     const findDataMainFunction = await createFindDataMainFunction(_izContext, saveFilePath);
 
@@ -494,16 +473,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       createSourceParams.push(
         ...updateRelationshipSchemaDatas,
         ...createRelationshipSchemaDatas,
-        ...createTranslateIdsResourece,
-        ...createTranslateIdsProcessing,
         ...deleteRelationshipData,
         ...deleteRelationshipCompleteData
       )
     }
     // 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)
     );