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

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

@@ -75,35 +75,38 @@ function createParamForCreateSource(allObjectRelationships, handlerType, srcPath
   let additionalResourcePermission = defaultIamRolePerAction();
 
   additionalResourcePermission.push(awaitingMultipleStepsRole())
+  if (handlerType === HANDLER.hdrDsq) {
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+        },
+        [
+          resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),
+          resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType) + "DLQ"),
+        ]
+      )
+    )
+  }
 
-  additionalResourcePermission.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sqs]: [
-          SQS_RESOURCE.deleteMessage,
-          SQS_RESOURCE.getQueueAttributes,
-          SQS_RESOURCE.receiveMessage,
-          SQS_RESOURCE.sendMessage,
-          SQS_RESOURCE.getQueueUrl,
-          SQS_RESOURCE.deleteMessageBatch
-        ],
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType) + "DLQ"),
-      ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out"),
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
-      ]
+  if (handlerType === HANDLER.hdrSqs) {
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
+          [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+        },
+        [
+          resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out"),
+          resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType)),
+          resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(handlerType) + "DLQ"),
+          resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+          resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
+        ]
+      )
     )
-  )
+  }
+
   for (const relationship of allObjectRelationships) {
     let [storageType, relationshipTag, links] = checkDynamoTypeRelationship(relationship)
     if (storageType === STORAGE_TYPES.dynamoDB) {

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/dynamodb/mainResourcePerObjectSchemaData.js

@@ -49,7 +49,7 @@ const { getLocalConfig } = require('../../../../MainLibs/src/Utils.js')
  */
 
 function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPath) {
-  let dynamoDbYamlTempleteData = [];
+  let dynamoDbYamlTemplateData = [];
 
   let identifierDetail = {};
   for (let identifier of objectSchema.identifiers) { //check identifiers from objectSchema
@@ -119,10 +119,11 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPa
     // if (storageResource.hasOwnProperty("serviceTag") && storageResource.serviceTag !== getLocalConfig(srcPath)) {
     //   continue; // if serviceTag of storageResource not own service will skip
     // }
+
     if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
       let templateData = {
-        tableName: storageResource.tableName,
-        resourceName: storageResource.tableName,
+        tableName: upperCase(storageResource.tableName),
+        resourceName: upperCase(storageResource.tableName),
         attributes: []
       };
       if (storageResource.hasOwnProperty("groupByPartitionKeyField")) {
@@ -145,11 +146,11 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPa
         }
       }
       // templateData.resourceName = upperCase(objectSchema.objectType)
-      dynamoDbYamlTempleteData.push(templateData)
+      dynamoDbYamlTemplateData.push(templateData)
     }
   }
