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

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

@@ -59,6 +59,7 @@ const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER, GRAPH_HANDLER_SERVIC
 const { createDataDetailsLib } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
 const { createLinkTypeId } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
 const { findLinksByObjTypes } = require("@izara_project/izara-core-library-service-schemas/src/libs/RelSchemaLib")
+const lodash = require("lodash")
 
 /**
   - all storageType( DB and Graph) use objInstance({identifiers,fields})
@@ -95,7 +96,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")
@@ -110,7 +110,7 @@ module.exports.<%- functionName %>Main = async (
       objectType: OBJECT_TYPE,
       serviceTag: SERVICE_TAG
     }
-
+    //test npm install from local
     let objectSchema = await getObjectSchema.getObjSchemaS3WithCache(
       _izContext,
       MAIN_OBJTYPE
@@ -162,12 +162,12 @@ module.exports.<%- functionName %>Main = async (
           const { serviceTag: secondServiceTag, objectType: secondObjectType } = link.to.objType
 
           const matchesFromTo =
-            fromServiceTag === firstServiceTag && fromObjectType === firstObjectType
-            && toServiceTag === secondServiceTag && toObjectType === secondObjectType;
+            fromServiceTag === firstServiceTag && fromObjectType === firstObjectType &&
+            toServiceTag === secondServiceTag && toObjectType === secondObjectType;
 
           const matchesToFrom =
-            fromServiceTag === secondServiceTag && fromObjectType === secondObjectType
-            && toServiceTag === firstServiceTag && toObjectType === firstObjectType
+            fromServiceTag === secondServiceTag && fromObjectType === secondObjectType &&
+            toServiceTag === firstServiceTag && toObjectType === firstObjectType
 
           if ((relationshipProperties.relationshipDirection === "from" && matchesFromTo) ||
             (relationshipProperties.relationshipDirection === "to" && matchesToFrom)) {
@@ -385,36 +385,19 @@ module.exports.<%- functionName %>Main = async (
 
       for (let [storageTag, createDataDetail] of Object.entries(createDataDetails)) {
 
-        for (let fieldName of Object.keys(requestParams.fieldNames)) {
-
-          if (createDataDetail.fieldNames.includes(fieldName) &&
-            listOfOptionalOnCreate.includes(fieldName) || listOfRequiredOnCreate.includes(fieldName)
-          ) {
-            _izContext.logger.debug("fieldNames match in detail is:", fieldName);
-
-            if (!objInstanceFull.identifiers.hasOwnProperty(fieldName))
-              if (objInstanceFull.hasOwnProperty("fields")) {
-                Object.assign(objInstanceFull.fields, {
-                  [fieldName]: requestParams.fieldNames[fieldName]
-                })
-              } else {
-                Object.assign(objInstanceFull, {
-                  fields: {
-                    [fieldName]: requestParams.fieldNames[fieldName]
-                  }
-                })
-              };
-          };
-        };
-
         if (createDataDetail.storageType == consts.STORAGE_TYPES.dynamoDB) {
           _izContext.logger.debug("::::::DynamoDB::::::", { storageTag, objInstanceFull });
 
+          let objInstanceFullForDynamoDb = lodash.cloneDeep(objInstanceFull)
+
+          Object.assign(objInstanceFullForDynamoDb.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
+          _izContext.logger.debug("objInstanceFull before create item in dynamoDB", objInstanceFullForDynamoDb)
+
           let identifiersForCreateData = await dynamoDbIdentifiersByStorageResource(
             _izContext,
             objectSchema,
             createDataDetails,
-            objInstanceFull.identifiers
+            objInstanceFullForDynamoDb.identifiers
           )
           _izContext.logger.debug("identifiersForCreateData", identifiersForCreateData);
 
@@ -426,27 +409,32 @@ module.exports.<%- functionName %>Main = async (
             ),
             {
               ...identifiersForCreateData,
-              ...objInstanceFull.fields
+              ...objInstanceFullForDynamoDb.fields
             }
           );
 
         } else if (createDataDetail.storageType == consts.STORAGE_TYPES.graph) {
-          _izContext.logger.debug("::::::Graphanler::::::", { storageTag, objInstanceFull });
+          _izContext.logger.debug("::::::Graph::::::", { storageTag, objInstanceFull });
+
+          let objInstanceFullForGraph = lodash.cloneDeep(objInstanceFull)
+
+          Object.assign(objInstanceFullForGraph.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
+          _izContext.logger.debug("objInstanceFull before send to Graph", objInstanceFullForGraph)
 
           // allStorageTagComplete = false;
           allAwaitingStepsId.push(await asyncFlowSharedLib.createAwaitingStepId(
             (hash({
               objType: MAIN_OBJTYPE,
               graphServerTag: storageTag,
-              identifiers: objInstanceFull.identifiers
+              identifiers: objInstanceFullForGraph.identifiers
             })),
             PREFIX.CREATE_OBJECT_ASYNC
           ));
           listOfObjectForCreates.push({
             [storageTag]: {
               objInstanceFull: {
-                identifiers: objInstanceFull.identifiers,
-                fields: objInstanceFull.fields
+                identifiers: objInstanceFullForGraph.identifiers,
+                fields: objInstanceFullForGraph.fields
               },
               allStorageTagComplete: false
             }
@@ -456,11 +444,27 @@ module.exports.<%- functionName %>Main = async (
 
         };
         _izContext.logger.debug("[1]listOfObjectForCreates:::", listOfObjectForCreates);
-
-        delete objInstanceFull.fields
       };
     };
 
+    function createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail) {
+      _izContext.logger.debug("createObjInstanceFullFieldsByStorageTag : ", { storageTag, createDataDetail })
+      let fields = {};
+      for (let fieldName of Object.keys(requestParams.fieldNames)) {
+        if ((createDataDetails[storageTag].fieldNames.includes(fieldName)) &&
+          (createDataDetail.fieldNames.includes(fieldName))) {
+          if (!objInstanceFull.identifiers.hasOwnProperty(fieldName)) {
+            if (!fields.hasOwnProperty(fieldName)) {
+              Object.assign(fields, {
+                [fieldName]: requestParams.fieldNames[fieldName]
+              })
+            }
+          }
+        }
+      }
+      _izContext.logger.debug({ fields })
+      return fields
+    }
     /// step save awiatingMultipleStep of storageType graph ...........................................................
 
     await asyncFlowSharedLib.createAwaitingMultipleSteps(

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

@@ -39,28 +39,32 @@ const {
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
 
-const dynamodbSharedLib = require('@izara_project/izara-shared/src/DynamodbSharedLib');
-const graphSharedLib = require('@izara_project/izara-shared/src/GraphSharedLib');
-
-const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
-
+const izaraShared = require('@izara_project/izara-shared');
+const dynamodbSharedLib = izaraShared.dynamodbSharedLib;
+const graphSharedLib = izaraShared.graphSharedLib;
+const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
+const snsSharedLib = izaraShared.snsSharedLib;
 
+const externalRequest = require('@izara_project/izara-core-library-external-request');
+const sns = externalRequest.sns
 
+const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
+const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
 
 /**
-*
-*
-* description of function.
-* @param {Object} _izContext
-* @param {CorrelationIds} _izContext.correlationIds - property of _izContext
-* @param {Logger} _izContext.logger - property of _izContext
-* @param {Object} requestParams - request params
-* @param {Object} requestParams.identifiers - identifiers for get data
-* @param {Object} requestParams.additionalRequest - additionalRequest
-*
-*
-* @returns {object} description of return value
-*/
+ *
+ *
+ * description of function.
+ * @param {Object} _izContext
+ * @param {CorrelationIds} _izContext.correlationIds - property of _izContext
+ * @param {Logger} _izContext.logger - property of _izContext
+ * @param {Object} requestParams - request params
+ * @param {Object} requestParams.identifiers - identifiers for get data
+ * @param {Object} requestParams.additionalRequest - additionalRequest
+ *
+ *
+ * @returns {object} description of return value
+ */
 module.exports.<%- functionName %>Main = async (
   _izContext,
   requestParams,
@@ -75,7 +79,7 @@ module.exports.<%- functionName %>Main = async (
   _izContext.logger.debug('<%- functionName %> requestParams: ', requestParams);
   _izContext.logger.debug('<%- functionName %> callingFlowConfig: ', callingFlowConfig);
 
-  const returnFormat = requestParams.additionalRequest?.setting?.returnFormat;
+  const returnSystemFieldsName = requestParams.additionalRequest?.setting?.returnSystemFieldsName || false;
   const throwWhenNotFoundSomeRecord = requestParams.additionalRequest?.setting?.throwWhenNotFoundSomeRecord || true;
 
 
@@ -133,7 +137,10 @@ module.exports.<%- functionName %>Main = async (
           {
             identifiers: requestParams.identifiers
           },
-          versionedDataLabels
+          versionedDataLabels,
+          {
+            returnSystemFieldsName: returnSystemFieldsName
+          }
         )
 
         _izContext.logger.debug("dataFromGraphV2: ", dataFromGraph);
@@ -143,12 +150,37 @@ module.exports.<%- functionName %>Main = async (
         } else {
           getRecordStatus.notFoundSomeRecord = true
         }
-
       //(<afterGetGraph>)
       //(</afterGetGraph>)
 
       getResults.push([dataFromGraph, getDataDetail]);
 
+      if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
+
+        let messageObject = {
+          objType: {
+            objectType: OBJECT_TYPE,
+            serviceTag: SERVICE_TAG
+          },
+          objInstanceFull: dataFromGraph.objInstanceFull
+        }
+        // send message to SNS ProcessFindRequiredData
+        _izContext.logger.debug("HAVE CallingFlow");
+        messageObject = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, messageObject);
+
+        let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});
+        let outGetNodeCompleteTopic = await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outGetNodeComplete)
+        let messageParams = {
+          Message: JSON.stringify(messageObject),
+          MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
+          TopicArn: outGetNodeCompleteTopic,
+        };
+
+        _izContext.logger.debug("messageParams OutUpdateNode ::::::: ", messageParams);
+        await sns.publishAsync(_izContext, messageParams);
+      }
+
+
     } else {
 
       let identifiersForGetData = await dynamoDbIdentifiersByStorageResource(
@@ -204,7 +236,7 @@ module.exports.<%- functionName %>Main = async (
       throw Error("Not found some record while get data");
     }
 
-    let getResult = collectGetData(_izContext, getResults, objectSchema, returnFormat);
+    let getResult = collectGetData(_izContext, getResults, objectSchema, returnSystemFieldsName);
 
     return getResult;
   } catch (err) {

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

@@ -23,22 +23,16 @@ const {
   getObjSchemaS3WithHierarchy,
 } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 
-const {
-  getGraphServiceTagWithCache,
-  getServiceNameWithCache
-} = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
 
 const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
 
 const {
-  dynamoDbIdentifiersByStorageResource,
-  collectGetData
+  dynamoDbIdentifiersByStorageResource, createFieldForUpdateDynamoDb
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
 const izaraShared = require('@izara_project/izara-shared');
 const dynamodbSharedLib = izaraShared.dynamodbSharedLib;
-const graphSharedLib = izaraShared.graphSharedLib;
 const snsSharedLib = izaraShared.snsSharedLib;
 const asyncFlowSharedLib = izaraShared.asyncFlowSharedLib;
 const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
@@ -47,14 +41,10 @@ const lambdaSharedLib = izaraShared.lambdaSharedLib
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
 
-const serviceSchema = require('@izara_project/izara-core-library-service-schemas/src/Utils')
-
 const { createUpdateDataDetail } = require("@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs")
-const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts')
 
-
 /**
  *
  *
@@ -84,7 +74,6 @@ module.exports.<%- functionName %>Main = async (
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
     let errorFounds = [];
-
     const userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID)
     if (!userId) {
       errorFounds.push("Not Have UserId")
@@ -96,13 +85,13 @@ module.exports.<%- functionName %>Main = async (
     //(</beforeQuery>)
 
     const identifiers = requestParams.objInstanceFull.identifiers;
-    const fields = requestParams?.objInstanceFull?.fields || {};
-    const versionedDatas = requestParams?.objInstanceFull?.versionedDatas || {};
+    const fields = requestParams.objInstanceFull.fields
+    let versionedDataIds = requestParams.versionedDataIds || {}
 
     _izContext.logger.debug("explode requestParams", {
       identifiers: identifiers,
       fields: fields,
-      versionedDatas: versionedDatas
+      versionedDataIds: versionedDataIds
     })
     let objectSchema = await getObjSchemaS3WithHierarchy(
       _izContext,
@@ -119,6 +108,50 @@ module.exports.<%- functionName %>Main = async (
 
     let originTimestamp = Date.now();
 
+    let haveVersionedDataIdsToUpdate = (requestParams.versionedDataIds && Object.keys(requestParams.versionedDataIds).length) ? true : false
+    if (haveVersionedDataIdsToUpdate) {
+
+      let updateMainNodeData = {};
+      let updateVersionedData = {};
+      _izContext.logger.debug("have versionedDataIds to update")
+      for (const fieldProp in requestParams.objInstanceFull.fields) {
+        const fieldSetting = objectSchema.fieldNames[fieldProp];
+        // collect updateData
+        if (fieldSetting.hasOwnProperty("versionedDataLabel")) {
+          if (!updateVersionedData.hasOwnProperty(fieldSetting.versionedDataLabel)) {
+            updateVersionedData[fieldSetting.versionedDataLabel] = {};
+          }
+          Object.assign(updateVersionedData[fieldSetting.versionedDataLabel], { [fieldProp]: requestParams.objInstanceFull.fields[fieldProp] })
+        } else {
+          Object.assign(updateMainNodeData, { [fieldProp]: requestParams.objInstanceFull.fields[fieldProp] })
+        }
+      }
+      _izContext.logger.debug("updateMainNodeData::", updateMainNodeData);
+      _izContext.logger.debug("updateVersionedData::", updateVersionedData);
+
+      const versionedDataIdLabelKeys = Object.keys(requestParams.versionedDataIds);
+      const updateVersionedDataLabelKeys = Object.keys(updateVersionedData);
+
+      _izContext.logger.debug("versionedDataIdLabelKeys:: ", versionedDataIdLabelKeys);
+      _izContext.logger.debug("updateVersionedDataLabelKeys:: ", updateVersionedDataLabelKeys);
+      //check missing versionedDataIds
+      const missingVersionedDataIdLabels = updateVersionedDataLabelKeys.filter(label => !versionedDataIdLabelKeys.includes(label));
+      _izContext.logger.debug("missingVersionedDataIdLabels:: ", missingVersionedDataIdLabels);
+
+      if (missingVersionedDataIdLabels.length) {
+        errorFounds.push(`missing versionedDataIds of versionedDataLabel '${missingVersionedDataIdLabels.join(", ")}'`)
+      }
+
+      // check missing update data of versionedDataLabels
+      const missingDataVersionedDataLabels = versionedDataIdLabelKeys.filter(label => !versionedDataIdLabelKeys.includes(label))
+      if (missingDataVersionedDataLabels.length) {
+        errorFounds.push(`missing data of versionedDataLabels '${missingDataVersionedDataLabels.join(", ")}'`);
+      }
+      // check mainNode Data should not exists
+      if (Object.keys(updateMainNodeData).length) {
+        errorsFound.push("cannot update mainNode if have versionedDataIds");
+      }
+    }
 
     let messageAttributes
 
@@ -131,8 +164,8 @@ module.exports.<%- functionName %>Main = async (
         objInstanceFull: {
           identifiers: identifiers,
           fields: fields,
-          versionedDatas: versionedDatas
         },
+        versionedDataIds: versionedDataIds,
         status: 'error',
         errorFounds: errorFounds
       };
@@ -169,7 +202,6 @@ module.exports.<%- functionName %>Main = async (
                   serviceTag: SERVICE_TAG,
                   identifiers: identifiers,
                   fields: fields,
-                  versionedDatas: versionedDatas
                   // correlationIds: _izContext.correlationIds.get("id")
                 }),
                 PREFIX.updateNode
@@ -186,7 +218,6 @@ module.exports.<%- functionName %>Main = async (
                     {
                       identifiers,
                       fields,
-                      versionedDatas: versionedDatas
                     })
                 )
               )
@@ -201,8 +232,8 @@ module.exports.<%- functionName %>Main = async (
               objInstanceFull: {
                 identifiers: identifiers,
                 fields: fields,
-                versionedDatas: versionedDatas
               },
+              versionedDataIds: versionedDataIds,
               originTimestamp
             }
 
@@ -230,7 +261,7 @@ module.exports.<%- functionName %>Main = async (
             let resSNS = await sns.publishAsync(_izContext, updateNodeMessageBody)
             _izContext.logger.debug('resSNS send to topic InUpdateNode finish!', resSNS);
 
-          } else {
+          } else if (updateDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
 
             let identifiersForUpdateData = await dynamoDbIdentifiersByStorageResource(
               _izContext,
@@ -238,14 +269,17 @@ module.exports.<%- functionName %>Main = async (
               updateDataDetail,
               identifiers
             )
+
+            let fieldForUpdateTableDynamo = createFieldForUpdateDynamoDb(_izContext, objectSchema, updateDataDetail, fields)
+
             _izContext.logger.debug("identifiersForUpdateData", identifiersForUpdateData)
-            _izContext.logger.debug("fields", fields)
+            _izContext.logger.debug("fieldForUpdateTableDynamo", fieldForUpdateTableDynamo)
 
             await dynamodbSharedLib.updateItem(
               _izContext,
               await dynamodbSharedLib.tableName(_izContext, updateDataDetail.tableName),
               identifiersForUpdateData,
-              fields
+              fieldForUpdateTableDynamo
             )
           }
         }
@@ -260,14 +294,14 @@ module.exports.<%- functionName %>Main = async (
         objInstanceFull: {
           identifiers: identifiers,
           fields: fields,
-          versionedData: versionedData
-        }
+        },
+        versionedDataIds: versionedDataIds
       },
       status: "complete",
       errorFounds
     }
   } catch (err) {
-    _izContext.logger.error('error <%- functionName %>: ', err)
+    _izContext.logger.error('error AddressUpdate: ', err)
     throw (err)
   }
 }

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/functionYaml/HdrSqs/template.ejs

@@ -2,6 +2,10 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  events:
+    - sqs:
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+        batchSize: 10
   iamRoleStatements:
     <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
     - Effect: <%- resourcePermission.effect %>

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrApi/template.ejs

@@ -113,7 +113,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
         relType: event.relType,
         relationshipDirection: event.relationshipDirection,
         relationshipProperties: event.relationshipProperties,
-      }
+      },
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
     // return error to client

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrDsq/template.ejs

@@ -146,11 +146,7 @@ let validatorSchema = {
         );
 
         // add argument (to invoke lambda) to passOnProperties[]
-        passOnProperties.push(record.body.Message.firstObject)
-        passOnProperties.push(record.body.Message.secondObject)
-        passOnProperties.push(record.body.Message.relType)
-        passOnProperties.push(record.body.Message.relationshipDirection)
-        passOnProperties.push(record.body.Message.relationshipProperties)
+        passOnProperties.push(record.body.Message)
         passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
         //(<afterPutParamIntoMainFunction>)
         //(</afterPutParamIntoMainFunction>)

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationship/perAction/HdrSqs/template.ejs

@@ -124,11 +124,7 @@ let validatorSchema = {
         );
 
         // add argument (to invoke lambda) to passOnProperties[]
-        passOnProperties.push(record.body.Message.firstObject)
-        passOnProperties.push(record.body.Message.secondObject)
-        passOnProperties.push(record.body.Message.relType)
-        passOnProperties.push(record.body.Message.relationshipDirection)
-        passOnProperties.push(record.body.Message.relationshipProperties)
+        passOnProperties.push(record.body.Message)
         passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
         //(<afterPutParamIntoMainFunction>)
         //(</afterPutParamIntoMainFunction>)

package/src/TemplateManager/src/RelationshipPerAction/CreateRelationship/createRelationshipComplete/mainFunction/template.ejs

@@ -56,11 +56,10 @@ module.exports.createRelationshipComplete = async (
     // start create awaitingStepId
     const linkTypeId = createLinkTypeId(
       _izContext,
-      [
-        returnValue.objects[0].objType,
-        returnValue.objects[1].objType,
-      ],
-      returnValue.relType
+      returnValue.firstObject.objType,
+      returnValue.secondObject.objType,
+      returnValue.relType,
+      returnValue.direction
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
@@ -94,7 +93,8 @@ module.exports.createRelationshipComplete = async (
           _izContext.logger.debug("finished all awaitingStep");
 
           let createCompleteMsg = {
-            objects: returnValue.objects,
+            firstObject: returnValue.firstObject,
+            secondObject: returnValue.secondObject,
             relType: returnValue.relType,
             relationshipProperties: returnValue.relationshipProperties,
             status: status,
@@ -128,7 +128,11 @@ module.exports.createRelationshipComplete = async (
     );
 
 
-    return { returnValue: 'function:createRelationshipComplete' };
+    return {
+      returnValue,
+      status,
+      errorsFound
+    }
 
   } catch (err) {
     _izContext.logger.error('error createRelationshipComplete:', err)

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

@@ -2,6 +2,10 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  events:
+    - sqs:
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+        batchSize: 10
   iamRoleStatements:
     <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
     - Effect: <%- resourcePermission.effect %>

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

@@ -245,7 +245,7 @@ module.exports.deleteRelationship = async (
 
 
     // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(_izContext, objects[0].objType, objects[1].objType, relType, relationshipDirection);
+    const linkTypeId = createLinkTypeId(_izContext, firstObject.objType, secondObject.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

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

@@ -108,12 +108,13 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     let lambdaFunctionResponse = await <%- functionName %>.<%- functionName %>(
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
       {
-        objects: event.objects,
+        firstObject: event.firstObject,
+        secondObject: event.secondObject,
         relType: event.relType,
-        relId: event.relId,
+        relationshipDirection: event.relationshipDirection,
         relationshipProperties: event.relationshipProperties,
-        relationshipDirection: event.relationshipDirection
-      }
+      },
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
     // return error to client

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

@@ -104,10 +104,11 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     return await <%- functionName %>.<%- functionName %>(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       {
-        objects: event.objects,
+        firstObject: event.firstObject,
+        secondObject: event.secondObject,
         relType: event.relType,
+        relationshipDirection: event.relationshipDirection,
         relationshipProperties: event.relationshipProperties,
-        relationshipDirection: event.relationshipDirection
       },
       callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );