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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "@izara_project/izara-core-library-lambda": "^1.0.4",
     "@izara_project/izara-core-library-logger": "^1.0.7",
     "@izara_project/izara-shared-core": "^1.0.2",
-    "@izara_project/izara-shared-service-schemas": "^1.0.15",
+    "@izara_project/izara-shared-service-schemas": "^1.0.16",
     "glob": "^11.0.2",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",

package/src/GetObjectSchema.js

@@ -36,6 +36,7 @@ const {
   getObjectRelationship: getObjectRelationshipShared,
   getRequiredOnCreateLinks: getRequiredOnCreateLinksShared,
   getLinkConfigByLinkTypeId: getLinkConfigByLinkTypeIdShared,
+  getObjTypeHierarchy: getObjTypeHierarchyShared
 } = sharedServiceSchema.getObjectSchema;
 const { validateObjType, validateRelType, validateFlowType } = sharedServiceSchema.validateObjType;
 const {
@@ -840,16 +841,17 @@ const getLinkConfigWithCache = inMemoryCacheLib(
  * @param {String} relType.relationshipTag
  * @returns {Promise<{from:Object, to:Object}>}
  */
-async function getLinkConfigByLinkTypeId(_izContext, firstObjType, secondObjType, relType, direction) {
+async function getLinkConfigByLinkTypeId(_izContext, firstObjType, secondObjType, relType, direction, settings) {
 
   _izContext.logger.debug("getLinkConfigByLinkTypeId: ", {
     firstObjType,
     secondObjType,
     relType,
-    direction
+    direction,
+    settings
   });
 
-  return await getLinkConfigByLinkTypeIdShared(getSchemaByNameWithCache, firstObjType, secondObjType, relType, direction);
+  return await getLinkConfigByLinkTypeIdShared(getSchemaByNameWithCache, firstObjType, secondObjType, relType, direction, settings);
 }
 
 /**
@@ -1009,6 +1011,33 @@ function getAllLocalRefObjectRelationshipSchema(_izContext, objSchemaPath = LOCA
 
 }
 
+/**
+ * create hierarchy of objType
+ *
+ * @param {object} _izContext
+ * @param {object} objType
+ * @param {object} currentHierarchy
+ * @param {number} iter
+ * @returns
+ */
+async function getObjTypeHierarchy(_izContext, objType) {
+  return await getObjTypeHierarchyShared(getSchemaByNameWithCache, objType);
+}
+
+/**
+ * Caches the getObjTypeHierarchy function
+ *
+ * @see {@link getObjTypeHierarchy}
+ */
+const getObjTypeHierarchyWithCache = inMemoryCacheLib(
+  getObjTypeHierarchy,
+  { //seting
+    max: 100, maxAge: 8640000, promise: true, profileName: 'getObjTypeHierarchy',
+    normalizer: function (args) {
+      return hash([args[1]])
+    }
+  }
+)
 
 module.exports = {
   // getObjectTypes,
@@ -1063,7 +1092,8 @@ module.exports = {
   getFlowSchemaS3,
   getFlowSchemaS3WithCache,
 
-
+  getObjTypeHierarchy,
+  getObjTypeHierarchyWithCache
 }
 
 

package/src/ValidatorSchema.js

@@ -929,7 +929,6 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
     const allObjectRelationships = getAllLocalRelationshipSchema(_izContext, schemasPath);
     const allReferenceObjectRelationships = getAllLocalRefObjectRelationshipSchema(_izContext, schemasPath);
     const allFlowSchemas = await getAllLocalFlowSchemas(_izContext, schemasPath).then(res => res.records);
-    console.log("allObjectRelationships", allObjectRelationships)
 
     // validate all schema
     for (const objSchema of allObjectSchema) {
@@ -1129,6 +1128,23 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             }
           })
         )
+        // validate dulicate link
+        let relSchemaLinkType = new Set();
+        for (let link of relData.links) {
+          console.log("link", link)
+          let linkTypeRelSchema = createLinkTypeId(_izContext,
+            link.from.objType,
+            link.to.objType,
+            { relationshipTag: relTagName, serviceTag: process.env.iz_serviceTag },
+            "from"
+          )
+
+          if (!relSchemaLinkType.has(linkTypeRelSchema)) {
+            relSchemaLinkType.add(linkTypeRelSchema)
+          } else {
+            throw new NoRetryError(`error Schema relationship duplicate link with objType ${JSON.stringify(link.from.objType)} and ${JSON.stringify(link.to.objType)}`)
+          }
+        }
       }
     }
 