-
-  return dynamoDbYamlTempleteData
+  // console.log("dynamoDbYamlTemplateData", dynamoDbYamlTemplateData)
+  return dynamoDbYamlTemplateData
 }
 
 const createSourceDataDynamoDB = (_izContext, objectSchema, srcPath) => {
@@ -158,7 +159,7 @@ const createSourceDataDynamoDB = (_izContext, objectSchema, srcPath) => {
 
 
   const dynamoDbMainYamlDataList = dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPath)
-
+  // console.log("generateDynamoPerObjectSchema", objectSchema)
   for (let dynamoDbMainYamlData of dynamoDbMainYamlDataList) {
     resultsForCreateSource.push({
       templatePath: templatePath,

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

@@ -30,53 +30,59 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../MainLibs/src/Consts')
-const { firstUpperCase: upperCase, getLocalConfig } = require('../../../../MainLibs/src/Utils')
+const { firstLetterUpperCase: upperCase, getLocalConfig } = require('../../../../MainLibs/src/Utils')
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const { NoRetryError } = require("@izara_project/izara-core-library-core");
 
 async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
-  let tableNamesToFilter = new Set();
-  let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
-
-  const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
-  await Promise.all(allLocalFlowSchema.records.map(async (flowSchema) => {
-    if (flowSchema.statusType === "storedCache") {
-      tableNamesToFilter.add(...await getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSchemaPath))
-    } else if (flowSchema.statusType === "triggerCache" && flowSchema?.triggerType === "storedCache") {
-      tableNamesToFilter.add(...await getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSchemaPath))
-    }
-  }))
-
-  const allLocalObjSchema = await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
-  await Promise.all(allLocalObjSchema.records.map(async (objSchema) => {
-    if (objSchema.hasOwnProperty("extendObjType")) {
-      for (const storageResource of Object.values(objSchema.storageResources)) {
-        if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-          if (storageResource?.serviceTag !== ownServiceTag) {
-            tableNamesToFilter.add(storageResource.tableName)
+  try {
+    let tableNamesToFilter = new Set();
+    let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
+
+    const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
+    await Promise.all(allLocalFlowSchema.records.map(async (flowSchema) => {
+      if (flowSchema.statusType === "storedCache") {
+        tableNamesToFilter.add(...await getTableNameFromFlowSchema(_izContext, flowSchema, objSchemaPath))
+      } else if (flowSchema.statusType === "triggerCache") {
+        tableNamesToFilter.add(...await getTableNameFromFlowSchema(_izContext, flowSchema, objSchemaPath))
+      }
+    }))
+
+    const allLocalObjSchema = await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
+    await Promise.all(allLocalObjSchema.records.map(async (objSchema) => {
+      if (objSchema.hasOwnProperty("extendObjType")) {
+        for (const storageResource of Object.values(objSchema.storageResources)) {
+          if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+            if (storageResource?.serviceTag !== ownServiceTag) {
+              tableNamesToFilter.has(storageResource.tableName)
+            }
           }
         }
       }
-    }
-  }))
+    }))
+
 
-  let filteredCreateSourceParams = createSourceParams.filter(
-    (result) => !tableNamesToFilter.has(result.templateData.tableName)
-  )
+    // console.log("tableNamesToFilter", tableNamesToFilter)
+    let filteredCreateSourceParams = createSourceParams.filter(
+      (result) => !tableNamesToFilter.has(result.templateData.tableName)
+    )
 
-  // console.log("filteredCreateSourceParams", filteredCreateSourceParams)
-  return filteredCreateSourceParams
+    // console.log("filteredCreateSourceParams", filteredCreateSourceParams)
+    return filteredCreateSourceParams
+  } catch (err) {
+    console.log(err)
+  }
 }
 
 module.exports = filterCreateResourceYaml;
 
-async function getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSchemaPath) {
-  let tableNameStoredCache = new Set();
+async function getTableNameFromFlowSchema(_izContext, flowSchema, objSchemaPath) {
+  let tableNameStoredCache = [];
   const objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objSchemaPath).then(res => res.records[0])
   if (objectSchema) {
     for (const storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-        tableNameStoredCache.add(storageResource.tableName);
+        tableNameStoredCache.push(upperCase(storageResource.tableName));
       }
     }
   } else {

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

@@ -61,7 +61,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         try {
 
           let createSourceDynamoDb = createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath)
-
           const [dynamoResources, updatedTableYaml] = checkValidTableYaml(
             _izContext,
             createSourceDynamoDb,
@@ -78,7 +77,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         }
       }
     }
-
     // Add default resources
     const defaultDynamoDbResources = createDefaultDynamoDb(_izContext, saveFilePath);
     const defaultSnsInSqsResources = createFindDataAndProcessLogicalDefaultSnsInSqs(_izContext, saveFilePath);
@@ -97,6 +95,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         ...dynamoDbResourcePerRelationshipLink
       )
     }
+
+    // console.log("createSourceParams before filter", createSourceParams)
     const filteredCreateSourceParams = await filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath);
 
     // console.log("filteredCreateSourceParams", filteredCreateSourceParams);