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

package/src/TemplateManager/src/RelationshipPerAction/DeleteRelationship/DeleteRelationship/perAction/HdrSqs/template.ejs

@@ -30,33 +30,46 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 // validate event params in middleware before into function
-let validatorSchema =  {
+let validatorSchema = {
   type: "object",
-  required: ["objects", "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"],
@@ -72,11 +85,14 @@ let validatorSchema =  {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };
 
-
 //(<globalVarible>
   //</globalVarible>)
 

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/functionYaml/HdrApi/data.js

@@ -65,7 +65,7 @@ function createParamForCreateSource(srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.relationshipPerAction,
+      resourceLocation: SOURCE_PATH.resourceLocationRelationshipPerAction,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME.updateRel) + upperCase(shortNameHandler(handlerType))
     },
     setting: {

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

@@ -67,7 +67,7 @@ const {
  *
  * @returns {object} description of return value
  */
-module.exports.<%- functionName %> = async (
+module.exports.updateRelationship = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -83,10 +83,12 @@ module.exports.<%- functionName %> = async (
 
 
     const {
-      objects,
+      firstObject,
+      secondObject,
       relType,
       relId,
-      relationshipProperties
+      relationshipProperties,
+      relationshipDirection
       //(<requestparamUpdateRel>)
       //(</requestparamUpdateRel>)
     } = requestParams;
@@ -121,8 +123,8 @@ module.exports.<%- functionName %> = async (
       }
     }
 
-    await validateIdentifiersExists(_izContext, objects[0].objType, objects[0].identifiers);
-    await validateIdentifiersExists(_izContext, objects[1].objType, objects[1].identifiers);
+    await validateIdentifiersExists(_izContext, firstObject.objType, firstObject.identifiers);
+    await validateIdentifiersExists(_izContext, secondObject.objType, secondObject.identifiers);
     // finished validate object and identifiers
 
     //(<afterValidateUpdateRel>)
@@ -142,8 +144,8 @@ module.exports.<%- functionName %> = async (
           const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
           const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
 
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = objects[0].objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = objects[1].objType;
+          const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
+          const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
 
           // find exists link
           if (
@@ -210,8 +212,11 @@ module.exports.<%- functionName %> = async (
     if (errorsFound.length) {
 
       let updateCompleteMsg = {
+        firstObject: firstObject,
+        secondObject: secondObject,
         relId: relId,
         relType: relType,
+        relationshipDirection,
         status: 'error',
         errorFounds: errorsFound
         //(<inUpdateCompleteMsgUpdateRel>)
@@ -240,7 +245,7 @@ module.exports.<%- functionName %> = async (
 
 
     // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(_izContext, [objects[0].objType, objects[1].objType], relType);
+    const linkTypeId = createLinkTypeId(_izContext, firstObject.objType, secondObject.objType, relType, relationshipDirection);
 
     let usedGraphServiceTag = []; // collect used graph serviceName, use to check duplicate graph serviceName across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
@@ -276,10 +281,12 @@ module.exports.<%- functionName %> = async (
 
       // prepare message body
       let updateRelMessageBody = {
-        objects: objects,
+        firstObject,
+        secondObject,
         relId,
         relType: relType,
-        relationshipProperties
+        relationshipProperties,
+        relationshipDirection
         //(<inUpdateRelMessageBodyUpdateRel>)
         //(</inUpdateRelMessageBodyUpdateRel>)
       }
@@ -318,9 +325,12 @@ module.exports.<%- functionName %> = async (
     }
 
     return {
+      firstObject,
+      secondObject,
       relId: relId,
       relType: relType,
-      errorFounds: errorsFound
+      relationshipDirection,
+      errorsFound
     };
 
   } catch (err) {

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

@@ -27,31 +27,44 @@ const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>
 // 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"],
@@ -68,6 +81,10 @@ let validatorSchema = {
     relationshipProperties: {
       type: "object",
       minProperties: 1
+    },
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };

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

@@ -47,31 +47,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"],
@@ -81,14 +94,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/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)
+} %>