@izara_project/izara-core-library-service-schemas 1.0.79 → 1.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.79",
+  "version": "1.0.81",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,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.23",
+    "@izara_project/izara-shared-service-schemas": "^1.0.24",
     "glob": "^11.0.3",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",

package/src/GetObjectSchema.js

@@ -504,9 +504,9 @@ const getObjSchemaS3WithCache = inMemoryCacheLib(
  * @see  {@link getObjSchemaS3WithCache}
  *
  */
-async function getObjSchemaS3WithHierarchy(_izContext, objType) {
+async function getObjSchemaS3WithHierarchy(_izContext, objType, bucketName = process.env.iz_serviceSchemaBucketName) {
   // return await getObjSchemaS3WithCache(_izContext, objType, true)
-  return await getObjSchemaWithHierarchy(getSchemaByNameWithCache, objType, process.env.iz_serviceSchemaBucketName).then(res => {
+  return await getObjSchemaWithHierarchy(getSchemaByNameWithCache, objType, bucketName).then(res => {
     if (res.errorsFound.length && res.errorsFound.length > 0) {
       throw new NoRetryError(res.errorsFound.join(","))
     } else {
@@ -521,9 +521,9 @@ async function getObjSchemaS3WithHierarchy(_izContext, objType) {
  * @see  {@link getObjSchemaS3}
  * @see  {@link getObjSchemaS3WithCache}
  */
-async function getObjSchemaS3WithoutHierarchy(_izContext, objType) {
+async function getObjSchemaS3WithoutHierarchy(_izContext, objType, bucketName = process.env.iz_serviceSchemaBucketName) {
   // return await getObjSchemaS3WithCache(_izContext, objType, false)
-  return await getObjSchemaWithoutHierarchy(getSchemaByNameWithCache, objType, process.env.iz_serviceSchemaBucketName).then(res => {
+  return await getObjSchemaWithoutHierarchy(getSchemaByNameWithCache, objType, bucketName).then(res => {
     if (res.errorsFound.length && res.errorsFound.length > 0) {
       throw new NoRetryError(res.errorsFound.join(","))
     } else {
@@ -639,8 +639,8 @@ function getLocalRelationshipSchemas(_izContext, relationshipTags, objSchemaPath
  * @param {String} objType.serviceTag
  * @returns {Promise<Object>}                 - reference relationship schema of objType
  */
-async function getRefObjectRelationship(_izContext, objType) {
-  return await getRefObjectRelationshipShared(getSchemaByNameWithCache, objType, process.env.iz_serviceSchemaBucketName).then(res => {
+async function getRefObjectRelationship(_izContext, objType, bucketName = process.env.iz_serviceSchemaBucketName) {
+  return await getRefObjectRelationshipShared(getSchemaByNameWithCache, objType, bucketName).then(res => {
     if (res.errorsFound.length && res.errorsFound.length > 0) {
       throw new NoRetryError(res.errorsFound.join(","))
     } else {
@@ -674,8 +674,8 @@ const getRefObjectRelationshipWithCache = inMemoryCacheLib(
  * @returns {Promise<{item:object|null,location:string|null}>}  - item: relationship data, location: actual serviceTag that relationship located
  *
  */
-async function getRelationshipSchema(_izContext, relType) {
-  return await getRelationshipSchemaShared(getSchemaByNameWithCache, relType, process.env.iz_serviceSchemaBucketName).then(res => {
+async function getRelationshipSchema(_izContext, relType, bucketName = process.env.iz_serviceSchemaBucketName) {
+  return await getRelationshipSchemaShared(getSchemaByNameWithCache, relType, bucketName).then(res => {
     if (res.errorsFound.length && res.errorsFound.length > 0) {
       throw new NoRetryError(res.errorsFound.join(","))
     } else {

package/src/ServiceConfig.js

@@ -82,13 +82,14 @@ const getServiceNameWithCache = inMemoryCacheLib(
 async function getGraphServiceTag(
   _izContext,
   graphServerTag,
+  bucketName = process.env.iz_serviceSchemaBucketName
 ) {
 
   // get all graph serverTag
   let [serverTags] = await getObjectS3(
     _izContext,
     {
-      Bucket: process.env.iz_serviceSchemaBucketName,
+      Bucket: bucketName,
       Key: UPLOAD_PATH_S3.graphServerTagsConfig
     }
   );

package/src/SharedUtils.js

@@ -475,7 +475,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
               storageResourceTags,
               objectRelationships,
               relationshipSchema,
-              bucketName
+              process.env.iz_serviceSchemaBucketName
             );
             results.push(...firstNodeResults);
           } catch (error) {

package/src/UploadObjSchema.js

@@ -93,7 +93,7 @@ async function uploadObjectToS3(
   const Key = pathToUpload
 
   let data = {
-    Bucket: process.env.iz_serviceSchemaBucketName,
+    Bucket: process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME,
     Key,
     Body: buffer,
     ContentEncoding: 'base64',

package/src/ValidatorSchema.js

@@ -466,7 +466,7 @@ async function generateValidatorSchemaForCreate(_izContext, objType, settings =
   // ------- create return validatorSchema -------
   let validatorSchemaForCreate = {
     type: "object",
-    required: ["fieldNames"],
+    required: ["fieldNames", "objectType"],
     properties: {
       fieldNames: {
         additionalProperties: false,
@@ -476,6 +476,10 @@ async function generateValidatorSchemaForCreate(_izContext, objType, settings =
           ...allValidatorSchemaFieldNames
         }
       },
+      objectType: {
+        type: "string",
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
       additionalParams: {
         type: "object"
       }
@@ -555,8 +559,12 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
 
   let initialValidatorSchemaForUpdate = {
     type: "object",
-    required: ["objInstanceFull"],
+    required: ["objInstanceFull", "objectType"],
     properties: {
+      objectType: {
+        type: "string",
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
       objInstanceFull: {
         type: "object",
         required: ["identifiers", "fields"],
@@ -640,8 +648,12 @@ async function generateValidatorSchemaForIdentifier(_izContext, objType, setting
 
   return {
     type: "object",
-    required: ["identifiers"],
+    required: ["identifiers", "objectType"],
     properties: {
+      objectType: {
+        type: "string",
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
       identifiers: {
         type: "object",
         required: Object.keys(generatedIdentifiersValidatorSchema),
@@ -969,7 +981,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             const storageResource = objSchema.storageResources[storageTag];
 
             if (storageResource.storageType === STORAGE_TYPES.graph) {
-              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag);
+              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag, iz_serviceSchemaBucketName);
 
               if (!graphServiceTag) {
                 validateStatus.status = false;
@@ -1040,7 +1052,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             const storageResource = relData.storageResources[storageTag];
 
             if (storageResource.storageType === STORAGE_TYPES.graph) {
-              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag);
+              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag, iz_serviceSchemaBucketName);
 
               if (!graphServiceTag) {
                 validateStatus.status = false;

package/src/libs/DeliminatorTree.js

@@ -43,11 +43,10 @@ async function generateDeliminatorTreePerFieldName(_izContext, fieldName, fieldN
     [fieldName]: {},
   };
 
-  if (Object.keys(objType).length) {
+  if (objType) {
     Object.assign(deliminatorTree[fieldName], objType);
   }
 
-
   // ------- create tree first -------
 
   if (fieldNameSetting.fromServiceNameTag && fieldNameSetting.fromObjectType) {

package/src/libs/s3Utils.js

@@ -62,7 +62,7 @@ async function getObjectS3Shared(param) {
 
 
 
-async function getSchemaByName(params) {
+async function getSchemaByName(params, bucketName) {
   if (!params.schemaName || !params.getParams) {
     throw new NoRetryError(`getSchemaByName invalid parameters`);
   }
@@ -73,7 +73,7 @@ async function getSchemaByName(params) {
 
   // build params for getObjectS3
   let getDataParam = {
-    Bucket: process.env.iz_serviceSchemaBucketName,
+    Bucket: bucketName || process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME,
     Key: SCHEMA_NAME_PER_S3_PATH[params.schemaName](params.getParams)
   };