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

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,23 +74,24 @@ module.exports.<%- functionName %>Main = async (
     _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) {
       errorFounds.push("Not Have UserId")
     }
 
-    const OBJECT_TYPE = "<%- objectType %>"
+    const OBJECT_TYPE = "Address"
     const SERVICE_TAG = process.env.iz_serviceTag;
     //(<beforeQuery>)
     //(</beforeQuery>)
 
-    const fields = requestParams.objInstanceFull.fields;
     const identifiers = requestParams.objInstanceFull.identifiers;
+    const fields = requestParams.objInstanceFull.fields
+    let versionedDataIds = requestParams.versionedDataIds || {}
+
     _izContext.logger.debug("explode requestParams", {
+      identifiers: identifiers,
       fields: fields,
-      identifiers: identifiers
+      versionedDataIds: versionedDataIds
     })
     let objectSchema = await getObjSchemaS3WithHierarchy(
       _izContext,
@@ -128,8 +119,9 @@ module.exports.<%- functionName %>Main = async (
         },
         objInstanceFull: {
           identifiers: identifiers,
-          fields: fields
+          fields: fields,
         },
+        versionedDataIds: versionedDataIds,
         status: 'error',
         errorFounds: errorFounds
       };
@@ -181,7 +173,7 @@ module.exports.<%- functionName %>Main = async (
                   hash(
                     {
                       identifiers,
-                      fields
+                      fields,
                     })
                 )
               )
@@ -195,8 +187,9 @@ module.exports.<%- functionName %>Main = async (
               },
               objInstanceFull: {
                 identifiers: identifiers,
-                fields: fields
+                fields: fields,
               },
+              versionedDataIds: versionedDataIds,
               originTimestamp
             }
 
@@ -205,8 +198,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), {}
                 )
               )
             )
@@ -225,7 +217,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,
@@ -233,14 +225,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
             )
           }
         }
@@ -254,14 +249,15 @@ module.exports.<%- functionName %>Main = async (
         },
         objInstanceFull: {
           identifiers: identifiers,
-          fields: fields
-        }
+          fields: fields,
+        },
+        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/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/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/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)
     );

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationshipComplete/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(
@@ -93,22 +92,23 @@ module.exports.createRelationshipComplete = async (
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
-          let createCompleteMsg = {
-            objects: returnValue.objects,
+          let deleteRelComp = {
+            firstObject: returnValue.firstObject,
+            secondObject: returnValue.secondObject,
             relType: returnValue.relType,
             relationshipProperties: returnValue.relationshipProperties,
             status: status,
             errorFounds: errorsFound
           };
 
-          createCompleteMsg = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, createCompleteMsg);
-          _izContext.logger.debug("After addCallingFlowToSnsResponseMessageObject", createCompleteMsg);
+          deleteRelComp = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, deleteRelComp);
+          _izContext.logger.debug("After addCallingFlowToSnsResponseMessageObject", deleteRelComp);
 
           let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {});
-          _izContext.logger.debug("After addCallingFlowToSnsResponseMessageAttributes", createCompleteMsg);
+          _izContext.logger.debug("After addCallingFlowToSnsResponseMessageAttributes", deleteRelComp);
 
           let sendMessageToOutCreateRelatonshipComplete = {
-            Message: JSON.stringify(createCompleteMsg),
+            Message: JSON.stringify(deleteRelComp),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
             TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
           };
@@ -128,8 +128,11 @@ module.exports.createRelationshipComplete = async (
     );
 
 
