@izara_project/izara-market-library-service-schemas 1.0.67 → 1.0.68

package/package.json

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

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -897,6 +897,8 @@ async function createDataDetailsLib(_izContext, objectSchemas, settings = { buck
               fieldNames: [keyFieldName],
               accountId: storageResources[eachStorageResourceTag].accountId,
               region: storageResources[eachStorageResourceTag].region,
+              serviceTag: storageResources[eachStorageResourceTag].serviceTag,
+              stage: storageResources[eachStorageResourceTag].stage
             }
           });
         }

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/create/template.ejs

@@ -67,7 +67,8 @@ const PREFIX = {
   ONE: "one",
   MANY: "many",
   CREATE_OBJECT_ASYNC: "createObjectAsync",
-  CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
+  CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete",
+  CREATE_OBJECT_EXTERNAL_TOPIC: "createObjectExternalTopic"
 }
 //-----------------------------------------------------------------------------------------------------------
 
@@ -295,8 +296,9 @@ module.exports.createMain = async (
 
     let listOfObjectForCreates = [];
 
-    let objInstanceFullForDynamoDb = lodash.cloneDeep(objInstanceFull)
-    let objInstanceFullForGraph = lodash.cloneDeep(objInstanceFull)
+    let objInstanceFullForDynamoDb = lodash.cloneDeep(objInstanceFull);
+    let objInstanceFullForGraph = lodash.cloneDeep(objInstanceFull);
+    let objInstanceFullForExternalTopic = lodash.cloneDeep(objInstanceFull);
 
     if (errorsFound.length == 0) {
       //(<validateBeforeCreate>)
@@ -312,8 +314,9 @@ module.exports.createMain = async (
           if (parentObject) {
             if (createDataDetail.tableName.includes(firstLetterUpperCase(`${parentObject.objectType}Records`))) {
               Object.assign(
-                objInstanceFullForDynamoDb.fields,
-                { [`${parentObject.objectType}HandlerServiceTag`]: process.env.iz_serviceTag })
+                objInstanceFullForDynamoDb.fields, {
+                [`${parentObject.objectType}HandlerServiceTag`]: process.env.iz_serviceTag
+              })
             }
           }
 
@@ -379,13 +382,21 @@ module.exports.createMain = async (
           _izContext.logger.debug("::::::externalTopic::::::", { storageTag, createDataDetail });
           //(<beforeSendMessageToExternalTopic>)
           //(</beforeSendMessageToExternalTopic>)
-          let messageObject = {
-            //(<messageObjectHook>)
-            //(</messageObjectHook>)
-          };
+          Object.assign(objInstanceFullForExternalTopic.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
+          _izContext.logger.debug("objInstanceFull before send to external topic", objInstanceFullForExternalTopic)
+
+          allAwaitingStepsId.push(await asyncFlowSharedLib.createAwaitingStepId(
+            (hash({
+              objType: objType,
+              graphServerTag: storageTag,
+              identifiers: objInstanceFullForGraph.identifiers,
+              callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
+            })),
+            PREFIX.CREATE_OBJECT_EXTERNAL_TOPIC
+          ));
 
           let sendToCreateExternalTopic = {
-            Message: JSON.stringify(messageObject),
+            Message: JSON.stringify(objInstanceFullForExternalTopic),
             TopicArn: `arn:aws:sns:${createDataDetail.region}:${createDataDetail.accountId}:${createDataDetail.serviceTag}_${createDataDetail.stage}_Create_In`
           };
           _izContext.logger.debug("Request params before send to create endpoint:", sendToCreateExternalTopic);

package/src/reStructure/TemplateData/externalService/lambdaRole/data.js

@@ -204,6 +204,14 @@ async function externalLambdaIamRoleRelationships(_izContext, allRelSchemas) {
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
           externalResourceName(RESOURCE_CLASSES.sns, "ChangeRelationshipType_In", graphServiceName)
         )
+      ),
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+        },
+        graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
+          externalResourceName(RESOURCE_CLASSES.sns, "MoveRelationship_In", graphServiceName)
+        )
       )
     )
   }

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/data.js

@@ -167,6 +167,17 @@ async function snsSubscriptionDeleteRelationshipComplete(_izContext, allRelSchem
   }
 }
 
