@izara_project/izara-core-library-service-schemas 1.0.70 → 1.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {

package/src/GetObjectSchema.js

@@ -199,7 +199,7 @@ async function getLocalObjectSchemas(_izContext, objectTypes, objSchemaPath = LO
     // returnValue.fieldLookup[objectType] = null;
   }
 
-  const allObjectSchemas = lodash.cloneDeep(getDataFromPath(_izContext, LOCAL_FILENAME.OBJECT_SCHEMA, objSchemaPath)
+  let allObjectSchemas = lodash.cloneDeep(getDataFromPath(_izContext, LOCAL_FILENAME.OBJECT_SCHEMA, objSchemaPath)
     .flat()
     .filter(schema => filteredObjectTypes.includes(schema.objectType))
   );
@@ -209,12 +209,13 @@ async function getLocalObjectSchemas(_izContext, objectTypes, objSchemaPath = LO
   if (getExtendObType) {
     await Promise.all(
       allObjectSchemas.map(async (objSchema, idx) => {
-        allObjectSchemas[idx] = await mergeExtendObjSchema(_izContext, objSchema);
+        allObjectSchemas[idx] = await mergeExtendObjSchema(_izContext, objSchema).then(res => res.result);
       })
     )
   }
 
 
+
   // add objectSchema to returnValue object
   for (let [idx, objSchema] of allObjectSchemas.entries()) {
     if (!returnValue.fieldLookup.hasOwnProperty(objSchema.objectType)) {
@@ -230,7 +231,6 @@ async function getLocalObjectSchemas(_izContext, objectTypes, objSchemaPath = LO
       throw new NoRetryError(`Found duplicate shortNameObjectType: '${objSchema.shortNameObjectType}' in file ObjectFieldSchema.js `);
     }
   }
-
   returnValue.records = allObjectSchemas;
 
   return returnValue;
@@ -296,11 +296,10 @@ async function getAllLocalObjectSchemas(_izContext, objSchemaPath = LOCAL_OBJECT
   if (getExtendObType) {
     await Promise.all(
       allObjectSchemas.map(async (objSchema, idx) => {
-        allObjectSchemas[idx] = await mergeExtendObjSchema(_izContext, objSchema)
+        allObjectSchemas[idx] = await mergeExtendObjSchema(_izContext, objSchema).then(res => res.result)
       })
     )
   }
-
   // add objectSchema to returnValue object
   for (let [idx, objSchema] of allObjectSchemas.entries()) {
     if (!returnValue.fieldLookup.hasOwnProperty(objSchema.objectType)) {

package/src/Utils.js

@@ -348,6 +348,9 @@ function validateObjectSchema(_izContext, objectSchema) {
       }
     }
   }
+  if (!objectSchema.hasOwnProperty("generatedBy")) {
+    objectSchema["generatedBy"] = "userGenerated"
+  };
 
   if (objectSchema.hasOwnProperty("extendObjType")) {
     return validateExtendObjectSchema(_izContext, objectSchema)

package/src/ValidatorSchema.js

@@ -1135,7 +1135,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
           let linkTypeRelSchema = createLinkTypeId(_izContext,
             link.from.objType,
             link.to.objType,
-            { relationshipTag: relTagName, serviceTag: process.env.iz_serviceTag },
+            { relationshipTag: relTagName, serviceTag: iz_serviceTag},
             "from"
           )
 

package/src/libs/s3Utils.js

@@ -61,7 +61,6 @@ async function getObjectS3Shared(param) {
 }
 
 async function getSchemaByName(params) {
-
   if (!params.schemaName || !params.getParams) {
     throw new NoRetryError(`getSchemaByName invalid parameters`);
   }
@@ -76,7 +75,10 @@ async function getSchemaByName(params) {
     Key: SCHEMA_NAME_PER_S3_PATH[params.schemaName](params.getParams)
   };
 
-  let [objectSchema] = await getObjectS3Shared(getDataParam);
+  let [objectSchema] = await getObjectS3Shared({
+    Bucket: getDataParam.Bucket,
+    Key: getDataParam.Key.result
+  });
 
 
   return objectSchema;