-    return { returnValue: 'function:createRelationshipComplete' };
-
+    return {
+      returnValue,
+      status,
+      errorsFound
+    }
   } catch (err) {
     _izContext.logger.error('error createRelationshipComplete:', err)
     throw (err)

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

@@ -57,11 +57,10 @@ module.exports.updateRelationshipComplete = 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(
@@ -131,7 +130,11 @@ module.exports.updateRelationshipComplete = async (
     );
 
 
-    return { returnValue: 'function:updateRelationshipComplete' };
+    return {
+      returnValue,
+      status,
+      errorsFound
+    }
 
   } catch (err) {
     _izContext.logger.error('error updateRelationshipComplete:', err)

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/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/UpdateRelationshipSchema/updateRelationship/perAction/HdrApi/template.ejs

@@ -27,7 +27,7 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
     firstObject: {
       type: "object",
@@ -109,11 +109,14 @@ 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,
-        relationshipProperties: event.relationshipProperties
-      }
+        relationshipDirection: event.relationshipDirection,
+        relationshipProperties: event.relationshipProperties,
+        relId: event.relId
+      },
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
     // return error to client

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

@@ -47,7 +47,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
     firstObject: {
       type: "object",

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

@@ -29,7 +29,7 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middlewware before into function.
 let validatorSchema = {
   type: "object",
-  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
     firstObject: {
       type: "object",
@@ -111,13 +111,15 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     // invoke LambdaFunction
     let lambdaFunctionResponse = await <%- functionName %>.<%- functionName %>(
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
-    {
-      objects: event.objects,
-      relType: event.relType,
-      relId: event.relId,
-      relationshipProperties: event.relationshipProperties
-    },
-    callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
+      {
+        firstObject: event.firstObject,
+        secondObject: event.secondObject,
+        relType: event.relType,
+        relationshipDirection: event.relationshipDirection,
+        relationshipProperties: event.relationshipProperties,
+        relId: event.relId
+      },
+      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     //(<afterPutParamIntoMainFunction>)
     //(</afterPutParamIntoMainFunction>)
     );

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

@@ -32,7 +32,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
     firstObject: {
       type: "object",

package/src/TemplateManager/src/ResourceYaml/dynamodb/{awaitingMultipleStepData.js → defaultDynamoDbTable.js}

@@ -42,8 +42,9 @@ const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../libs/Consts');
 const createAwaitingMultipleStepDynamoDbData = (_izContext, srcPath) => {
 
   let resultsForCreateSource = [];
+  const defaultDynamoDataLists = []
 
-  const awaitingStepDynamoDbDataList = [
+  defaultDynamoDataLists.push(
     {
       "tableName": "AwaitingMultipleSteps",
       "attributes": [
@@ -73,10 +74,45 @@ const createAwaitingMultipleStepDynamoDbData = (_izContext, srcPath) => {
           "AttributeType": "S"
         }
       ]
+    },
+    {
+      "tableName": "FindDataMain",
+      "attributes": [
+        {
+          "keyType": "partitionKey",
+          "AttributeName": "findDataId",
+          "AttributeType": "S"
+        }
+      ]
+    },
+    {
+      "tableName": "LogicalResultsMain",
+      "attributes": [
+        {
+          "keyType": "partitionKey",
+          "AttributeName": "logicalResultId",
+          "AttributeType": "S"
+        }
+      ]
+    },
+    {
+      "tableName": "LogicalResultsData",
+      "attributes": [
+        {
+          "keyType": "partitionKey",
+          "AttributeName": "logicalResultId",
+          "AttributeType": "S"
+        },
+        {
+          "keyType": "sortKey",
+          "AttributeName": "identifiersId",
+          "AttributeType": "S"
+        }
+      ]
     }
-  ];
+  )
 
-  for (let defaultlDynamoData of awaitingStepDynamoDbDataList) {
+  for (let defaultlDynamoData of defaultDynamoDataLists) {
     resultsForCreateSource.push({
       templatePath: templatePath,
       templateData: defaultlDynamoData,

package/src/TemplateManager/src/ResourceYaml/sns-in-sqs/defaultSnsInSqsForFindDataAndProcessLogical.js

@@ -47,6 +47,8 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../l
  */
 
 function createDataForDefaultSnsInSqs(_izContext, srcPath) {
+  let resultsForCreateDefaultSnsInSqs = [];
+  const defaultSnsInSqsDataList = [];
   const setting = {
     initialData: "Resources:\n",
     savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
@@ -54,8 +56,9 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
     fileExtension: ".yml",
     isAppend: true
   }
-  let resultsForCreateDefaultSnsInSqs = [];
-  const defaultSnsInSqsDataList = [
+
+
+  defaultSnsInSqsDataList.push(
     {
       queueName: upperCase(FUNCTION_NAME.findData)
     },
@@ -65,7 +68,7 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
     {
       queueName: upperCase(FUNCTION_NAME.paginateProcessLogical)
     }
-  ]
+  )
 
   for (let defaultSnsInSqsData of defaultSnsInSqsDataList) {
     resultsForCreateDefaultSnsInSqs.push({

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

@@ -30,7 +30,7 @@ function data(_izContext, createSourceParams, srcPath) {
   const functionNameConfigs = new Set();
   let createFunctionNameConfig = []
   for (let { templatePath, templateData, setting } of createSourceParams) {
-    if (templateData.functionNameConfig !== undefined) {
+    if (templateData?.functionNameConfig !== undefined) {
       functionNameConfigs.add(templateData.functionNameConfig)
     }
   }

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

@@ -24,12 +24,8 @@ const { getGraphServiceNameFromGraphServerTagWithCache,
   getGraphServiceTagWithCache
 } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, renameObjectType } = require("../../../../MainLibs/src/Utils")
-const {
-  DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SOURCE_PATH, externalResourceName, externalResourceSns, FUNCTION_NAME, getGraphServiceNameFromAllRelSchema, SAVE_FILE_NAME, getComplexFilterServiceTag,
-  LAMBDA_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, getGraphServiceNameFromObjectSchema,
-  shortNameHandler,
-  SHORT_FUNCTION_NAME } = require("../../libs/Consts");
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, RESOURCE_CLASSES, SOURCE_PATH, externalResourceName, externalResourceSns, getGraphServiceNameFromAllRelSchema, SAVE_FILE_NAME, LAMBDA_RESOURCE, SNS_RESOURCE, getGraphServiceNameFromObjectSchema, shortNameHandler, SHORT_FUNCTION_NAME } = require("../../libs/Consts");
 // const templatePath = path.join(__dirname, "./template.ejs");
 const templatePath = path.join(__dirname, "./template.ejs");
 const { getAllLocalRelationshipSchemas } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
@@ -40,18 +36,17 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
   const externalLambdaIamRoleArray = [];
   for (const objectSchema of allObjSchemas) {
 
-    const newObjectSchema = renameObjectType(objectSchema, srcPath)
     // per action external lambda role
     for (const action of Object.values(ACTIONS)) {
       if (objectSchema.overWriteHandlers?.[action]) {
         for (const handler of objectSchema.overWriteHandlers[action]) {
-          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, newObjectSchema, action, handler)
+          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, objectSchema, action, handler)
           externalLambdaIamRole && externalLambdaIamRoleArray.push(externalLambdaIamRole);
         }
 
       } else {
         for (const handler of DEFAULT_HANDLER_PER_ACTION[action]) {
-          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, newObjectSchema, action, handler)
+          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, objectSchema, action, handler)
           externalLambdaIamRole && externalLambdaIamRoleArray.push(externalLambdaIamRole);
         }
       }
@@ -250,7 +245,7 @@ async function externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, all
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-        externalResourceSns("InDeleteRelationship", graphServiceName)
+        externalResourceSns("InDeleteRelationshipV2", graphServiceName)
       )
     )
   )