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

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

@@ -29,31 +29,44 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // validate event params in middlewware before into function.
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relId", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      items: {
-        type: 'object',
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minProperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -63,14 +76,18 @@ let validatorSchema = {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
           enum: [process.env.iz_serviceTag]
-        },
+        }
       }
     },
     relId: izara.validatorSchema.stringNotEmpty(),
     relationshipProperties: {
-      type: 'object',
-      minProperties: 1,
+      type: "object",
+      minProperties: 1
     },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
+    }
   }
 };
 

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

@@ -32,31 +32,44 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: ["objects", "relId", "relType", "relationshipProperties"],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection"],
   properties: {
-    objects: {
-      type: "array",
-      minItems: 2,
-      maxItems: 2,
-      items: {
-        type: 'object',
-        required: ["objType", "identifiers"],
-        properties: {
-          objType: {
-            type: "object",
-            required: ["serviceTag", "objectType"],
-            properties: {
-              serviceTag: izara.validatorSchema.stringNotEmpty(),
-              objectType: izara.validatorSchema.stringNotEmpty()
-            }
-          },
-          identifiers: {
-            type: "object",
-            minProperties: 1
+    firstObject: {
+      type: "object",
+      required: ["objType","identifiers"],
+      properties: {
+        objType: {
+          type: "object",
+          required: ["serviceTag","objectType"],
+          properties: {
+            serviceTag: izara.validatorSchema.stringNotEmpty(),
+            objectType: izara.validatorSchema.stringNotEmpty(),
           }
+        },
+        identifiers: {
+          type: "object",
+          minProperties: 1
         }
       }
     },
+    secondObject: {
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: izara.validatorSchema.stringNotEmpty(),
+          objectType: izara.validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
+      }
+    }
+  },
     relType: {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
@@ -66,14 +79,18 @@ let validatorSchema = {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
           enum: [process.env.iz_serviceTag]
-        },
+        }
       }
     },
     relId: izara.validatorSchema.stringNotEmpty(),
     relationshipProperties: {
-      type: 'object',
-      minProperties: 1,
+      type: "object",
+      minProperties: 1
     },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
+    }
   }
 };
 

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

@@ -21,30 +21,63 @@ const fs = require('fs');
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
 const { SOURCE_PATH } = require('../../libs/Consts');
-const templatePath = path.join(__dirname, "./template.ejs");
+const templateYamlPath = path.join(__dirname, "./templateYaml.ejs");
+const templatePathIntTestPath = path.join(__dirname, "./templateIntTesting.ejs");
 
 
 function data(_izContext, createSourceParams, srcPath) {
   // console.log("createSourceParams in Data", createSourceParams);
   const functionNameConfigs = new Set();
+  let createFunctionNameConfig = []
   for (let { templatePath, templateData, setting } of createSourceParams) {
     if (templateData.functionNameConfig !== undefined) {
       functionNameConfigs.add(templateData.functionNameConfig)
     }
   }
+  let createFunctionNameConfigYaml = createFunctionNameConfigFileYaml(functionNameConfigs, srcPath);
+  let createFunctionNameConfigJs = createFunctionNameConfigFileJs(functionNameConfigs, srcPath);
+  createFunctionNameConfig.push(...createFunctionNameConfigYaml, ...createFunctionNameConfigJs)
+  return createFunctionNameConfig
 
-  return {
-    templatePath: templatePath,
-    templateData: {
-      functionNameConfigs: functionNameConfigs
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: "FunctionNameConfig",
-      fileExtension: ".yml",
-      isAppend: true
+}
+
+function createFunctionNameConfigFileYaml(functionNameConfigs, srcPath) {
+  let createFunctionNameConfigYaml = []
+  createFunctionNameConfigYaml.push(
+    {
+      templatePath: templateYamlPath,
+      templateData: {
+        functionNameConfigs: functionNameConfigs
+      },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+        saveFileName: "FunctionNameConfig",
+        fileExtension: ".yml",
+        isAppend: true
+      }
     }
-  }
+  )
+  return createFunctionNameConfigYaml
+}
+
+function createFunctionNameConfigFileJs(functionNameConfigs, srcPath) {
+  let createFunctionNameConfigJs = []
+  createFunctionNameConfigJs.push(
+    {
+      templatePath: templatePathIntTestPath,
+      templateData: {
+        functionNameConfigs: functionNameConfigs
+      },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.externalService),
+        saveFileName: "FunctionNameConfig",
+        fileExtension: ".js",
+        isAppend: true
+      }
+    }
+  )
+
+  return createFunctionNameConfigJs
 }
 
 module.exports = data;

package/src/TemplateManager/src/externalService/FunctionNameConfig/templateIntTesting.ejs

@@ -0,0 +1,31 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+'use strict';
+
+module.exports.generatedIntTestFunctionNameConfig = () => {
+let functionNameConfigIntTest = [
+  <% functionNameConfigs.forEach(functionNameConfig => { _%>
+    "<%- firstLetterUpperCase(functionNameConfig) %>",
+    <% }) _%>
+    ]
+    return functionNameConfigIntTest
+  }
+
+<%_function firstLetterUpperCase(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} %>

package/src/TemplateManager/src/externalService/FunctionNameConfig/templateYaml.ejs

@@ -0,0 +1,10 @@
+# for createIamRole
+
+<% functionNameConfigs.forEach(functionNameConfig => { _%>
+- ${self:custom.iz_prefixIamRole}<%- firstLetterUpperCase(functionNameConfig) %>${self:custom.iz_suffixIamRole}
+<% }) _%>
+
+
+<%_function firstLetterUpperCase(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} %>

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

