@izara_project/izara-shared-service-schemas 1.0.21 → 1.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-shared-service-schemas",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "Shared Libraries frontend/backend for Service Schemas",
   "main": "index.js",
   "scripts": {

package/src/GetObjectSchema.js

@@ -34,6 +34,7 @@ const {
   generateObjectSchemaForUpdate,
   generateObjectSchemaForCombineFieldNames
 } = require('./libs/ReformatObjectSchema');
+
 /**
  * Retrieves a specific object schema from S3.
  *
@@ -905,24 +906,29 @@ async function getLinkConfigByLinkTypeId(getSchemaFn, firstObjType, secondObjTyp
     let linkConfig = await getLinkTypeId(getSchemaFn, firstObjType, secondObjType, relType, direction)
     linkConfig && linkConfigs.push(linkConfig)
   } else {
-    let firstObjectTypeHie = await getObjTypeHierarchy(getSchemaFn, firstObjType);
-    let secondObjectTypeHie = await getObjTypeHierarchy(getSchemaFn, secondObjType);
-
-    if (firstObjectTypeHie.errorsFound.length > 0) {
-      errorsFound.push(...firstObjectTypeHie.errorsFound);
-      return {
-        errorsFound,
-        result: null
+    let firstObjectTypeHie = await getObjTypeHierarchy(getSchemaFn, firstObjType).then(res => {
+      if (res.errorsFound.length && res.errorsFound.length > 0) {
+        errorsFound.push(...res.errorsFound)
+        return {
+          errorsFound: res.errorsFound,
+          result: null
+        }
+      } else {
+        return res.result
       }
-    }
+    });
 
-    if (secondObjectTypeHie.errorsFound.length > 0) {
-      errorsFound.push(...secondObjectTypeHie.errorsFound);
-      return {
-        errorsFound,
-        result: null
+    let secondObjectTypeHie = await getObjTypeHierarchy(getSchemaFn, secondObjType).then(res => {
+      if (res.errorsFound.length && res.errorsFound.length > 0) {
+        errorsFound.push(...res.errorsFound)
+        return {
+          errorsFound: res.errorsFound,
+          result: null
+        }
+      } else {
+        return res.result
       }
-    }
+    });
 
     for (const firstObject of firstObjectTypeHie) {
       for (const secondObject of secondObjectTypeHie) {
@@ -1008,7 +1014,16 @@ async function getObjTypeHierarchy(getSchemaFn, objType, passObjTypeHierarchy, i
     objTypeHierarchy = passObjTypeHierarchy;
   }
 
-  const objectSchema = await getObjSchemaWithoutHierarchy(getSchemaFn, objType);
+  const objectSchema = await getObjSchemaWithoutHierarchy(getSchemaFn, objType).then(objSchema => {
+    if (objSchema.errorsFound.length) {
+      return {
+        errorsFound: objSchema.errorsFound,
+        result: null
+      }
+    } else {
+      return objSchema.result
+    }
+  });
 
   if (objectSchema.extendObjType) {
     iter++;
@@ -1030,7 +1045,7 @@ async function getObjTypeHierarchy(getSchemaFn, objType, passObjTypeHierarchy, i
   }
 }
 
-async function getObjectSchemaForCreate(getSchemaFn, objType) {
+async function getObjectSchemaForCreate(objType) {
   let objectSchema = await getObjSchemaWithHierarchy(getSchemaFn, objType).then(objSchema => {
     if (objSchema.errorsFound.length) {
       return {
@@ -1058,7 +1073,7 @@ async function getObjectSchemaForUpdate(getSchemaFn, objType) {
   return generateObjectSchemaForUpdate(objectSchema)
 }
 
-async function getObjectSchemaCombineFieldNames(objType) {
+async function getObjectSchemaCombineFieldNames(getSchemaFn, objType) {
   let objectSchema = await getObjSchemaWithHierarchy(getSchemaFn, objType).then(objSchema => {
     if (objSchema.errorsFound.length) {
       return {
@@ -1071,6 +1086,7 @@ async function getObjectSchemaCombineFieldNames(objType) {
   })
   return generateObjectSchemaForCombineFieldNames(objectSchema)
 }
+
 module.exports = {
   // objectSchema
   getObjSchemaS3,

package/src/libs/BasicValidatorSchema.js

@@ -689,7 +689,7 @@ const basicExtendObjectSchema = {
   }
 }
 
-// validator schema for basic realtionship schema
+// validator schema for basic relationship schema
 const relationshipBasicSchema = {
   type: "object",
   maxProperties: 1,
@@ -873,7 +873,7 @@ const relationshipBasicSchema = {
 }
 
 
-// validator schema for basic reference realtionship schema
+// validator schema for basic reference relationship schema
 const refRelationshipBasicSchema = {
   type: "object",
   required: ["objectType", "relationshipTag", "relationshipServiceTag"],

package/src/libs/ReformatObjectSchema.js

@@ -178,6 +178,7 @@ function generateObjectSchemaForUpdate(objSchema) {
  * @returns {Object}            - objectSchema that has property for case update
  */
 function generateObjectSchemaForCombineFieldNames(objSchema) {
+  console.log("generateObjectSchemaForCombineFieldNames", objSchema)
   // generate data for case update
   let initReturnObj = {
     objectType: objSchema.objectType,