@izara_project/izara-shared-service-schemas 1.0.3 → 1.0.4

package/package.json

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

package/src/GetObjectSchema.js

@@ -50,7 +50,12 @@ async function getObjSchemaS3(
 
   validateObjType(objType);
 
-  let objSchema = await getSchemaFn(objType, SCHEMA_NAME.objectSchemaAll);
+  const getDataParams = {
+    schemaName: SCHEMA_NAME.objectSchemaAll,
+    getParams: objType
+  }
+
+  let objSchema = await getSchemaFn(getDataParams);
   if (!objSchema) {
     return objSchema;
   } else {
@@ -320,9 +325,16 @@ async function recursiveMergeExtendObjSchema(getSchemaFn, objSchema, iter = 1) {
 
     if (parentObjSchema.hasOwnProperty("extendObjType")) {
       iter++
+      // Object.assign(objSchema.extendObjType, parentObjSchema.extendObjType);
+
+      let newObjSchema = {
+        ...objSchema,
+        extendObjType: {
+          ...parentObjSchema.extendObjType,
+        },
+      };
 
-      Object.assign(objSchema.extendObjType, parentObjSchema.extendObjType);
-      objSchema = await recursiveMergeExtendObjSchema(getSchemaFn, objSchema, iter);
+      objSchema = await recursiveMergeExtendObjSchema(getSchemaFn, newObjSchema, iter);
     }
   }
 
@@ -341,7 +353,12 @@ async function recursiveMergeExtendObjSchema(getSchemaFn, objSchema, iter = 1) {
 async function getRefObjectRelationship(getSchemaFn, objType) {
   validateObjType(objType);
 
-  let refRelationshipData = await getSchemaFn(objType, SCHEMA_NAME.refObjectRelationship);
+  const getDataParams = {
+    schemaName: SCHEMA_NAME.refObjectRelationship,
+    getParams: objType
+  }
+
+  let refRelationshipData = await getSchemaFn(getDataParams);
 
   return refRelationshipData || {};
 }
@@ -360,7 +377,12 @@ async function getRelationshipSchema(getSchemaFn, relType) {
 
   validateRelType(relType);
 
-  let relationshipSchema = await getSchemaFn(relType, SCHEMA_NAME.relationshipSchema);
+  const getDataParams = {
+    schemaName: SCHEMA_NAME.relationshipSchema,
+    getParams: relType
+  }
+
+  let relationshipSchema = await getSchemaFn(getDataParams);
 
   return relationshipSchema;
 }
@@ -406,7 +428,12 @@ async function getObjectRelationship(
 
   let returnRelationships = [];
 
-  let objectRelationshipsData = await getSchemaFn(objType, SCHEMA_NAME.objectRelationship);
+  const getDataParams = {
+    schemaName: SCHEMA_NAME.objectRelationship,
+    getParams: objType
+  }
+
+  let objectRelationshipsData = await getSchemaFn(getDataParams);
 
   if (objectRelationshipsData && Array.isArray(objectRelationshipsData) && objectRelationshipsData.length) {
     for (const objectRel of objectRelationshipsData) {
@@ -571,14 +598,15 @@ async function getLinkConfigByLinkTypeId(getSchemaFn, firstObjType, secondObjTyp
 
   const linkTypeId = createLinkTypeId(firstObjType, secondObjType, relType, direction);
 
-
-  const linkConfig = await getSchemaFn(
-    {
+  const getDataParams = {
+    schemaName: SCHEMA_NAME.linkByLinkTypeId,
+    getParams: {
       serviceTag: relType.serviceTag,
       linkTypeId: linkTypeId
-    },
-    SCHEMA_NAME.linkByLinkTypeId
-  );
+    }
+  }
+
+  const linkConfig = await getSchemaFn(getDataParams);
 
   return linkConfig;
 }