@@ -1152,13 +1168,6 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
       for (const flowSchema of allFlowSchemas) {
         const [status, errors] = validateBasicFlowSchema(_izContext, flowSchema)
 
-        if (flowSchema.handleObj === "multi") {
-          if (flowSchema.outputTopic === true) {
-            validateStatus.status = false;
-            validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} should not have outputTopic if handleObj === true`)
-          }
-        }
-
         if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "statusField" || flowSchema.statusType === "triggerCache") {
           if (!flowSchema.hasOwnProperty("objType")) {
             validateStatus.status = false;

package/src/libs/CreateNodeLib.js

@@ -20,17 +20,17 @@ const { createRelTypeConcat, createLinkTypeId } = require('../Utils');
 const getObjectSchema = require('../GetObjectSchema');
 const serviceConfig = require('../ServiceConfig');
 const { STORAGE_TYPES } = require('../Consts')
-const { createObjTypeHierarchy } = require('../libs/RelSchemaLib')
+const { getObjTypeHierarchy } = require('../GetObjectSchema')
 
 async function validateRequiredOnCreateLinks(_izContext, objType, relationships, settings = {}) {
   _izContext.logger.debug("validateRequiredOnCreateLinks:::", { objType, relationships, settings })
 
 
-  let objectHie = await createObjTypeHierarchy(_izContext, objType);
+  let objectHie = await getObjTypeHierarchy(_izContext, objType);
   _izContext.logger.debug("objectHierarchy::", objectHie)
 
   if (relationships.length) {
-    let targetHierarchy = await createObjTypeHierarchy(_izContext, relationships[0].targetObjType);
+    let targetHierarchy = await getObjTypeHierarchy(_izContext, relationships[0].targetObjType);
     _izContext.logger.debug("targetHierarchy::", targetHierarchy)
   }
 
@@ -90,7 +90,7 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships,
 
     for (let link of usedLinkGroup) {
       // check other with targetObjType, check linkType of other should be 'one',
-      let targetObjTypeHierarchy = await createObjTypeHierarchy(_izContext, relationship.targetObjType);
+      let targetObjTypeHierarchy = await getObjTypeHierarchy(_izContext, relationship.targetObjType);
       _izContext.logger.debug(" ::", targetObjTypeHierarchy)
 
       // if (link.other.objType.objectType === relationship.targetObjType.objectType) {

package/src/libs/RelSchemaLib.js

@@ -23,43 +23,7 @@ const hash = require('@izara_project/izara-shared-core').objectHash;
 const { NoRetryError } = require('@izara_project/izara-core-library-core');
 const getObjectSchema = require("../GetObjectSchema");
 const { validateObjType: { validateObjType } } = require("@izara_project/izara-shared-service-schemas");
-
-/**
- * create hierarchy of objType
- *
- * @param {object} _izContext
- * @param {object} objType
- * @param {object} currentHierarchy
- * @param {number} iter
- * @returns
- */
-async function createObjTypeHierarchy(_izContext, objType, passObjTypeHierarchy, iter = 1) {
-  if (iter >= 20) {
-    throw NoRetryError("createObjTypeHierarchy reach limit iteration");
-  }
-
-  validateObjType(objType);
-
-  let objTypeHierarchy
-
-  if (!passObjTypeHierarchy) {
-    objTypeHierarchy = [objType];
-  } else {
-    objTypeHierarchy = passObjTypeHierarchy;
-  }
-
-  const objectSchema = await getObjectSchema.getObjSchemaS3WithCache(_izContext, objType);
-
-  if (objectSchema.extendObjType) {
-    iter++;
-    objTypeHierarchy.push(objectSchema.extendObjType);
-    await createObjTypeHierarchy(_izContext, objectSchema.extendObjType, objTypeHierarchy, iter);
-  }
-
-  return objTypeHierarchy;
-}
-
-
+const { getObjTypeHierarchy } = require('../GetObjectSchema')
 /**
  * helper function for find link of 2 objects in links and refactor each link
  *
@@ -85,8 +49,8 @@ async function findLinksByObjTypes(_izContext, objTypes, relatoinshipLinks) {
   const secondObjType = objTypes[1];
 
   // first create hierarchy of each objType
-  const firstObjTypeTree = await createObjTypeHierarchy(_izContext, objTypes[0]);
-  const secondObjTypeTree = await createObjTypeHierarchy(_izContext, objTypes[1]);
+  const firstObjTypeTree = await getObjTypeHierarchy(_izContext, objTypes[0]);
+  const secondObjTypeTree = await getObjTypeHierarchy(_izContext, objTypes[1]);
 
   const firstObjTypeTreeHashes = firstObjTypeTree.reduce(
     (result, objType) => {
@@ -135,6 +99,5 @@ async function findLinksByObjTypes(_izContext, objTypes, relatoinshipLinks) {
 }
 
 module.exports = {
-  createObjTypeHierarchy,
   findLinksByObjTypes
 }