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

package/src/UploadObjSchema.js

@@ -17,62 +17,14 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError;
-const lambda = require('@izara_project/izara-core-library-external-request').lambda
-const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
-
-const {
-  OBJECT_SCHEMA_BUCKET_NAME,
-  LOCAL_OBJECT_SCHEMA_PATH,
-
-  PREFIX_PATH_S3,
-  UPLOAD_PATH_S3,
-
-
-  LOCAL_FILENAME,
-  STORAGE_TYPES
-} = require("./Consts")
-
-const {
-  getLocalObjectSchemas,
-  getAllLocalObjectSchemasWithoutHierarchy,
-  getDataFromPath,
-  getAllLocalFlowSchemas,
-  getAllLocalRelationshipSchema,
-  getAllLocalRefObjectRelationshipSchema,
-  getLambdaFunctionNames,
-
-} = require("./GetObjectSchema");
-
-const {
-  validateObjectSchema,
-  validateRelationshipSchema,
-  validateRefRelationshipSchema,
-  validateBasicFlowSchema,
-  getApiLinksV2
-} = require('./Utils')
-
-const {
-  DEFAULT_REL_ID_SETTING,
-  // ORIGIN_TIMESTAMP_FIELDNAME,
-  generateObjectSchemaForCreate,
-  generateObjectSchemaForUpdate,
-  generateObjectSchemaForCombineFieldNames,
-
-  groupLinksPerObjectType,
-  generateLinksDataPerLinkTypeId,
-  groupRefObjectRelPerObjectType,
-
-  refRelationshipPerObjectSchema
-} = require('./libs/UploadUseCase');
-
-
-const {
-  putObjectS3,
-  listObjectsV2,
-  deleteObjects
-} = require('./libs/s3Utils');
-
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+import { lambda } from '@izara_project/izara-core-library-external-request';
+import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
+import consts from './Consts.js';
+import getObjectSchema from './GetObjectSchema.js';
+import utils from './Utils.js';
+import uploadUseCase from './libs/UploadUseCase.js';
+import s3Utils from './libs/s3Utils.js';
 
 /**
  * upload javascripts object to s3
@@ -93,7 +45,7 @@ async function uploadObjectToS3(
   const Key = pathToUpload
 
   let data = {
-    Bucket: process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME,
+    Bucket: process.env.iz_serviceSchemaBucketName || consts.OBJECT_SCHEMA_BUCKET_NAME,
     Key,
     Body: buffer,
     ContentEncoding: 'base64',
@@ -103,7 +55,7 @@ async function uploadObjectToS3(
 
   try {
     // await s3.putObject(data).promise();
-    await putObjectS3(_izContext, data);
+    await s3Utils.putObjectS3(_izContext, data);
   } catch (error) {
     throw Error(error);
   }
@@ -132,8 +84,8 @@ async function emptyS3Path(
     Prefix: bucketPath
   };
 
-  // const listedObjects = await s3.listObjectsV2(listParams).promise();
-  const listedObjects = await listObjectsV2(_izContext, listParams);
+  // const listedObjects = await s3.s3Utils.listObjectsV2(listParams).promise();
+  const listedObjects = await s3Utils.listObjectsV2(_izContext, listParams);
 
   _izContext.logger.debug("listedObjects: ", listedObjects);
 
@@ -148,8 +100,8 @@ async function emptyS3Path(
     deleteParams.Delete.Objects.push({ Key });
   });
 
-  // await s3.deleteObjects(deleteParams).promise();
-  await deleteObjects(_izContext, deleteParams);
+  // await s3.s3Utils.deleteObjects(deleteParams).promise();
+  await s3Utils.deleteObjects(_izContext, deleteParams);
 
   // if path not empty yet will start delete again
   if (listedObjects.IsTruncated) {
@@ -168,20 +120,20 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
 
   const objectTypesForCreate = [];
 
-  const allObjectSchemasResult = await getAllLocalObjectSchemasWithoutHierarchy(_izContext);
+  const allObjectSchemasResult = await getObjectSchema.getAllLocalObjectSchemasWithoutHierarchy(_izContext);
   // console.log("allObjectSchemasResult: ", allObjectSchemasResult);
   const allObjectSchema = await allObjectSchemasResult.records;
-  // const allObjectRelationships = getDataFromPath(_izContext, LOCAL_FILENAME.OBJECT_RELATIONSHIPS, LOCAL_OBJECT_SCHEMA_PATH, { fileLimit: 1 })[0] || [];
-  // const allReferenceObjectRelationships = getDataFromPath(_izContext, LOCAL_FILENAME.REFERENCE_OBJECT_RELATIONSHIPS, LOCAL_OBJECT_SCHEMA_PATH, { fileLimit: 1 })[0] || [];
-  const allFlowSchemas = await getAllLocalFlowSchemas(_izContext).then(res => res.records);
+  // const allObjectRelationships = getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_RELATIONSHIPS, consts.LOCAL_OBJECT_SCHEMA_PATH, { fileLimit: 1 })[0] || [];
+  // const allReferenceObjectRelationships = getDataFromPath(_izContext, consts.LOCAL_FILENAME.REFERENCE_OBJECT_RELATIONSHIPS, consts.LOCAL_OBJECT_SCHEMA_PATH, { fileLimit: 1 })[0] || [];
+  const allFlowSchemas = await getObjectSchema.getAllLocalFlowSchemas(_izContext).then(res => res.records);
 
-  const allObjectRelationships = getAllLocalRelationshipSchema(_izContext)
-  const allReferenceObjectRelationships = getAllLocalRefObjectRelationshipSchema(_izContext)
-  let refRelationshipPerObjectType = groupRefObjectRelPerObjectType(_izContext, allReferenceObjectRelationships);
+  const allObjectRelationships = getObjectSchema.getAllLocalRelationshipSchema(_izContext)
+  const allReferenceObjectRelationships = getObjectSchema.getAllLocalRefObjectRelationshipSchema(_izContext)
+  let refRelationshipPerObjectType = uploadUseCase.groupRefObjectRelPerObjectType(_izContext, allReferenceObjectRelationships);
   _izContext.logger.debug("refRelationshipPerObjectType: ", refRelationshipPerObjectType);
 
 
-  const lambdaFunctions = await getLambdaFunctionNames(_izContext);
+  const lambdaFunctions = await getObjectSchema.getLambdaFunctionNames(_izContext);
   _izContext.logger.debug("lambdaFunctions: ", lambdaFunctions);
 
   const foundedObjectTypes = allObjectSchema.map(objectSchema => objectSchema.objectType);
@@ -190,7 +142,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
   // validate all schema
   let validateErrors = [];
   for (let objSchema of allObjectSchema) {
-    let [status, errors] = validateObjectSchema(_izContext, objSchema);
+    let [status, errors] = utils.validateObjectSchema(_izContext, objSchema);
 
     if (!status) {
       validateErrors.push(errors);
@@ -198,29 +150,29 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
   }
 
   for (let relSchema of allObjectRelationships) {
-    let [status, errors] = validateRelationshipSchema(_izContext, relSchema);
+    let [status, errors] = utils.validateRelationshipSchema(_izContext, relSchema);
     if (!status) {
       validateErrors.push(errors);
     } else {
       let relSchemaData = Object.values(relSchema)[0];
       _izContext.logger.debug("each rel: ", relSchemaData);
       _izContext.logger.debug("relSchemaData.fieldNames: ", relSchemaData.fieldNames);
-      _izContext.logger.debug("DEFAULT_REL_ID_SETTING: ", DEFAULT_REL_ID_SETTING);
+      _izContext.logger.debug("DEFAULT_REL_ID_SETTING: ", uploadUseCase.DEFAULT_REL_ID_SETTING);
 
-      Object.assign(relSchemaData.fieldNames, DEFAULT_REL_ID_SETTING);
-      // Object.assign(relSchemaData.fieldNames, DEFAULT_REL_ID_SETTING, ORIGIN_TIMESTAMP_FIELDNAME);
+      Object.assign(relSchemaData.fieldNames, uploadUseCase.DEFAULT_REL_ID_SETTING);
+      // Object.assign(relSchemaData.fieldNames, uploadUseCase.DEFAULT_REL_ID_SETTING, ORIGIN_TIMESTAMP_FIELDNAME);
     }
   }
 
   for (let refRelSchema of allReferenceObjectRelationships) {
-    let [status, errors] = validateRefRelationshipSchema(_izContext, refRelSchema);
+    let [status, errors] = utils.validateRefRelationshipSchema(_izContext, refRelSchema);
     if (!status) {
       validateErrors.push(errors);
     }
   }
 
   for (let flowSchema of allFlowSchemas) {
-    let [status, errors] = validateBasicFlowSchema(_izContext, flowSchema);
+    let [status, errors] = utils.validateBasicFlowSchema(_izContext, flowSchema);
 
     if (!status) {
       validateErrors.push(errors)
@@ -234,14 +186,14 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
   // end validate all schema
 
   // delete all file in servicePath before upload
-  await emptyS3Path(_izContext, process.env.iz_serviceSchemaBucketName, `${PREFIX_PATH_S3.perServiceSchemas}/${process.env.iz_serviceTag}/`);
+  await emptyS3Path(_izContext, process.env.iz_serviceSchemaBucketName, `${consts.PREFIX_PATH_S3.perServiceSchemas}/${process.env.iz_serviceTag}/`);
 
 
   if (lambdaFunctions) {
     uploadList.push(
       uploadObjectToS3(
         _izContext,
-        UPLOAD_PATH_S3.lambdaFunctions(_izContext, process.env.iz_serviceTag),
+        consts.UPLOAD_PATH_S3.lambdaFunctions(_izContext, process.env.iz_serviceTag),
         lambdaFunctions
       )
     );
@@ -251,7 +203,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
   uploadList.push(
     uploadObjectToS3(
       _izContext,
-      UPLOAD_PATH_S3.serviceName(_izContext, process.env.iz_serviceTag),
+      consts.UPLOAD_PATH_S3.serviceName(_izContext, process.env.iz_serviceTag),
       { serviceName: process.env.iz_serviceName }
     )
   );
@@ -263,7 +215,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     uploadList.push(
       uploadObjectToS3(
         _izContext,
-        UPLOAD_PATH_S3.objectSchemaAll(
+        consts.UPLOAD_PATH_S3.objectSchemaAll(
           _izContext,
           {
             serviceTag: process.env.iz_serviceTag,
@@ -280,7 +232,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     // uploadList.push(
     //   uploadObjectToS3(
     //     _izContext,
-    //     UPLOAD_PATH_S3.objectSchemaCreate(
+    //     consts.UPLOAD_PATH_S3.objectSchemaCreate(
     //       _izContext,
     //       {
     //         serviceTag: process.env.iz_serviceTag,
@@ -299,7 +251,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     // uploadList.push(
     //   uploadObjectToS3(
     //     _izContext,
-    //     UPLOAD_PATH_S3.objectSchemaDisplay(
+    //     consts.UPLOAD_PATH_S3.objectSchemaDisplay(
     //       _izContext,
     //       {
     //         serviceTag: process.env.iz_serviceTag,
@@ -317,7 +269,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     // uploadList.push(
     //   uploadObjectToS3(
     //     _izContext,
-    //     UPLOAD_PATH_S3.objectSchemaCombineFieldNames(
+    //     consts.UPLOAD_PATH_S3.objectSchemaCombineFieldNames(
     //       _izContext,
     //       {
     //         serviceTag: process.env.iz_serviceTag,
@@ -331,12 +283,12 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     // upload to refObjectRelationships for each objectType that have createBy at UserAccount Service and belongTo
     let existsRefObjectRel = refRelationshipPerObjectType[objSchema.objectType];
     if (existsRefObjectRel) {
-      Object.assign(existsRefObjectRel, await refRelationshipPerObjectSchema(_izContext, objSchema));
+      Object.assign(existsRefObjectRel, await uploadUseCase.refRelationshipPerObjectSchema(_izContext, objSchema));
 
       uploadList.push(
         uploadObjectToS3(
           _izContext,
-          UPLOAD_PATH_S3.refObjectRelationship(_izContext,
+          consts.UPLOAD_PATH_S3.refObjectRelationship(_izContext,
             {
               objectType: objSchema.objectType,
               serviceTag: process.env.iz_serviceTag
@@ -348,20 +300,20 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     } else {
       // add new rule if objectType is not have storageType graph not upload to refObjectRelationships
       if (!objSchema.storageResources || !Object.values(objSchema.storageResources)
-        .some(storageResource => storageResource.storageType === STORAGE_TYPES.graph)) {
+        .some(storageResource => storageResource.storageType === consts.STORAGE_TYPES.graph)) {
         continue;
       }
 
       uploadList.push(
         uploadObjectToS3(
           _izContext,
-          UPLOAD_PATH_S3.refObjectRelationship(_izContext,
+          consts.UPLOAD_PATH_S3.refObjectRelationship(_izContext,
             {
               objectType: objSchema.objectType,
               serviceTag: process.env.iz_serviceTag
             }
           ),
-          await refRelationshipPerObjectSchema(_izContext, objSchema)
+          await uploadUseCase.refRelationshipPerObjectSchema(_izContext, objSchema)
         )
       )
     }
@@ -373,16 +325,16 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
   uploadList.push(
     uploadObjectToS3(
       _izContext,
-      UPLOAD_PATH_S3.objectListAll(_izContext, process.env.iz_serviceTag),
+      consts.UPLOAD_PATH_S3.objectListAll(_izContext, process.env.iz_serviceTag),
       foundedObjectTypes
     )
   );
 
-  let apiLinks = await getApiLinksV2(foundedObjectTypes);
+  let apiLinks = await utils.getApiLinksV2(foundedObjectTypes);
   uploadList.push(
     uploadObjectToS3(
       _izContext,
-      UPLOAD_PATH_S3.getEndpointPerService(_izContext, process.env.iz_serviceTag),
+      consts.UPLOAD_PATH_S3.getEndpointPerService(_izContext, process.env.iz_serviceTag),
       apiLinks
     )
   )
@@ -397,7 +349,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     let graphServerTags = new Set();
 
     for (const storageResources of Object.values(objectSchema.storageResources)) {
-      if (storageResources.storageType === STORAGE_TYPES.graph) {
+      if (storageResources.storageType === consts.STORAGE_TYPES.graph) {
         graphServerTags.add(storageResources.graphServerTag);
       }
     }
@@ -483,7 +435,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       uploadList.push(
         uploadObjectToS3(
           _izContext,
-          UPLOAD_PATH_S3.relationshipTag(
+          consts.UPLOAD_PATH_S3.relationshipTag(
             _izContext,
             {
               serviceTag: process.env.iz_serviceTag,
@@ -498,13 +450,13 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       );
 
       // upload per linkTypeId
-      const linksData = generateLinksDataPerLinkTypeId(_izContext, relationshipTag, relTagDetail[relationshipTag]);
+      const linksData = uploadUseCase.generateLinksDataPerLinkTypeId(_izContext, relationshipTag, relTagDetail[relationshipTag]);
 
       for (const [linkTypeId, link] of Object.entries(linksData)) {
         uploadList.push(
           uploadObjectToS3(
             _izContext,
-            UPLOAD_PATH_S3.linkByLinkTypeId(_izContext, process.env.iz_serviceTag, linkTypeId),
+            consts.UPLOAD_PATH_S3.linkByLinkTypeId(_izContext, process.env.iz_serviceTag, linkTypeId),
             link
           )
         );
@@ -512,7 +464,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
 
       // send params to translateIds to create permission fpr query dynamoDB
       for (const [storageResourceTag, storageResource] of Object.entries(relTagDetail[relationshipTag].storageResources)) {
-        if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+        if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
           for (const link of relTagDetail[relationshipTag].links) {
             if (link.storageResourceTags.includes(storageResourceTag)) {
               setRelationships.add(
@@ -537,13 +489,13 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       )
     }
 
-    const linksPerObjectType = groupLinksPerObjectType(_izContext, allObjectRelationships, foundedObjectTypes)
+    const linksPerObjectType = uploadUseCase.groupLinksPerObjectType(_izContext, allObjectRelationships, foundedObjectTypes)
 
     for (const [relObjectType, relTagsData] of Object.entries(linksPerObjectType)) {
       uploadList.push(
         uploadObjectToS3(
           _izContext,
-          UPLOAD_PATH_S3.objectRelationship(_izContext, { serviceTag: process.env.iz_serviceTag, objectType: relObjectType }),
+          consts.UPLOAD_PATH_S3.objectRelationship(_izContext, { serviceTag: process.env.iz_serviceTag, objectType: relObjectType }),
           relTagsData
         )
       );
@@ -555,12 +507,12 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
 
   // // upload refObjectRelationships
   // if (allReferenceObjectRelationships) {
-  //   const refPerObjectType = groupRefObjectRelPerObjectType(_izContext, allReferenceObjectRelationships)
+  //   const refPerObjectType = uploadUseCase.groupRefObjectRelPerObjectType(_izContext, allReferenceObjectRelationships)
   //   for (const [refObjectType, refRelsData] of Object.entries(refPerObjectType)) {
   //     uploadList.push(
   //       uploadObjectToS3(
   //         _izContext,
-  //         UPLOAD_PATH_S3.refObjectRelationship(_izContext, { serviceTag: process.env.iz_serviceTag, objectType: refObjectType }),
+  //         consts.UPLOAD_PATH_S3.refObjectRelationship(_izContext, { serviceTag: process.env.iz_serviceTag, objectType: refObjectType }),
   //         refRelsData
   //       )
   //     );
@@ -573,7 +525,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       uploadList.push(
         uploadObjectToS3(
           _izContext,
-          UPLOAD_PATH_S3.flowSchema(_izContext,
+          consts.UPLOAD_PATH_S3.flowSchema(_izContext,
             {
               serviceTag: process.env.iz_serviceTag,
               flowTag: flowSchema.flowTag
@@ -589,7 +541,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
 }
 
 
-module.exports = {
+export default {
   uploadObjectSchemaByUseCase,
   uploadObjectToS3,
   emptyS3Path

package/src/Utils.js

@@ -17,47 +17,26 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const hash = require('@izara_project/izara-shared-core').objectHash;
-const {
+import { objectHash as hash } from '@izara_project/izara-shared-core';
+import {
   NoRetryError,
-  validator: { validateObject }
-} = require('@izara_project/izara-core-library-core');
-
-const {
-  basicValidatorSchema: {
-    basicObjectSchema,
-    basicExtendObjectSchema,
-    relationshipBasicSchema,
-    refRelationshipBasicSchema,
-    basicFlowSchema
-  },
-  validateObjType: {
-    validateObjType,
-    validateRelType,
-    validateFlowType
-  },
-  reformatObjectSchema: {
-    getUsedFieldNamesOfIdentifiers: getUsedFieldNamesOfIdentifiersShared
-  }
-} = require('@izara_project/izara-shared-service-schemas');
+  validator
+} from '@izara_project/izara-core-library-core';
+import { basicValidatorSchema, validateObjType, reformatObjectSchema } from '@izara_project/izara-shared-service-schemas'
 
-const consts = require('./Consts');
-// const getSchema = require('./GetObjectSchema');
-// const deliminatorTree = require('./libs/DeliminatorTree');
+import consts from './Consts.js';
 
-const {
+import {
   APIGatewayClient,
   GetRestApisCommand,
   GetResourcesCommand,
-  GetMethodCommand,
-} = require("@aws-sdk/client-api-gateway");
+} from "@aws-sdk/client-api-gateway";
 
-const {
+import {
   ApiGatewayV2Client,
   GetApisCommand,
   GetRoutesCommand,
-  GetStagesCommand,
-} = require("@aws-sdk/client-apigatewayv2");
+} from "@aws-sdk/client-apigatewayv2";
 
 function createObjType(objectType, serviceTag) {
   if (!process.env.iz_serviceTag && !serviceTag) {
@@ -116,7 +95,7 @@ function getIdentifierTypeByPriority(_izContext, storageTypes = [], objSchema) {
  * @returns {string[]}                    - array of fieldName from objectSchema.identifiers
  */
 function getUsedFieldNamesOfIdentifiers(_izContext, identifiers, identifierTypes = []) {
-  return getUsedFieldNamesOfIdentifiersShared(identifiers, identifierTypes)
+  return reformatObjectSchema.getUsedFieldNamesOfIdentifiers(identifiers, identifierTypes)
   // let identifierFieldNames = [];
 
   // for (let identifier of identifiers) {
@@ -138,7 +117,7 @@ function getUsedFieldNamesOfIdentifiers(_izContext, identifiers, identifierTypes
 
 function validateBasicObjectSchema(_izContext, objectSchema) {
 
-  const validateStatus = validateObject(basicObjectSchema, objectSchema, null, { strict: false });
+  const validateStatus = validator.validateObject(basicValidatorSchema.basicObjectSchema, objectSchema, null, { strict: false });
 
   if (validateStatus.pass) {
     let errors = []
@@ -256,7 +235,7 @@ function validateBasicObjectSchema(_izContext, objectSchema) {
 }
 
 function validateExtendObjectSchema(_izContext, extendObjectSchema) {
-  let validateStatus = validateObject(basicExtendObjectSchema, extendObjectSchema, null, { strict: false });
+  let validateStatus = validator.validateObject(basicValidatorSchema.basicExtendObjectSchema, extendObjectSchema, null, { strict: false });
 
   if (validateStatus.pass) {
     let errors = []
@@ -385,7 +364,7 @@ function validateObjectSchema(_izContext, objectSchema) {
 
 
 function validateRelationshipSchema(_izContext, relationshipSchema) {
-  let validateStatus = validateObject(relationshipBasicSchema, relationshipSchema, null, { strict: false });
+  let validateStatus = validator.validateObject(basicValidatorSchema.relationshipBasicSchema, relationshipSchema, null, { strict: false });
 
   const relationshipTag = Object.keys(relationshipSchema)[0];
   _izContext.logger.debug("relationshipSchema: ", relationshipSchema);
@@ -439,7 +418,7 @@ function validateRelationshipSchema(_izContext, relationshipSchema) {
 }
 
 function validateRefRelationshipSchema(_izContext, refRelationshipSchema, serviceTag) {
-  let validateStatus = validateObject(refRelationshipBasicSchema, refRelationshipSchema, null, { strict: false });
+  let validateStatus = validator.validateObject(basicValidatorSchema.refRelationshipBasicSchema, refRelationshipSchema, null, { strict: false });
   if (validateStatus.pass) {
     if (!serviceTag) {
       serviceTag = process.env.iz_serviceTag
@@ -473,7 +452,7 @@ function validateRefRelationshipSchema(_izContext, refRelationshipSchema, servic
  * @returns
  */
 function findLinkByObjType(_izContext, objType, relationshipSchema) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error(`findLinkByObjType: invalid objType: ${JSON.stringify(objType)}`);
     throw new NoRetryError(`findLinkByObjType: invalid objType: ${JSON.stringify(objType)}`);
@@ -524,7 +503,7 @@ function findLinkByObjType(_izContext, objType, relationshipSchema) {
  * @returns
  */
 function findLinkByObjTypeV2(_izContext, objType, relType, relationshipSchema) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error(`findLinkByObjTypeV2: invalid objType: ${JSON.stringify(objType)}`);
     throw new NoRetryError(`findLinkByObjTypeV2: invalid objType: ${JSON.stringify(objType)}`);
@@ -588,7 +567,7 @@ function findLinkByObjTypeV2(_izContext, objType, relType, relationshipSchema) {
 
 
 function createObjTypeConcat(_izContext, objType) {
-  const validateObjTypeResult = validateObjType(objType);
+  const validateObjTypeResult = validateObjType.validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createObjTypeConcat validateObjTypeResult", validateObjTypeResult);
     throw new NoRetryError(`Invalid objType:${JSON.stringify(objType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
@@ -601,7 +580,7 @@ function explodedObjTypeConcat(_izContext, objectTypeId) {
 }
 
 function createRelTypeConcat(_izContext, relType) {
-  const validateRelTypeResult = validateRelType(relType);
+  const validateRelTypeResult = validateObjType.validateRelType(relType);
   if (validateRelTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createRelTypeConcat validateRelTypeResult", validateRelTypeResult);
     throw new NoRetryError(`Invalid relType:${JSON.stringify(relType)}, ${validateRelTypeResult.errorsFound.join(", ")}`);
@@ -614,7 +593,7 @@ function explodedRelTypeConcat(_izContext, relationshipTypeId) {
 }
 
 function createFlowTypeConcat(_izContext, flowType) {
-  const validateFlowTypeResult = validateFlowType(flowType);
+  const validateFlowTypeResult = validateObjType.validateFlowType(flowType);
   if (validateFlowTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createFlowTypeConcat validateFlowTypeResult", validateFlowTypeResult);
     throw new NoRetryError(`Invalid flowType:${JSON.stringify(flowType)}, ${validateFlowTypeResult.errorsFound.join(", ")}`);
@@ -628,20 +607,20 @@ function explodedFlowTypeConcat(_izContext, flowTypeId) {
 
 function createLinkTypeId(_izContext, firstObjType, secondObjType, relType, direction) {
   // validate objType
-  let validateObjTypeResult = validateObjType(firstObjType);
+  let validateObjTypeResult = validateObjType.validateObjType(firstObjType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createLinkTypeId validateObjTypeResult", validateObjTypeResult);
     throw new NoRetryError(`Invalid objType:${JSON.stringify(firstObjType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
   }
 
-  validateObjTypeResult = validateObjType(secondObjType);
+  validateObjTypeResult = validateObjType.validateObjType(secondObjType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createLinkTypeId validateObjTypeResult", validateObjTypeResult);
     throw new NoRetryError(`Invalid objType:${JSON.stringify(secondObjType)}, ${validateObjTypeResult.errorsFound.join(", ")}`);
   }
 
   // validate relType
-  let validateRelTypeResult = validateRelType(relType);
+  let validateRelTypeResult = validateObjType.validateRelType(relType);
 
   if (validateRelTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("createLinkTypeId validateRelTypeResult", validateRelTypeResult);
@@ -667,7 +646,7 @@ function createLinkTypeId(_izContext, firstObjType, secondObjType, relType, dire
 }
 
 function validateBasicFlowSchema(_izContext, flowSchema) {
-  const validateStatus = validateObject(basicFlowSchema, flowSchema, null, { strict: false });
+  const validateStatus = validator.validateObject(basicValidatorSchema.basicFlowSchema, flowSchema, null, { strict: false });
 
   if (validateStatus.pass) {
     let errors = [];
@@ -793,7 +772,7 @@ async function getApiLinksV2(objectTypes) {
   }
 }
 
-module.exports = {
+export default {
   createObjType,
   getIdentifierTypeByPriority,
   getUsedFieldNamesOfIdentifiers,