+async function snsSubscriptionDeleteRelationshipComplete(_izContext, allRelSchemas) {
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+
+  return {
+    serviceTag: serviceTag,
+    topicName: TOPIC_NAME_GRAPH_HANDLER.outMoveRelationship,
+    sqsEndpoint: TOPIC_NAME_GENERATE_CODE.moveRelationshipComplete
+  }
+}
+
+
 function snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext) {
   let serviceTag = [EXTERNAL_SERVICE_NAME.accountLimits]
   return {
@@ -187,6 +198,6 @@ function snsSubscriptionConfirmReserved(_izContext) {
 }
 
 async function snsSubScriptionFromExternalTopic(_izContext, allObjectSchemas) {
-  
+
 }
 module.exports = createExternalSnsSubscriptions;

package/src/reStructure/TemplateData/findData/findDataYaml/data.js

@@ -65,7 +65,7 @@ async function data(_izContext, objectSchemas, srcPath, settings) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
         // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
-        tableForGetItem.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, storageResource.tableName));
+        tableForGetItem.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(storageResource.tableName)));
 
       } else if (storageResource.storageType === STORAGE_TYPES.graph) {
         // find graph serviceName from graphServerTag or *GetNodeHdrInv ?
@@ -90,7 +90,7 @@ async function data(_izContext, objectSchemas, srcPath, settings) {
     additionalResourcePermission.push(
       createIamRole(
         { [RESOURCE_CLASSES.dynamoDbTable]: [DEFAULT_LAMBDA_ROLE_PER_ACTION[ACTIONS.get].dynamoDbPermission] },
-        upperCase(tableForGetItem)
+        tableForGetItem
       )
     );
   }

package/src/reStructure/TemplateData/processLogical/yaml/data.js

@@ -62,7 +62,7 @@ async function data(_izContext, objectSchemas, srcPath) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
         // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
-        tableForQuery.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, storageResource.tableName));
+        tableForQuery.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(storageResource.tableName)));
       }
     }
   }
@@ -71,7 +71,7 @@ async function data(_izContext, objectSchemas, srcPath) {
     additionalResourcePermission.push(
       createIamRole(
         { [RESOURCE_CLASSES.dynamoDbTable]: DYNAMO_RESOURCE.query },
-        upperCase(tableForQuery)
+        [tableForQuery]
       )
     );
   }

package/src/reStructure/TemplateData/processLogicalPagination/yaml/dsq/data.js

@@ -60,7 +60,7 @@ async function data(_izContext, objectSchemas, srcPath) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
         // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
-        tableForQuery.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, storageResource.tableName));
+        tableForQuery.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(storageResource.tableName)));
       }
     }
   }
@@ -69,7 +69,7 @@ async function data(_izContext, objectSchemas, srcPath) {
     additionalResourcePermission.push(
       createIamRole(
         { [RESOURCE_CLASSES.dynamoDbTable]: "Query" },
-        upperCase(tableForQuery)
+        tableForQuery
       )
     );
   }

package/src/reStructure/TemplateData/processLogicalPagination/yaml/sqs/data.js

@@ -61,7 +61,7 @@ async function data(_izContext, objectSchemas, srcPath) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
         // add IamRole for dynamodb depend on tableName in storageResources of objectSchema
-        tableForQuery.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, storageResource.tableName));
+        tableForQuery.push(resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(storageResource.tableName)));
       }
     }
   }
@@ -70,7 +70,7 @@ async function data(_izContext, objectSchemas, srcPath) {
     additionalResourcePermission.push(
       createIamRole(
         { [RESOURCE_CLASSES.dynamoDbTable]: DYNAMO_RESOURCE.query },
-        upperCase(tableForQuery)
+        tableForQuery
       )
     );
   }

package/src/reStructure/TemplateData/relationshipPerAction/changeRelationship/action/functionYaml/data.js

@@ -60,7 +60,7 @@ function data(_izContext, srcPath) {
     const createSourceParam = createParamForCreateSource(handlerType, srcPath);
     createSourceArray.push(createSourceParam);
   }
-  // console.log("createSourceArrayInUpdaterelationShipSchemahdrSqs", createSourceArray)
+  // console.log("createSourceArrayInUpdaterelationShipSchemahdrSqs", JSON.stringify(createSourceArray, null, 2))
   return createSourceArray
 }
 