@@ -20,7 +20,9 @@ const path = require('path');
 const fs = require('fs');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { getGraphServiceNameFromGraphServerTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
+const { getGraphServiceNameFromGraphServerTagWithCache,
+  getGraphServiceTagWithCache
+} = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, renameObjectType } = require("../../../../MainLibs/src/Utils")
 const {
@@ -87,15 +89,12 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
 
     // ... another external lambda role data
 
-    // processTranslateId Request
-    const externalLambdaIamRoleTranslateId = await externalLambdaIamRoleDataTranslateId(_izContext, allRelSchemas, allObjSchemas)
-    externalLambdaIamRoleTranslateId && externalLambdaIamRoleArray.push(externalLambdaIamRoleTranslateId)
-
+    // ProcessLogical
     const externalLambdaIamRoleProcessLogical = await externalLambdaIamRoleDataProcessLogical(_izContext, allObjSchemas);
     externalLambdaIamRoleProcessLogical && externalLambdaIamRoleArray.push(externalLambdaIamRoleProcessLogical)
   }
 
-
+  console.log("externalLambdaIamRoleArray", externalLambdaIamRoleArray)
   // console.log("createSourceArrayIamRole", JSON.stringify(externalLambdaIamRoleArray))
   // return externalLambdaIamRoleArray
 
@@ -117,7 +116,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, objectSchema, acti
   const graphServiceNames = [];
   for (const storgaeResource of Object.values(objectSchema.storageResources)) {
     if (storgaeResource.storageType === STORAGE_TYPES.graph) {
-      let getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storgaeResource.graphServerTag)
+      let getGraphServiceName = await getGraphServiceTagWithCache(_izContext, storgaeResource.graphServerTag)
       if (!graphServiceNames.includes(getGraphServiceName)) {
         getGraphServiceName && graphServiceNames.push(getGraphServiceName)
       }
@@ -241,52 +240,17 @@ async function externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, all
 
 // delete Relationship
 async function externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, allRelSchemas, handler) {
-  // const functionName = upperCase(FUNCTION_NAME.deleteRel) + upperCase(handler)
-  // const additionalResourcePermission = [];
-  // const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
-
-  // additionalResourcePermission.push(
-  //   createIamRole(
-  //     {
-  //       [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
-  //     },
-  //     graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-  //       externalResourceSns("InDeleteRelationship", graphServiceName)
-  //     )
-  //   )
-  // )
-  // return {
-  //   functionName,
-  //   additionalResourcePermission
-  // }
-}
-
-// Process TranslateIds Request
-async function externalLambdaIamRoleDataTranslateId(_izContext, allRelSchemas, allObjSchemas) {
-  let functionName = upperCase(SHORT_FUNCTION_NAME.translateIdsProcess) + upperCase(shortNameHandler(HANDLER.hdrDsq));
+  const functionName = upperCase(SHORT_FUNCTION_NAME.deleteRel) + upperCase(shortNameHandler(handler))
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
-  let complexFilterServiceTags = getComplexFilterServiceTag(allObjSchemas);
 
   additionalResourcePermission.push(
     createIamRole(
       {
-        [RESOURCE_CLASSES.lambda]: [LAMBDA_RESOURCE.invokeFunction]
-      },
-      graphServiceNamesFromAllRelSchemas.map(graphServiceName => (
-        externalResourceName(RESOURCE_CLASSES.lambda, "GetNodeAndRelationshipsV2HdrInv", graphServiceName)
-      )
-      )
-    )
-  )
-  additionalResourcePermission.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.query]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
-      complexFilterServiceTags.map(complexFilterServiceTag => (
-        externalResourceName(RESOURCE_CLASSES.dynamoDbTable, "FilterData", complexFilterServiceTag)
-      )
+      graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
+        externalResourceSns("InDeleteRelationship", graphServiceName)
       )
     )
   )

package/src/TemplateManager/src/libs/Consts.js

@@ -23,7 +23,7 @@ const {
   STORAGE_TYPES
 } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
-const { getGraphServiceNameFromGraphServerTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
+const { getGraphServiceNameFromGraphServerTagWithCache, getGraphServiceTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
 
 const DEFAULT_HANDLER_PER_ACTION = {
   [ACTIONS.create]: [HANDLER.hdrApi, HANDLER.hdrSqs],
@@ -219,7 +219,7 @@ const getGraphServiceNameFromAllRelSchema = async (_izContext, allRelSchemas) =>
 
     await Promise.all(Object.values(relSchemaData.storageResources).map(async storageResource => {
       if (storageResource.storageType === STORAGE_TYPES.graph) {
-        const getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storageResource.graphServerTag);
+        const getGraphServiceName = await getGraphServiceTagWithCache(_izContext, storageResource.graphServerTag);
         graphServiceNameSet.add(getGraphServiceName)
       }
     }))
@@ -272,7 +272,7 @@ async function getGraphServiceNameFromObjectSchema(_izContext, allObjSchemas) {
   for (const objectSchema of allObjSchemas) {
     for (let storageResource of Object.values(objectSchema.storageResources)) {
       if (storageResource.storageType === STORAGE_TYPES.graph) {
-        let getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storageResource.graphServerTag)
+        let getGraphServiceName = await getGraphServiceTagWithCache(_izContext, storageResource.graphServerTag)
         graphServiceName.add(getGraphServiceName)
       }
     }