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

package/package.json

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

@@ -31,7 +31,8 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
-const { createRandomIdentifier } = require('@izara_project/izara-core-library-core').IdentifierLib
+const { createRandomIdentifier } = require('@izara_project/izara-core-library-identifiers');
+
 // ──────────────────────── Middleware / External ────────────────────────
 const middlewareConsts = require('@izara_project/izara-middleware').consts;
 const externalRequest = require('@izara_project/izara-core-library-external-request');
@@ -67,7 +68,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 +297,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 +315,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 +383,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/action/handler/templateByHandler/apiTemplate.ejs

@@ -27,82 +27,64 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: [
-  'firstObject',
-  'secondObject',
-  'oldReltypeAndDirection',
-  'newRelType',
-  ],
+  required: ["firstObject", "secondObject", "relType", "relationshipDirection"],
   properties: {
     firstObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType", "identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag", "objectType"],
           properties: {
             serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
     secondObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType", "identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag", "objectType"],
           properties: {
             serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
-    oldReltypeAndDirection: {
-      type: 'object',
-      required: ['relType', 'relationshipDirection'],
+    relType: {
+      type: "object",
+      required: ["relationshipTag", "serviceTag"],
       properties: {
-        relType: {
-          type: 'object',
-          required: ['serviceTag', 'relationshipTag'],
-          properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            relationshipTag: izara.validatorSchema.stringNotEmpty(),
-          }
-        },
-        relationshipProperties: {
-          type: 'object',
-        },
-        relationshipDirection: {
+        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        serviceTag: {
           type: 'string',
-          enum: ['from', 'to']
-
+          pattern: "^[a-zA-Z0-9_-]+$",
+          enum: [process.env.iz_serviceTag]
         },
       }
     },
-    newRelType: {
+    relationshipDirection: {
+      type: "string",
+      enum: ['from', "to"]
+    },
+    relationshipProperties: {
       type: 'object',
-      required: ['serviceTag', 'relationshipTag'],
-      properties: {
-        serviceTag: izara.validatorSchema.stringNotEmpty(),
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
-      }
+      default: {}
     },
-    settings: {
-      type: 'object'
-    }
   }
 };
 

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

@@ -48,82 +48,64 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
 // validate event params in middlewware before into function.
 let validatorSchema = {
   type: "object",
-  required: [
-  'firstObject',
-  'secondObject',
-  'oldReltypeAndDirection',
-  'newRelType',
-  ],
+  required: ["firstObject", "secondObject", "relType", "relationshipDirection"],
   properties: {
     firstObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType", "identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag", "objectType"],
           properties: {
             serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
     secondObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType", "identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag", "objectType"],
           properties: {
             serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
-    oldReltypeAndDirection: {
-      type: 'object',
-      required: ['relType', 'relationshipDirection'],
+    relType: {
+      type: "object",
+      required: ["relationshipTag", "serviceTag"],
       properties: {
-        relType: {
-          type: 'object',
-          required: ['serviceTag', 'relationshipTag'],
-          properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            relationshipTag: izara.validatorSchema.stringNotEmpty(),
-          }
-        },
-        relationshipProperties: {
-          type: 'object',
-        },
-        relationshipDirection: {
+        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        serviceTag: {
           type: 'string',
-          enum: ['from', 'to']
-
+          pattern: "^[a-zA-Z0-9_-]+$",
+          enum: [process.env.iz_serviceTag]
         },
       }
     },
-    newRelType: {
+    relationshipDirection: {
+      type: "string",
+      enum: ['from', "to"]
+    },
+    relationshipProperties: {
       type: 'object',
-      required: ['serviceTag', 'relationshipTag'],
-      properties: {
-        serviceTag: izara.validatorSchema.stringNotEmpty(),
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
-      }
+      default: {}
     },
-    settings: {
-      type: 'object'
-    }
   }
 };
 

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

@@ -31,82 +31,64 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middlewware before into function.
 let validatorSchema = {
   type: "object",
-  required: [
-  'firstObject',
-  'secondObject',
-  'oldReltypeAndDirection',
-  'newRelType',
-  ],
+  required: ["firstObject", "secondObject", "relType", "relationshipDirection"],
   properties: {
     firstObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType", "identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag", "objectType"],
           properties: {
             serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
     secondObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType", "identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag", "objectType"],
           properties: {
             serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty()
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
-    oldReltypeAndDirection: {
-      type: 'object',
-      required: ['relType', 'relationshipDirection'],
+    relType: {
+      type: "object",
+      required: ["relationshipTag", "serviceTag"],
       properties: {
-        relType: {
-          type: 'object',
-          required: ['serviceTag', 'relationshipTag'],
-          properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            relationshipTag: izara.validatorSchema.stringNotEmpty(),
-          }
-        },
-        relationshipProperties: {
-          type: 'object',
-        },
-        relationshipDirection: {
+        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        serviceTag: {
           type: 'string',
-          enum: ['from', 'to']
-
+          pattern: "^[a-zA-Z0-9_-]+$",
+          enum: [process.env.iz_serviceTag]
         },
       }
     },
-    newRelType: {
+    relationshipDirection: {
+      type: "string",
+      enum: ['from', "to"]
+    },
+    relationshipProperties: {
       type: 'object',
-      required: ['serviceTag', 'relationshipTag'],
-      properties: {
-        serviceTag: izara.validatorSchema.stringNotEmpty(),
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
-      }
+      default: {}
     },
-    settings: {
-      type: 'object'
-    }
   }
 };