@@ -93,10 +93,10 @@ function createParamForCreateSource(handlerType, srcPath) {
   }
 
   if (handlerType === HANDLER.hdrSqs) {
-    createIamRole(
+    additionalResourcePermission.push(createIamRole(
       {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
-        [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.receiveMessage, SQS_RESOURCE.sendMessage]
+        [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.changeRelComplete) + "_Out"),
@@ -105,7 +105,7 @@ function createParamForCreateSource(handlerType, srcPath) {
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]
-    )
+    ))
   }
 
   return {

package/src/reStructure/TemplateData/relationshipPerAction/changeRelationship/action/mainFunction/template.ejs

@@ -234,8 +234,8 @@ module.exports.<%- functionName %> = async (
     if (errorsFound.length) {
 
       let changeRelCompleteMsg = {
-        fromObject: firstObject,
-        toObject: secondObject,
+        firstObject,
+        secondObject,
         oldRelTypeAndDirection,
         newRelType,
         originTimestamp,
@@ -320,8 +320,8 @@ module.exports.<%- functionName %> = async (
 
       // prepare message body
       let changeRelMessageBody = {
-        fromObject: firstObject,
-        toObject: secondObject,
+        firstObject,
+        secondObject,
         oldRelTypeAndDirection,
         newRelType,
         originTimestamp,

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/data.js

@@ -98,7 +98,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       createIamRole(
         {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
-          [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.receiveMessage, SQS_RESOURCE.sendMessage]
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
         },
         [
           resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/functionYaml/data.js

@@ -82,10 +82,7 @@ function createParamForCreateSource(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.sns]:
-          [
-            SNS_RESOURCE.publish, SNS_RESOURCE.subscribe
-          ]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/data.js

@@ -98,7 +98,8 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       createIamRole(
         {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
-          [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.receiveMessage, SQS_RESOURCE.sendMessage]        },
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+        },
         [
           resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
           resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/functionYaml/data.js

@@ -80,10 +80,7 @@ function createParamForCreateSource(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.sns]:
-          [
-            SNS_RESOURCE.publish, SNS_RESOURCE.subscribe
-          ]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/data.js

@@ -98,7 +98,8 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       createIamRole(
         {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
-          [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.receiveMessage, SQS_RESOURCE.sendMessage]        },
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+        },
         [
           resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.getRelComplete) + "_Out"),
           resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),

package/src/reStructure/TemplateData/relationshipPerAction/get/complete/functionYaml/data.js

@@ -80,10 +80,7 @@ function createParamForCreateSource(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.sns]:
-          [
-            SNS_RESOURCE.publish, SNS_RESOURCE.subscribe
-          ]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/functionYaml/data.js

@@ -98,7 +98,8 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       createIamRole(
         {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
-          [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.receiveMessage, SQS_RESOURCE.sendMessage]        },
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+        },
         [
           resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.moveRelComplete) + "_Out"),
           resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),
@@ -110,28 +111,6 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
     )
   }
 
-  for (const relationship of allObjectRelationships) {
-    let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
-    if (storageType === STORAGE_TYPES.dynamoDB) {
-      for (const link of links) {
-        let dynamoComponent = createDynamoDbComponentByLinks(link, relationshipTag)
-        additionalResourcePermission.push(
-          createIamRole(
-            {
-              [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.getItem]
-            },
-            [
-              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameFrom)),
-              resourceNames(RESOURCE_CLASSES.dynamoDbTable, upperCase(dynamoComponent.tableNameTo))
-            ]
-          )
-        )
-      }
-    }
-  }
-
-
-
   return {
     templatePath: templatePath,
     templateData: {

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/handler/templateByHandler/apiTemplate.ejs

@@ -28,12 +28,12 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 let validatorSchema = {
   type: "object",
   required: [
-  'firstObject',
-  'secondObject',
-  'relType',
-  'relationshipProperty',
-  'relationshipDirection',
-  'moveObject'
+    'firstObject',
+    'secondObject',
+    'relType',
+    'relationshipProperties',
+    'relationshipDirection',
+    'moveObject'
   ],
   properties: {
     firstObject: {
@@ -74,7 +74,7 @@ let validatorSchema = {
     },
     relType: {
       type: "object",
-      required: ['serviceTag','relationshipTag'],
+      required: ['serviceTag', 'relationshipTag'],
       properties: {
         serviceTag: izara.validatorSchema.stringNotEmpty(),
         relationshipTag: izara.validatorSchema.stringNotEmpty()
@@ -82,37 +82,22 @@ let validatorSchema = {
     },
     relationshipDirection: {
       type: "string",
-      enum: ['from','to']
+      enum: ['from', 'to']
     },
-    relationshipProperty: {
+    relationshipProperties: {
       type: "object",
       minProperties: 1
     },
     moveObject: {
-      type: "object",
-      required: ['fromObjectRef','toObject'],
+      required: ["fromObjectRef", "moveToIdentifiers"],
       properties: {
         fromObjectRef: {
-          type: 'string',
-          enum: ['firstObject','secondObject']
+          type: "string",
+          enum: ["firstObject", "secondObject"]
         },
-        toObject: {
-          type: 'object',
-          required: ['objType', 'identifiers'],
-          properties: {
-            objType: {
-              type: 'object',
-              required: ['objectType', 'serviceTag'],
-              properties: {
-                serviceTag: izara.validatorSchema.stringNotEmpty(),
-                objectType: izara.validatorSchema.stringNotEmpty()
-              }
-            },
-            identifiers: {
-              type: 'object',
-              minProperties: 1
-            }
-          }
+        moveToIdentifiers: {
+          type: "object",
+          minProperties: 1,
         }
       }
     },

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/handler/templateByHandler/dsqTemplate.ejs

@@ -49,12 +49,12 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 let validatorSchema = {
   type: "object",
   required: [
-  'firstObject',
-  'secondObject',
-  'relType',
-  'relationshipProperty',
-  'relationshipDirection',
-  'moveObject'
+    'firstObject',
+    'secondObject',
+    'relType',
+    'relationshipProperties',
+    'relationshipDirection',
+    'moveObject'
   ],
   properties: {
     firstObject: {
@@ -95,7 +95,7 @@ let validatorSchema = {
     },
     relType: {
       type: "object",
-      required: ['serviceTag','relationshipTag'],
+      required: ['serviceTag', 'relationshipTag'],
       properties: {
         serviceTag: izara.validatorSchema.stringNotEmpty(),
         relationshipTag: izara.validatorSchema.stringNotEmpty()
@@ -103,37 +103,22 @@ let validatorSchema = {
     },
     relationshipDirection: {
       type: "string",
-      enum: ['from','to']
+      enum: ['from', 'to']
     },
-    relationshipProperty: {
+    relationshipProperties: {
       type: "object",
       minProperties: 1
     },
     moveObject: {
-      type: "object",
-      required: ['fromObjectRef','toObject'],
+      required: ["fromObjectRef", "moveToIdentifiers"],
       properties: {
         fromObjectRef: {
-          type: 'string',
-          enum: ['firstObject','secondObject']
+          type: "string",
+          enum: ["firstObject", "secondObject"]
         },
-        toObject: {
-          type: 'object',
-          required: ['objType', 'identifiers'],
-          properties: {
-            objType: {
-              type: 'object',
-              required: ['objectType', 'serviceTag'],
-              properties: {
-                serviceTag: izara.validatorSchema.stringNotEmpty(),
-                objectType: izara.validatorSchema.stringNotEmpty()
-              }
-            },
-            identifiers: {
-              type: 'object',
-              minProperties: 1
-            }
-          }
+        moveToIdentifiers: {
+          type: "object",
+          minProperties: 1,
         }
       }
     },

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/handler/templateByHandler/invTemplate.ejs

@@ -32,12 +32,12 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 let validatorSchema = {
   type: "object",
   required: [
-  'firstObject',
-  'secondObject',
-  'relType',
-  'relationshipProperty',
-  'relationshipDirection',
-  'moveObject'
+    'firstObject',
+    'secondObject',
+    'relType',
+    'relationshipProperties',
+    'relationshipDirection',
+    'moveObject'
   ],
   properties: {
     firstObject: {
@@ -78,7 +78,7 @@ let validatorSchema = {
     },
     relType: {
       type: "object",
-      required: ['serviceTag','relationshipTag'],
+      required: ['serviceTag', 'relationshipTag'],
       properties: {
         serviceTag: izara.validatorSchema.stringNotEmpty(),
         relationshipTag: izara.validatorSchema.stringNotEmpty()
@@ -86,37 +86,22 @@ let validatorSchema = {
     },
     relationshipDirection: {
       type: "string",
-      enum: ['from','to']
+      enum: ['from', 'to']
     },
-    relationshipProperty: {
+    relationshipProperties: {
       type: "object",
       minProperties: 1
     },
     moveObject: {
-      type: "object",
-      required: ['fromObjectRef','toObject'],
+      required: ["fromObjectRef", "moveToIdentifiers"],
       properties: {
         fromObjectRef: {
-          type: 'string',
-          enum: ['firstObject','secondObject']
+          type: "string",
+          enum: ["firstObject", "secondObject"]
         },
-        toObject: {
-          type: 'object',
-          required: ['objType', 'identifiers'],
-          properties: {
-            objType: {
-              type: 'object',
-              required: ['objectType', 'serviceTag'],
-              properties: {
-                serviceTag: izara.validatorSchema.stringNotEmpty(),
-                objectType: izara.validatorSchema.stringNotEmpty()
-              }
-            },
-            identifiers: {
-              type: 'object',
-              minProperties: 1
-            }
-          }
+        moveToIdentifiers: {
+          type: "object",
+          minProperties: 1,
         }
       }
     },

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/handler/templateByHandler/sqsTemplate.ejs

@@ -33,12 +33,12 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 let validatorSchema = {
   type: "object",
   required: [
-  'firstObject',
-  'secondObject',
-  'relType',
-  'relationshipProperty',
-  'relationshipDirection',
-  'moveObject'
+    'firstObject',
+    'secondObject',
+    'relType',
+    'relationshipProperties',
+    'relationshipDirection',
+    'moveObject'
   ],
   properties: {
     firstObject: {
@@ -79,7 +79,7 @@ let validatorSchema = {
     },
     relType: {
       type: "object",
-      required: ['serviceTag','relationshipTag'],
+      required: ['serviceTag', 'relationshipTag'],
       properties: {
         serviceTag: izara.validatorSchema.stringNotEmpty(),
         relationshipTag: izara.validatorSchema.stringNotEmpty()
@@ -87,37 +87,22 @@ let validatorSchema = {
     },
     relationshipDirection: {
       type: "string",
-      enum: ['from','to']
+      enum: ['from', 'to']
     },
-    relationshipProperty: {
+    relationshipProperties: {
       type: "object",
       minProperties: 1
     },
     moveObject: {
-      type: "object",
-      required: ['fromObjectRef','toObject'],
+      required: ["fromObjectRef", "moveToIdentifiers"],
       properties: {
         fromObjectRef: {
-          type: 'string',
-          enum: ['firstObject','secondObject']
+          type: "string",
+          enum: ["firstObject", "secondObject"]
         },
-        toObject: {
-          type: 'object',
-          required: ['objType', 'identifiers'],
-          properties: {
-            objType: {
-              type: 'object',
-              required: ['objectType', 'serviceTag'],
-              properties: {
-                serviceTag: izara.validatorSchema.stringNotEmpty(),
-                objectType: izara.validatorSchema.stringNotEmpty()
-              }
-            },
-            identifiers: {
-              type: 'object',
-              minProperties: 1
-            }
-          }
+        moveToIdentifiers: {
+          type: "object",
+          minProperties: 1,
         }
       }
     },

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/action/mainFunction/template.ejs

@@ -234,8 +234,8 @@ module.exports.<%- functionName %> = async (
     if (errorsFound.length) {
 
       let moveRelCompleteMsg = {
-        fromObject: firstObject,
-        toObject: secondObject,
+        firstObject,
+        secondObject,
         relType,
         relationshipProperties,
         relationshipDirection,

package/src/reStructure/TemplateData/relationshipPerAction/moveRelationship/complete/functionYaml/data.js

@@ -81,10 +81,7 @@ function createParamForCreateSource(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.sns]:
-          [
-            SNS_RESOURCE.publish, SNS_RESOURCE.subscribe
-          ]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/data.js

@@ -79,14 +79,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
     additionalResourcePermission.push(
       createIamRole(
         {
-          [RESOURCE_CLASSES.sqs]: [
-            SQS_RESOURCE.deleteMessage,
-            SQS_RESOURCE.getQueueAttributes,
-            SQS_RESOURCE.receiveMessage,
-            SQS_RESOURCE.sendMessage,
-            SQS_RESOURCE.getQueueUrl,
-            SQS_RESOURCE.deleteMessageBatch
-          ],
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
         },
         [
           resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),
@@ -101,7 +94,7 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
       createIamRole(
         {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
-          [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.receiveMessage, SQS_RESOURCE.sendMessage]
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
         },
         [
           resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out"),

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/functionYaml/data.js

@@ -80,10 +80,7 @@ function createParamForCreateSource(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.sns]:
-          [
-            SNS_RESOURCE.publish, SNS_RESOURCE.subscribe
-          ]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -62,7 +62,7 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
     }))
 
 
-    console.log("tableNamesToFilter", tableNamesToFilter)
+    // console.log("tableNamesToFilter", tableNamesToFilter)
     let filteredCreateSourceParams = createSourceParams.filter(
       (result) => !tableNamesToFilter.has(result.templateData.tableName)
     )

package/src/reStructure/TemplateData/resourceYaml/generateTemplateData.js

@@ -99,7 +99,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // console.log("createSourceParams before filter", createSourceParams)
     const filteredCreateSourceParams = await filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath);
 
-    console.log("filteredCreateSourceParams", filteredCreateSourceParams);
+    // console.log("filteredCreateSourceParams", filteredCreateSourceParams);
 
     return filteredCreateSourceParams;
   } catch (error) {