@izara_project/izara-core-library-service-schemas 1.0.100 → 1.0.101

package/src/IdentifiersObject.js

@@ -17,13 +17,13 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
-const { validateObjType } = require('@izara_project/izara-shared-service-schemas').validateObjType;
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+import { validateObjType } from '@izara_project/izara-shared-service-schemas';
 
-const deliminatorTree = require('./libs/DeliminatorTree');
-const getSchema = require('./GetObjectSchema')
-const { getUsedFieldNamesOfIdentifiers } = require('./Utils');
-const { STORAGE_TYPES, STORAGE_IDENTIFIER_TYPES, DEFAULT_IDENTIFIER_DELIMINATOR } = require('./Consts');
+import deliminatorTree from './libs/DeliminatorTree.js';
+import getSchema from './GetObjectSchema.js';
+import utils from './Utils.js';
+import consts from './Consts.js';
 
 
 /**
@@ -38,7 +38,7 @@ const { STORAGE_TYPES, STORAGE_IDENTIFIER_TYPES, DEFAULT_IDENTIFIER_DELIMINATOR
 function checkStorageTypeOfObjectSchemaIdentifiers(_izContext, objectSchema) {
 
   let objectSchemaStorageType;
-  for (const [storageType, identifierTypes] of Object.entries(STORAGE_IDENTIFIER_TYPES)) {
+  for (const [storageType, identifierTypes] of Object.entries(consts.STORAGE_IDENTIFIER_TYPES)) {
     if (identifierTypes.includes(objectSchema.identifiers[0].type)) {
       objectSchemaStorageType = storageType
     }
@@ -59,7 +59,7 @@ function checkStorageTypeOfObjectSchemaIdentifiers(_izContext, objectSchema) {
  * @returns {Promise<Object>}        - identifiersObject
  */
 async function identifiersFromObjInstanceBase(_izContext, objType, objInstanceBase, bucketName = process.env.iz_serviceSchemaBucketName) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("identifiersObjectFromBaseObjInstance: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`identifiersObjectFromBaseObjInstance: Invalid objType: ${validateObjTypeResult.errorsFound.join(', ')}`);
@@ -76,20 +76,20 @@ async function identifiersFromObjInstanceBase(_izContext, objType, objInstanceBa
   // check which baseObjInstance come from
   let storageOfBaseObjInstance;
 
-  if (checkStorageTypeOfObjectSchemaIdentifiers(_izContext, objSchema) === STORAGE_TYPES.graph) {
+  if (checkStorageTypeOfObjectSchemaIdentifiers(_izContext, objSchema) === consts.STORAGE_TYPES.graph) {
     const graphIdentifierName = Object.keys(deliminatorTreeResult)[0];
 
     if (objInstanceBase.hasOwnProperty(graphIdentifierName)) {
-      storageOfBaseObjInstance = STORAGE_TYPES.dynamoDB;
+      storageOfBaseObjInstance = consts.STORAGE_TYPES.dynamoDB;
     } else {
-      storageOfBaseObjInstance = STORAGE_TYPES.graph;
+      storageOfBaseObjInstance = consts.STORAGE_TYPES.graph;
     }
   }
 
 
   let explodedResults = {};
   // overwrite deliminatorTree if found
-  if (storageOfBaseObjInstance === STORAGE_TYPES.graph) {
+  if (storageOfBaseObjInstance === consts.STORAGE_TYPES.graph) {
     const identifierFieldNames = objSchema.identifiers[0].fieldNames || [objSchema.identifiers[0].fieldName];
 
     for (const identifierName of identifierFieldNames) {
@@ -145,7 +145,7 @@ async function identifiersFromObjInstanceBase(_izContext, objType, objInstanceBa
  * @returns {Promise<Object>}         - concatIdentifiersObject
  */
 async function identifiersBaseFromIdentifiers(_izContext, objType, identifiers, bucketName = process.env.iz_serviceSchemaBucketName) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("identifiersBaseFromIdentifiers: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`identifiersBaseFromIdentifiers: Invalid objType: ${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -158,7 +158,7 @@ async function identifiersBaseFromIdentifiers(_izContext, objType, identifiers,
 
   // validate identifiersObject
   // maybe validate with all deliminatorTree instead of identifiersName
-  const identifiersNames = getUsedFieldNamesOfIdentifiers(_izContext, objSchema.identifiers);
+  const identifiersNames = utils.getUsedFieldNamesOfIdentifiers(_izContext, objSchema.identifiers);
   _izContext.logger.debug("identifiersNames: ", identifiersNames);
 
   for (const identifierName of identifiersNames) {
@@ -201,7 +201,7 @@ async function identifiersBaseFromIdentifiers(_izContext, objType, identifiers,
  * @returns {Promise<Object>}         - refactoredObjInstance
  */
 async function objInstanceFromObjInstanceBase(_izContext, objType, objInstance, bucketName = process.env.iz_serviceSchemaBucketName) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("objInstanceFromObjInstanceBase: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`objInstanceFromObjInstanceBase: Invalid objType: ${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -236,7 +236,7 @@ async function objInstanceFromObjInstanceBase(_izContext, objType, objInstance,
  * @returns {Promise<String>}           - compositeIdentifier
  */
 async function identifiersConcatFromIdentifiers(_izContext, objType, identifiers, bucketName = process.env.iz_serviceSchemaBucketName) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("compositeIdentifierFromIdentifiersObject: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`compositeIdentifierFromIdentifiersObject: Invalid objType: ${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -250,7 +250,7 @@ async function identifiersConcatFromIdentifiers(_izContext, objType, identifiers
 
   // validate identifiersObject
   // maybe validate with all deliminatorTree instead of identifiersName
-  const identifiersNames = getUsedFieldNamesOfIdentifiers(_izContext, objSchema.identifiers,);
+  const identifiersNames = utils.getUsedFieldNamesOfIdentifiers(_izContext, objSchema.identifiers,);
   _izContext.logger.debug("identifiersNames: ", identifiersNames);
 
   for (const identifierName of identifiersNames) {
@@ -334,7 +334,7 @@ async function identifiersConcatFromIdentifiers(_izContext, objType, identifiers
  * @returns {Promise<Object>}             - identifiersObject
  */
 async function identifiersFromIdentifiersConcat(_izContext, objType, identifiersConcat, bucketName = process.env.iz_serviceSchemaBucketName) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("identifiersObjectFromCompositeIdentifier: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`identifiersObjectFromCompositeIdentifier: Invalid objType: ${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -435,7 +435,7 @@ async function createNestedIdentifiersConcat(
   prefixes = [],
   suffixes = [],
   level = 1,
-  deliminator = DEFAULT_IDENTIFIER_DELIMINATOR,
+  deliminator = consts.DEFAULT_IDENTIFIER_DELIMINATOR,
 ) {
 
   const strNotEmptyRegex = /^[a-zA-Z0-9_-]+$/;
@@ -448,7 +448,7 @@ async function createNestedIdentifiersConcat(
     throw new NoRetryError(`one of prefixes and suffixes should exists`);
   }
 
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createConcatIdentifier: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`createConcatIdentifier: Invalid objType: ${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -465,7 +465,7 @@ async function createNestedIdentifiersConcat(
     ? deliminatorTreeCompositeIdentifier.deliminatorList[deliminator]
     : 0;
 
-  // start conatenate data
+  // start concatenate data
   const concatenatedIdentifier = [...prefixes, identifiersConcat, ...suffixes].join(deliminator.repeat(compositeDeliminatorAmount + level));
 
   return concatenatedIdentifier;
@@ -478,7 +478,7 @@ async function explodedNestedIdentifiersConcat(
   concatIdentifier,
   bucketName = process.env.iz_serviceSchemaBucketName,
   level = 1,
-  deliminator = DEFAULT_IDENTIFIER_DELIMINATOR,
+  deliminator = consts.DEFAULT_IDENTIFIER_DELIMINATOR,
 ) {
 
   const strNotEmptyRegex = /^[a-zA-Z0-9_-]+$/;
@@ -487,7 +487,7 @@ async function explodedNestedIdentifiersConcat(
     throw new NoRetryError(`invalid compositeIdentifier`);
   }
 
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("explodedConcatIdentifier: Invalid objType: ", validateObjTypeResult.errorsFound);
     throw new NoRetryError(`explodedConcatIdentifier: Invalid objType: ${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -509,7 +509,7 @@ async function explodedNestedIdentifiersConcat(
 
 
 
-module.exports = {
+export default {
   identifiersFromObjInstanceBase,
   identifiersBaseFromIdentifiers, // concatIdentifiersObjectFromIdentifiersObject
   objInstanceFromObjInstanceBase, // refactoredObjInstanceFromBaseObjInstance

package/src/ServiceConfig.js

@@ -17,16 +17,11 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
 
-const { inMemoryCacheLib } = require('@izara_project/izara-core-library-core');
-
-const {
-  OBJECT_SCHEMA_BUCKET_NAME,
-  UPLOAD_PATH_S3,
-} = require('./Consts');
-
-const { getObjectS3 } = require("./libs/s3Utils")
+import { inMemoryCacheLib } from '@izara_project/izara-core-library-core';
+import consts from './Consts.js'
+import s3Utils from "./libs/s3Utils.js"
 
 /**
  * get serviceName in s3 depend on serviceTag
@@ -42,12 +37,12 @@ async function getServiceName(
   _izContext.logger.debug("getServiceName: ", serviceTag)
 
   const getObjectParam = {
-    Bucket: process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME,
-    Key: UPLOAD_PATH_S3.serviceName(_izContext, serviceTag),
+    Bucket: process.env.iz_serviceSchemaBucketName || consts.OBJECT_SCHEMA_BUCKET_NAME,
+    Key: consts.UPLOAD_PATH_S3.serviceName(_izContext, serviceTag),
   };
   _izContext.logger.debug("getObjectParam", getObjectParam)
 
-  const [bodyResponse] = await getObjectS3(_izContext, getObjectParam);
+  const [bodyResponse] = await s3Utils.getObjectS3(_izContext, getObjectParam);
 
   if (!bodyResponse) {
     return null;
@@ -82,15 +77,15 @@ const getServiceNameWithCache = inMemoryCacheLib(
 async function getGraphServiceTag(
   _izContext,
   graphServerTag,
-  bucketName = process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME
+  bucketName = process.env.iz_serviceSchemaBucketName || consts.OBJECT_SCHEMA_BUCKET_NAME
 ) {
 
   // get all graph serverTag
-  let [serverTags] = await getObjectS3(
+  let [serverTags] = await s3Utils.getObjectS3(
     _izContext,
     {
       Bucket: bucketName,
-      Key: UPLOAD_PATH_S3.graphServerTagsConfig
+      Key: consts.UPLOAD_PATH_S3.graphServerTagsConfig
     }
   );
 
@@ -170,7 +165,7 @@ const getGraphServiceNameFromGraphServerTagWithCache = inMemoryCacheLib(
 
 
 
-module.exports = {
+export default {
   getServiceName,
   getServiceNameWithCache,
 

package/src/SharedUtils.js

@@ -17,20 +17,14 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
+import sharedUtilsLibs from './libs/SharedUtilsLibs.js'
+import s3Utils from "./libs/s3Utils.js";
 
-const {
-  validateGraphServerTags,
-  mergeStorageResources,
-  getStorageResources,
-  validateObjectLinksInput
-} = require('./libs/SharedUtilsLibs');
-const { getObjectS3 } = require("./libs/s3Utils");
-
-const { getObjSchemaS3WithCache } = require("./GetObjectSchema");
-const { createLinkTypeId } = require('./Utils');
-const { uploadObjectToS3 } = require('./UploadObjSchema');
-const { OBJECT_SCHEMA_BUCKET_NAME, UPLOAD_PATH_S3 } = require('./Consts');
+import getObjectSchema from './GetObjectSchema.js';
+import utils from './Utils.js';
+import uploadObjectToS3 from './UploadObjSchema.js';
+import consts from './Consts.js'
 
 /**
  * Function to add links between objects
@@ -44,7 +38,7 @@ async function addLinks(_izContext, relationshipTag, objectLinks) {
   // objectLinks = { relType, firstNode, secondNode, graphServerTags, direction }
   try {
     // ** == validate input ==
-    validateObjectLinksInput(objectLinks);
+    sharedUtilsLibs.validateObjectLinksInput(objectLinks);
 
     // ** == process each group of objectLinks ==
     const results = await _processObjectLinksGroup(
@@ -87,12 +81,12 @@ async function _processNodeRelationships(
 
   // Get object relationships from S3
   const getObjRelPathParam = {
-    Bucket: bucketName ? bucketName : OBJECT_SCHEMA_BUCKET_NAME,
-    Key: UPLOAD_PATH_S3.objectRelationship(_izContext, node.objType)
+    Bucket: bucketName ? bucketName : consts.OBJECT_SCHEMA_BUCKET_NAME,
+    Key: consts.UPLOAD_PATH_S3.objectRelationship(_izContext, node.objType)
   };
   _izContext.logger.debug('==> getObjRelPathParam:', getObjRelPathParam);
 
-  const [objectRelationshipsArray] = await getObjectS3(_izContext, getObjRelPathParam);
+  const [objectRelationshipsArray] = await s3Utils.getObjectS3(_izContext, getObjRelPathParam);
   _izContext.logger.debug(`Object relationships for ${isBase ? 'base' : 'other'} node:`,
     JSON.stringify(objectRelationshipsArray, null, 2));
 
@@ -148,7 +142,7 @@ async function _processNodeRelationships(
 
     // Merge storage resources if available
     if (newLinkRelSchema.storageResources) {
-      updatedObjRel.storageResources = mergeStorageResources(
+      updatedObjRel.storageResources = sharedUtilsLibs.mergeStorageResources(
         existingObjRel.storageResources || {},
         newLinkRelSchema.storageResources
       );
@@ -163,7 +157,7 @@ async function _processNodeRelationships(
     _izContext.logger.debug('=> CASE: No existing relationship found - create new one');
 
     // Create storage resources data
-    const storageResourcesData = getStorageResources(relationshipSchema, storageResourceTags);
+    const storageResourcesData = sharedUtilsLibs.getStorageResources(relationshipSchema, storageResourceTags);
 
     // Create new relationship
     const newRelationship = {
@@ -238,11 +232,11 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
       relationshipTag: relationshipTag,
       serviceTag: process.env.iz_serviceTag
     };
-    const [relationshipSchema, rawRelationshipSchema] = await getObjectS3(
+    const [relationshipSchema, rawRelationshipSchema] = await s3Utils.getObjectS3(
       _izContext,
       {
         Bucket: process.env.iz_serviceSchemaBucketName,
-        Key: UPLOAD_PATH_S3.relationshipTag(_izContext, relType)
+        Key: consts.UPLOAD_PATH_S3.relationshipTag(_izContext, relType)
       }
     );
     const ETagRelSchema = rawRelationshipSchema.ETag;
@@ -283,8 +277,8 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         _izContext.logger.debug('createObjectRelationshipConfig:', createObjectRelationshipConfig);
 
         // ** get object schema for firstNode and secondNode
-        let firstNodeObjSchema = await getObjSchemaS3WithCache(_izContext, firstNode.objType);
-        let secondNodeObjSchema = await getObjSchemaS3WithCache(_izContext, secondNode.objType);
+        let firstNodeObjSchema = await getObjectSchema.getObjSchemaS3WithCache(_izContext, firstNode.objType);
+        let secondNodeObjSchema = await getObjectSchema.getObjSchemaS3WithCache(_izContext, secondNode.objType);
         _izContext.logger.debug(`
           firstNodeObjSchema: ${JSON.stringify(firstNodeObjSchema, null, 2)}
           , secondNodeObjSchema: ${JSON.stringify(secondNodeObjSchema, null, 2)}`);
@@ -292,7 +286,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         // ? Validate the graph server tags
         // returns an array of error messages if validation fails
         // example: ['relationship schema missing tags: tag1, tag2', 'firstNode schema missing tags: tag3']
-        const storageResourceTags = validateGraphServerTags(
+        const storageResourceTags = sharedUtilsLibs.validateGraphServerTags(
           graphServerTags,
           relationshipSchema,
           firstNodeObjSchema,
@@ -428,7 +422,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
 
         // TODO-Part: Create LinkTypeId
         // Create linkTypeId for the relationship
-        const linkTypeId = createLinkTypeId(
+        const linkTypeId = utils.createLinkTypeId(
           _izContext,
           firstNode.objType,
           secondNode.objType,
@@ -536,9 +530,9 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
     try {
       _izContext.logger.debug('Uploading new relationship schema...');
       await Promise.all([
-        uploadObjectToS3(
+        uploadObjectToS3.uploadObjectToS3(
           _izContext,
-          UPLOAD_PATH_S3.relationshipTag(
+          consts.UPLOAD_PATH_S3.relationshipTag(
             _izContext,
             relType
           ),
@@ -598,9 +592,9 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
 
 
     const objectRelationshipPromises = Object.values(newObjectRelationships).map(({ objType, relationships }) =>
-      uploadObjectToS3(
+      uploadObjectToS3.uploadObjectToS3(
         _izContext,
-        UPLOAD_PATH_S3.objectRelationship(_izContext, objType),
+        consts.UPLOAD_PATH_S3.objectRelationship(_izContext, objType),
         relationships,
       )
     );
@@ -612,9 +606,9 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
 
       const uploadPromises = [
         ...linkByLinkTypeIds.map(({ linkTypeId, link }) =>
-          uploadObjectToS3(
+          uploadObjectToS3.uploadObjectToS3(
             _izContext,
-            UPLOAD_PATH_S3.linkByLinkTypeId(
+            consts.UPLOAD_PATH_S3.linkByLinkTypeId(
               _izContext,
               process.env.iz_serviceTag,
               linkTypeId
@@ -647,6 +641,4 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
   }
 }
 
-module.exports = {
-  addLinks,
-};
+export default { addLinks };