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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -20,10 +20,10 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@izara_project/izara-core-library-core": "^1.0.13",
-    "@izara_project/izara-core-library-external-request": "^1.0.14",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.25",
-    "@izara_project/izara-shared": "^1.0.96",
+    "@izara_project/izara-core-library-core": "^1.0.14",
+    "@izara_project/izara-core-library-external-request": "^1.0.16",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.32",
+    "@izara_project/izara-shared": "^1.0.113",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.1",
     "lodash": "^4.17.21",

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -44,12 +44,14 @@ const {
   generateDeliminatorTreeIdentifier,
   generateDeliminatorTreePerFieldName
 } = require('@izara_project/izara-core-library-service-schemas/src/libs/DeliminatorTree');
+const Logger = require("@izara_project/izara-core-library-logger");
 
 const nodeLabelRegexPattern = "^[a-zA-Z0-9_-]+(?:\:[a-zA-Z0-9_-]+)?$"
 
 const RETURN_GET_DATA_FORMAT = {
   std: "STD",     // { identifiers:{...}, fields:{...}} , data depend on getDataDetails
   full: "FULL",   // {storageTag:{...getResult from database}}
+  onlyField: "ONLY_FIELD" // {graphHandler only return main fieldName (not versionedData) }
 }
 
 const schemaFunctionPerAction = {
@@ -76,8 +78,6 @@ const explodeDataPerAction = {
  * @param {middleware} middleware
  * @param {string} objectType           - name of ObjectType
  * @param {string} action               - action type of Lambda create | update | get | delete
- * @param {object} [setting]
- * @param {string[]} [setting.specificFieldNames] - optional - specific fieldNames use as param in generateValidatorFunction
  */
 function validateSchemaMiddleware(
   middleware,
@@ -89,13 +89,14 @@ function validateSchemaMiddleware(
   if (!schemaFunctionPerAction[action] || !explodeDataPerAction[action]) {
     throw new NoRetryError(`Not found function for generateValidatorSchema or explodeDataPerAction of action:${action}`);
   }
-
+  Logger.debug("setting in generateCodeLibs", setting)
   middleware.setServiceSchema(
     schemaFunctionPerAction[action],
     explodeDataPerAction[action],
     {
       objectType: objectType,
-      specificFieldNames: setting.specificFieldNames ? setting.specificFieldNames : []
+      specificFieldNames: setting?.specificFieldNames ? setting.specificFieldNames : [],
+      action: action
     },
   );
 }
@@ -116,7 +117,7 @@ async function validateSchemaPerRecord(
   lambdaFunctionName,
   objType,
   action, // action
-  setting = {}
+  setting
 ) {
   try {
     record._izContext.logger.debug("validateSchemaPerRecord: ", record,
@@ -135,14 +136,15 @@ async function validateSchemaPerRecord(
     const generateValidatorFunction = schemaFunctionPerAction[action];
     const explodeDataFunction = explodeDataPerAction[action]
 
-    const generatedSchema = await generateValidatorFunction(record._izContext, objType, setting.specificFieldNames);
+    const generatedSchema = await generateValidatorFunction(record._izContext, objType, setting);
     record._izContext.logger.debug(`generatedSchema in validateSchemaPerRecord : `, generatedSchema);
 
 
     const explodedDataRequestParams = await explodeDataFunction(
       record._izContext,
       record.body.Message,
-      objectSchema
+      objectSchema,
+      setting
     );
 
 
@@ -154,11 +156,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 +178,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 +216,7 @@ async function messageToDlq(record, messageFailError, queueUrl) {
 
   record._izContext.logger.debug('messageToDlq, params before sending DLQ', params);
 
-  await sqs.sendMessage(record._izContext, params).promise();
+  await sqs.sendMessage(record._izContext, params);
   record._izContext.logger.debug("----- messageToDlq sendMessage success -----");
 };
 
@@ -502,16 +504,16 @@ const generateDynamoDbIdentifiersWithCache = inMemoryCacheLib.inMemoryCacheLib(
  *
  * @param {Object} _izContext
  * @param {Object} objectSchema
- * @param {Object} getDataDetail
+ * @param {Object} dynamoStorageResource
  * @param {Object} reqIdentifiers
  */
-async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, getDataDetail, reqIdentifiers) {
+async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, dynamoStorageResource, reqIdentifiers) {
 
   let dynamoIdentifiers = await generateDynamoDbIdentifiersWithCache(_izContext, objectSchema, reqIdentifiers)
 
   let identifiersByStorageResource = {};
 
-  if (getDataDetail.groupByPartitionKeyField) {
+  if (dynamoStorageResource.groupByPartitionKeyField) {
 
     let deliminatorTreeIdentifiers = await generateDeliminatorTreeIdentifier(_izContext, objectSchema);
     _izContext.logger.debug("deliminatorTree: ", deliminatorTreeIdentifiers);
@@ -538,7 +540,7 @@ async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, ge
     let newIdentifierValue = sortedIdentifiersValue.join(compositeKeyDeliminator.repeat(currentDeliminatorAmount + 1));
 
     identifiersByStorageResource = {
-      [getDataDetail.groupByPartitionKeyField]: newIdentifierValue
+      [dynamoStorageResource.groupByPartitionKeyField]: newIdentifierValue
     };
 
   } else {
@@ -717,7 +719,10 @@ async function createUpdateDataDetail(_izContext, objectSchema) {
     let storageFieldNames = [];
     for (let [fieldName, fieldNameProperties] of Object.entries(objectSchema.fieldNames)) {
       if (fieldNameProperties.storageResourceTags.includes(storageTag)) {
-        storageFieldNames.push(fieldName)
+        let versionedDataLabel = fieldNameProperties.versionedDataLabel
+        if (!fieldName.includes(versionedDataLabel)) { // not get fieldNames VersionedData_VersionedDataLabel_VersionedDataFieldNames
+          storageFieldNames.push(fieldName)
+        }
       }
     }
     if (storageProperties.storageType === consts.STORAGE_TYPES.graph) {
@@ -764,10 +769,8 @@ async function createUpdateDataDetail(_izContext, objectSchema) {
 
   _izContext.logger.debug("getGraphDataDetails", getGraphDataDetails);
   _izContext.logger.debug("getDynamoDataDetail", getDynamoDbDataDetails);
-  _izContext.logger.debug("allUpdateDataDetail", allUpdateDataDetail)
-
-  Object.assign(allUpdateDataDetail, getDynamoDbDataDetails, getGraphDataDetails)
 
+  Object.assign(allUpdateDataDetail, getDynamoDbDataDetails, getGraphDataDetails);
   return allUpdateDataDetail
 }
 
@@ -791,13 +794,13 @@ async function createDataDetailsLib(
       if (Object.keys(objectSchemas.fieldNames).length == 1) {
 
         for (const storageIdentifiers of settingFieldName.storageResourceTags) {
-          _izContext.logger.debug("case only 1 fieldNames identifiers in ObjectSchema")
+          // _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")
+              // _izContext.logger.debug("same table")
               createDataDetails[storageIdentifiers].fieldNames.push(keyFieldName);
             } else {
-              _izContext.logger.debug("new table")
+              // _izContext.logger.debug("new table")
               Object.assign(createDataDetails, {
                 [storageResources[storageIdentifiers]]: {
                   storageType: consts.STORAGE_TYPES.dynamoDB,
@@ -835,23 +838,23 @@ async function createDataDetailsLib(
       }
       continue
     };
-    _izContext.logger.debug("case multiple fieldName");
+    // _izContext.logger.debug("case multiple fieldName");
     // validate storageResourceTags.
-    _izContext.logger.debug("storageResourceTags is", settingFieldName.storageResourceTags);
+    // _izContext.logger.debug("storageResourceTags is", settingFieldName.storageResourceTags);
 
     for (let eachStorageResourceTag of settingFieldName.storageResourceTags) {
-      _izContext.logger.debug("Loop eachStorageResourceTags", eachStorageResourceTag);
+      // _izContext.logger.debug("Loop eachStorageResourceTags", eachStorageResourceTag);
 
       if (!storageResources.hasOwnProperty(eachStorageResourceTag)) {
         throw new Error("storageResources is'n exist"); // should be validata in step uplode in s3
       } else {
         if (storageResources[eachStorageResourceTag].storageType == consts.STORAGE_TYPES.dynamoDB) {
           if (createDataDetails.hasOwnProperty(eachStorageResourceTag)) {
-            _izContext.logger.debug("SAME STG DB", eachStorageResourceTag);
+            // _izContext.logger.debug("SAME STG DB", eachStorageResourceTag);
             createDataDetails[eachStorageResourceTag].fieldNames.push(keyFieldName);
 
           } else {
-            _izContext.logger.debug("NEW STG DB", eachStorageResourceTag);
+            // _izContext.logger.debug("NEW STG DB", eachStorageResourceTag);
             Object.assign(createDataDetails, {
               [eachStorageResourceTag]: {
                 storageType: consts.STORAGE_TYPES.dynamoDB,
@@ -874,11 +877,11 @@ async function createDataDetailsLib(
           );
           if (checkGraphServerTags) {
             if (createDataDetails.hasOwnProperty(checkGraphServerTags)) {
-              _izContext.logger.debug("SAME STG", checkGraphServerTags);
+              // _izContext.logger.debug("SAME STG", checkGraphServerTags);
               createDataDetails[checkGraphServerTags].fieldNames.push(keyFieldName)
 
             } else {
-              _izContext.logger.debug("NEW STG", checkGraphServerTags);
+              // _izContext.logger.debug("NEW STG", checkGraphServerTags);
               Object.assign(createDataDetails, {
                 [checkGraphServerTags]: {
                   storageType: consts.STORAGE_TYPES.graph,

package/src/TemplateManager/src/FindData/GetByStorage/getByGraph.ejs

@@ -11,7 +11,8 @@ let getDataByGraph = await graphSharedLib.getNodeV2(
   graphHandlerServiceTag,
   objType,
   {
-    identifiers: identifiers
+    ...identifiers,
+    ...fieldName
   },
           <%- JSON.stringify(versionedDataLabel) %>
 );

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

@@ -39,12 +39,15 @@ middleware.setValidatorSchema(
   //(</middlewareSettings>)
 )
 
+/*
+const perRecordsValidatorSchema = {
+  type: "object",
+  required: [],
+  properties: {},
+ }
+*/
+
   //(<globalValidatorSchema>)
-   const perRecordsValidatorSchema = {
-     type: "object",
-     required: [],
-     properties: {},
-    }
   //(</globalValidatorSchema>)
 
 // if need to validate authorizer or additional params , add code to hook tag below
@@ -68,21 +71,21 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
       await validateSchemaPerRecord(
         record,
         "<%- functionName %><%- firstLetterUpperCase(handler) %>",
-        "OBJTYPE,
-        <%- action %>"
+        OBJTYPE,
+        "<%- action %>"
         //(<validateSchemaSetting>)
         //(</validateSchemaSetting>)
       )
 
       //for validate additional params
+      /*
+      await recordHandlerSharedLib.validateRecord(
+        record,
+        "<%- functionName %><%- firstLetterUpperCase(handler) %>",
+        perRecordsValidatorSchema
+      );
+      */
       //(<afterGenerateValidatorSchema>)
-        /*
-        await recordHandlerSharedLib.validateRecord(
-          record,
-          "<%- functionName %><%- firstLetterUpperCase(handler) %>",
-          perRecordsValidatorSchema
-        );
-        */
       //(</afterGenerateValidatorSchema>)
 
       //(<additionalParams>)

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

@@ -38,13 +38,14 @@ middleware.setValidatorSchema(
   //(<middlewareSettings>)
   //(</middlewareSettings>)
 )
-
+/*
+const perRecordsValidatorSchema = {
+  type: "object",
+  required: [],
+  properties: {},
+ }
+ */
   //(<globalValidatorSchema>)
-   const perRecordsValidatorSchema = {
-     type: "object",
-     required: [],
-     properties: {},
-    }
   //(</globalValidatorSchema>)
 
 // if need to validate authorizer or additional params , add code to hook tag below
@@ -75,14 +76,14 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
       )
 
       //for validate additional params
+      /*
+      await recordHandlerSharedLib.validateRecord(
+        record,
+        "<%- functionName %><%- firstLetterUpperCase(handler) %>",
+        perRecordsValidatorSchema
+      );
+        */
       //(<afterGenerateValidatorSchema>)
-        /*
-        await recordHandlerSharedLib.validateRecord(
-          record,
-          "<%- functionName %><%- firstLetterUpperCase(handler) %>",
-          perRecordsValidatorSchema
-        );
-          */
       //(</afterGenerateValidatorSchema>)
 
       //(<additionalParams>)

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

@@ -69,7 +69,6 @@ module.exports.<%- functionName %>Main = async (
     });
 
     let errorsFound = []
-    _izContext.correlationIds.set(coreConsts.BASE_USER_ID,"BasDev");
     const userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
     if (!userId){
       errorsFound.push("not have userId");

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,7 +83,8 @@ module.exports.<%- functionName %>Main = async (
     _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
-    _izContext.correlationIds.set(coreConsts.BASE_USER_ID, "BasDev");
+    let errorFounds = [];
+
     const userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID)
     if (!userId) {
       errorFounds.push("Not Have UserId")
@@ -94,11 +95,14 @@ module.exports.<%- functionName %>Main = async (
     //(<beforeQuery>)
     //(</beforeQuery>)
 
-    const fields = requestParams.objInstanceFull.fields;
     const identifiers = requestParams.objInstanceFull.identifiers;
+    const fields = requestParams?.objInstanceFull?.fields || {};
+    const versionedDatas = requestParams?.objInstanceFull?.versionedDatas || {};
+
     _izContext.logger.debug("explode requestParams", {
+      identifiers: identifiers,
       fields: fields,
-      identifiers: identifiers
+      versionedDatas: versionedDatas
     })
     let objectSchema = await getObjSchemaS3WithHierarchy(
       _izContext,
@@ -115,7 +119,6 @@ module.exports.<%- functionName %>Main = async (
 
     let originTimestamp = Date.now();
 
-    let errorFounds = [];
 
     let messageAttributes
 
@@ -127,7 +130,8 @@ module.exports.<%- functionName %>Main = async (
         },
         objInstanceFull: {
           identifiers: identifiers,
-          fields: fields
+          fields: fields,
+          versionedDatas: versionedDatas
         },
         status: 'error',
         errorFounds: errorFounds
@@ -136,7 +140,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),
@@ -165,6 +169,7 @@ module.exports.<%- functionName %>Main = async (
                   serviceTag: SERVICE_TAG,
                   identifiers: identifiers,
                   fields: fields,
+                  versionedDatas: versionedDatas
                   // correlationIds: _izContext.correlationIds.get("id")
                 }),
                 PREFIX.updateNode
@@ -180,7 +185,8 @@ module.exports.<%- functionName %>Main = async (
                   hash(
                     {
                       identifiers,
-                      fields
+                      fields,
+                      versionedDatas: versionedDatas
                     })
                 )
               )
@@ -194,7 +200,8 @@ module.exports.<%- functionName %>Main = async (
               },
               objInstanceFull: {
                 identifiers: identifiers,
-                fields: fields
+                fields: fields,
+                versionedDatas: versionedDatas
               },
               originTimestamp
             }
@@ -204,8 +211,7 @@ module.exports.<%- functionName %>Main = async (
               callingFlowSharedLib.addParentCallingFlowConfig(
                 callingFlowConfig,
                 callingFlowSharedLib.createCallingFlowConfig(
-                  await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.updateNodeComplete),
-                  {}
+                  await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.updateNodeComplete), {}
                 )
               )
             )
@@ -253,7 +259,8 @@ module.exports.<%- functionName %>Main = async (
         },
         objInstanceFull: {
           identifiers: identifiers,
-          fields: fields
+          fields: fields,
+          versionedData: versionedData
         }
       },
       status: "complete",

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

@@ -167,7 +167,7 @@ module.exports.processLogical = async (
         _izContext.logger.debug("Have errorsFound: ", errorsFound)
         standardErrorParams.push(errorsFound)
         await logicalResultsSharedLib.completeLogicalResultsMain(...standardErrorParams);
-        return;
+        return errorsFound;
       }
 
       const graphHandlerServiceTag = await serviceConfig.getGraphServiceTagWithCache(
@@ -347,7 +347,7 @@ module.exports.processLogical = async (
             errorsFound.push(`can't find data in table ${tableName} by query`)
             standardErrorParams.push(errorsFound)
             await logicalResultsSharedLib.completeLogicalResultsMain(...standardErrorParams);
-            return;
+            return errorsFound;
           }
 
           for (const objInstanceBase of queryDatas.Items) {

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
     };