@autofleet/sadot 0.5.4-beta.25 → 0.5.4-beta.26

package/dist/hooks/enrich.js

@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable no-param-reassign */
 const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
-const logger_1 = __importDefault(require("../utils/logger"));
 const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * Serialize custom fields value into the format of {[name] -> [fieldData]}
@@ -56,20 +55,28 @@ const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {})
         : [instancesOrInstance];
     instances = instances.filter(Boolean);
     const identifiers = (0, scopeAttributes_1.default)(instances, scopeAttributes);
-    logger_1.default.info('enrichResults - sadot - indentifiers: ', identifiers);
     const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
-    console.log({ uniqueIdentifiers });
     const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({
         ...map,
         [identifier]: [],
     }), {});
     const customFieldDefinitions = await DefinitionRepo.findByEntityIds(modelType, uniqueIdentifiers, { transaction: options.transaction, modelOptions });
+    if (modelOptions?.include && modelOptions.useEntityIdFromInclude) {
+        // if we pass useEntityIdFromInclude,
+        //  map the entity from the options to the identifierCustomFieldDefinitionsMapping
+        modelOptions.include(identifiers).forEach(({ model }) => {
+            customFieldDefinitions.forEach((cfd) => {
+                const entityId = cfd[`${model.name}.entityId`];
+                identifierCustomFieldDefinitionsMapping[entityId] = [];
+            });
+        });
+    }
     const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({
         ...map,
         [definition.id]: definition,
     }), {});
     customFieldDefinitions.forEach((cfd) => {
-        identifierCustomFieldDefinitionsMapping[cfd.entityId]?.push(cfd);
+        identifierCustomFieldDefinitionsMapping[cfd.entityId].push(cfd);
     });
     // Get the values per instates ids:
     const instancesIds = instances.map((i) => i[primaryKey]);

package/dist/models/index.d.ts

@@ -3,8 +3,8 @@ import CustomFieldDefinition from './CustomFieldDefinition';
 import CustomFieldValue from './CustomFieldValue';
 import TestModel from './tests/TestModel';
 import ContextAwareTestModel from './tests/contextAwareModels/ContextAwareTestModel';
-import ContextModel from './tests/contextAwareModels/ContextModel';
+import ContextTestModel from './tests/contextAwareModels/ContextTestModel';
 import AssociatedTestModel from './tests/AssociatedTestModel';
 declare const initTables: (sequelize: Sequelize, getUser: any) => Promise<void>;
 declare const initTestModels: (sequelize: Sequelize) => Promise<void>;
-export { CustomFieldValue, CustomFieldDefinition, TestModel, AssociatedTestModel, ContextAwareTestModel, ContextModel, initTables, initTestModels, };
+export { CustomFieldValue, CustomFieldDefinition, TestModel, AssociatedTestModel, ContextAwareTestModel, ContextTestModel, initTables, initTestModels, };

package/dist/models/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initTestModels = exports.initTables = exports.ContextModel = exports.ContextAwareTestModel = exports.AssociatedTestModel = exports.TestModel = exports.CustomFieldDefinition = exports.CustomFieldValue = void 0;
+exports.initTestModels = exports.initTables = exports.ContextTestModel = exports.ContextAwareTestModel = exports.AssociatedTestModel = exports.TestModel = exports.CustomFieldDefinition = exports.CustomFieldValue = void 0;
 /* eslint-disable no-param-reassign */
 const sequelize_1 = require("sequelize");
 const logger_1 = __importDefault(require("../utils/logger"));
@@ -15,12 +15,12 @@ const TestModel_1 = __importDefault(require("./tests/TestModel"));
 exports.TestModel = TestModel_1.default;
 const ContextAwareTestModel_1 = __importDefault(require("./tests/contextAwareModels/ContextAwareTestModel"));
 exports.ContextAwareTestModel = ContextAwareTestModel_1.default;
-const ContextModel_1 = __importDefault(require("./tests/contextAwareModels/ContextModel"));
-exports.ContextModel = ContextModel_1.default;
+const ContextTestModel_1 = __importDefault(require("./tests/contextAwareModels/ContextTestModel"));
+exports.ContextTestModel = ContextTestModel_1.default;
 const AssociatedTestModel_1 = __importDefault(require("./tests/AssociatedTestModel"));
 exports.AssociatedTestModel = AssociatedTestModel_1.default;
 const productionModels = [CustomFieldDefinition_1.default, CustomFieldValue_1.default];
-const testModels = [TestModel_1.default, AssociatedTestModel_1.default, ContextAwareTestModel_1.default, ContextModel_1.default];
+const testModels = [TestModel_1.default, AssociatedTestModel_1.default, ContextAwareTestModel_1.default, ContextTestModel_1.default];
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
 const SCHEMA_VERSION = 1;
 const CUSTOM_FIELDS_SCHEMA_VERSION = `${SADOT_MIGRATION_PREFIX}_${SCHEMA_VERSION}`;
@@ -86,7 +86,7 @@ const initTestModels = async (sequelize) => {
     logger_1.default.info('custom-fields: test models added');
     await TestModel_1.default.sync({ alter: true });
     await AssociatedTestModel_1.default.sync({ alter: true });
-    await ContextModel_1.default.sync({ alter: true });
+    await ContextTestModel_1.default.sync({ alter: true });
     await ContextAwareTestModel_1.default.sync({ alter: true });
     logger_1.default.info('custom-fields: test models synced');
 };

package/dist/models/tests/contextAwareModels/ContextAwareTestModel.d.ts

@@ -1,10 +1,10 @@
 import { Model } from 'sequelize-typescript';
-import ContextModel from './ContextModel';
+import ContextTestModel from './ContextTestModel';
 declare class ContextAwareTestModel extends Model {
     id: string;
     contextId: string;
     coolAttribute?: boolean;
     customFields?: any;
-    context: ContextModel;
+    context: ContextTestModel;
 }
 export default ContextAwareTestModel;

package/dist/models/tests/contextAwareModels/ContextAwareTestModel.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const sequelize_typescript_1 = require("sequelize-typescript");
-const ContextModel_1 = __importDefault(require("./ContextModel"));
+const ContextTestModel_1 = __importDefault(require("./ContextTestModel"));
 let ContextAwareTestModel = class ContextAwareTestModel extends sequelize_typescript_1.Model {
 };
 __decorate([
@@ -27,7 +27,7 @@ __decorate([
     __metadata("design:type", String)
 ], ContextAwareTestModel.prototype, "id", void 0);
 __decorate([
-    (0, sequelize_typescript_1.ForeignKey)(() => ContextModel_1.default),
+    (0, sequelize_typescript_1.ForeignKey)(() => ContextTestModel_1.default),
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.UUID,
     }),
@@ -46,8 +46,8 @@ __decorate([
     __metadata("design:type", Object)
 ], ContextAwareTestModel.prototype, "customFields", void 0);
 __decorate([
-    (0, sequelize_typescript_1.BelongsTo)(() => ContextModel_1.default),
-    __metadata("design:type", ContextModel_1.default)
+    (0, sequelize_typescript_1.BelongsTo)(() => ContextTestModel_1.default),
+    __metadata("design:type", ContextTestModel_1.default)
 ], ContextAwareTestModel.prototype, "context", void 0);
 ContextAwareTestModel = __decorate([
     (0, sequelize_typescript_1.Table)({ createdAt: false, updatedAt: false })

package/dist/models/tests/contextAwareModels/{ContextModel.d.ts → ContextTestModel.d.ts}

@@ -5,9 +5,9 @@ declare enum EEntityTypes {
     DEMAND_SOURCE = "demandSource",
     FLEET = "fleet"
 }
-declare class ContextModel extends Model {
+declare class ContextTestModel extends Model {
     id: string;
     entityId: string;
     entityType: EEntityTypes;
 }
-export default ContextModel;
+export default ContextTestModel;

package/dist/models/tests/contextAwareModels/{ContextModel.js → ContextTestModel.js}

@@ -19,7 +19,7 @@ var EEntityTypes;
     EEntityTypes["DEMAND_SOURCE"] = "demandSource";
     EEntityTypes["FLEET"] = "fleet";
 })(EEntityTypes || (EEntityTypes = {}));
-let ContextModel = class ContextModel extends sequelize_typescript_1.Model {
+let ContextTestModel = class ContextTestModel extends sequelize_typescript_1.Model {
 };
 __decorate([
     sequelize_typescript_1.PrimaryKey,
@@ -28,20 +28,20 @@ __decorate([
         type: sequelize_typescript_1.DataType.UUID,
     }),
     __metadata("design:type", String)
-], ContextModel.prototype, "id", void 0);
+], ContextTestModel.prototype, "id", void 0);
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.UUID,
     }),
     __metadata("design:type", String)
-], ContextModel.prototype, "entityId", void 0);
+], ContextTestModel.prototype, "entityId", void 0);
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.ENUM(...Object.values(EEntityTypes)),
     }),
     __metadata("design:type", String)
-], ContextModel.prototype, "entityType", void 0);
-ContextModel = __decorate([
+], ContextTestModel.prototype, "entityType", void 0);
+ContextTestModel = __decorate([
     (0, sequelize_typescript_1.Table)({ createdAt: false, updatedAt: false })
-], ContextModel);
-exports.default = ContextModel;
+], ContextTestModel);
+exports.default = ContextTestModel;

package/dist/repository/definition.js

@@ -14,7 +14,6 @@ const findAll = (where, options = { withDisabled: false }) => {
         transaction: options.transaction,
         raw: true,
         include: options.include,
-        logging: console.log,
     });
 };
 exports.findAll = findAll;

package/dist/repository/value.d.ts

@@ -1,4 +1,4 @@
-import { FindOptions } from 'sequelize';
+import type { FindOptions } from 'sequelize';
 import { CustomFieldValue } from '../models';
 import { CreateCustomFieldValue, ValuesToUpdate } from '../types/value';
 import { ModelOptions } from '../types';

package/dist/repository/value.js

@@ -73,7 +73,7 @@ exports.findValuesByModelIds = findValuesByModelIds;
  */
 const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
     const names = Object.keys(valuesToUpdate);
-    logger_1.default.info(`custom-fiel  ds: updating values for ${modelType} ${modelId}`, {
+    logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, {
         names, options, valuesToUpdate, identifiers,
     });
     const { modelOptions, transaction } = options;

package/dist/tests/helpers/index.js

@@ -8,7 +8,7 @@ const cleanup = async () => {
         await models_1.CustomFieldDefinition.unscoped().destroy({ where: {} });
         await models_1.TestModel.destroy({ where: {} });
         await models_1.ContextAwareTestModel.destroy({ where: {} });
-        await models_1.ContextModel.destroy({ where: {} });
+        await models_1.ContextTestModel.destroy({ where: {} });
     }
 };
 exports.cleanup = cleanup;

package/dist/types/index.d.ts

@@ -1,18 +1,18 @@
-import { Includeable } from 'sequelize';
+import { IncludeOptions } from 'sequelize';
 import { ModelCtor } from 'sequelize-typescript';
 export type ModelFetcher = (name: string) => any;
 export type ModelOptions = {
-    include?: (entityIds: string[]) => Includeable[];
     /**
-     * A function that will be called to resolve the entity id.
-     * @param {string | string[]}  -  The entity id.
-     * @returns {void}
+     * Include options for the model
+     */
+    include?: (entityIds: string[]) => IncludeOptions[];
+    /**
+      * Custom association for the model
+      * @param model - The model to associate with
      */
     customAssociation?: (model: ModelCtor) => void;
     /**
      * Whether to use the entity id  from the instance per scope attribute
-     * @param {string}  -
-     * @returns {void}
      */
     useEntityIdFromInclude?: boolean;
 };

package/dist/utils/scopeAttributes.d.ts

@@ -1,2 +1,2 @@
-declare const buildAttributesByInstance: (instance: any, scopeAttributes: string[]) => any[];
-export default buildAttributesByInstance;
+declare const applyScopeToInstance: (instance: any, scopeAttributes: string[]) => any[];
+export default applyScopeToInstance;

package/dist/utils/scopeAttributes.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const mapAttributeToInstance = (scopeAttributes, instance) => scopeAttributes.map((attr) => instance[attr]);
-const buildAttributesByInstance = (instance, scopeAttributes) => {
+const applyScopeToInstance = (instance, scopeAttributes) => {
     const uniqueAttributes = Array.from(new Set(scopeAttributes));
     if (Array.isArray(instance)) {
         return instance.flatMap((ins) => mapAttributeToInstance(uniqueAttributes, ins));
     }
     return mapAttributeToInstance(uniqueAttributes, instance);
 };
-exports.default = buildAttributesByInstance;
+exports.default = applyScopeToInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.5.4-beta.25",
+  "version": "0.5.4-beta.26",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/hooks/create.ts

@@ -3,7 +3,7 @@ import * as ValueRepo from '../repository/value';
 import * as DefinitionRepo from '../repository/definition';
 import { MissingRequiredCustomFieldError } from '../errors';
 import { ModelOptions } from '../types';
-import buildAttributesByInstance from '../utils/scopeAttributes';
+import applyScopeToInstance from '../utils/scopeAttributes';
 
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
@@ -25,7 +25,7 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
   const { fields } = options;
   const modelType = instance.constructor.name;
 
-  const identifiers = buildAttributesByInstance(instance, scopeAttributes);
+  const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
   // get all model's required definitions
   const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType,

package/src/hooks/enrich.ts

@@ -4,9 +4,8 @@ import * as DefinitionRepo from '../repository/definition';
 import CustomFieldValue from '../models/CustomFieldValue';
 import CustomFieldDefinition from '../models/CustomFieldDefinition';
 import { SerializedCustomFields } from '../types/definition';
-import logger from '../utils/logger';
 import { ModelOptions } from '../types';
-import buildAttributesByInstance from '../utils/scopeAttributes';
+import applyScopeToInstance from '../utils/scopeAttributes';
 
 type SupportedHookTypes = 'afterFind' | 'afterCreate' | 'afterUpdate';
 
@@ -52,14 +51,10 @@ const enrichResults = (
 
   instances = instances.filter(Boolean);
 
-  const identifiers = buildAttributesByInstance(instances, scopeAttributes);
-
-  logger.info('enrichResults - sadot - indentifiers: ', identifiers);
+  const identifiers = applyScopeToInstance(instances, scopeAttributes);
 
   const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
 
-  console.log({ uniqueIdentifiers });
-
   const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({
     ...map,
     [identifier]: [],
@@ -72,13 +67,24 @@ const enrichResults = (
     { transaction: options.transaction, modelOptions },
   );
 
+  if (modelOptions?.include && modelOptions.useEntityIdFromInclude) {
+    // if we pass useEntityIdFromInclude,
+    //  map the entity from the options to the identifierCustomFieldDefinitionsMapping
+    modelOptions.include(identifiers).forEach(({ model }) => {
+      customFieldDefinitions.forEach((cfd) => {
+        const entityId = cfd[`${model.name}.entityId`];
+        identifierCustomFieldDefinitionsMapping[entityId] = [];
+      });
+    });
+  }
+
   const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({
     ...map,
     [definition.id]: definition,
   }), {});
 
   customFieldDefinitions.forEach((cfd) => {
-    identifierCustomFieldDefinitionsMapping[cfd.entityId]?.push(cfd);
+    identifierCustomFieldDefinitionsMapping[cfd.entityId].push(cfd);
   });
 
   // Get the values per instates ids:

package/src/hooks/update.ts

@@ -1,7 +1,7 @@
 import logger from '../utils/logger';
 import * as ValueRepo from '../repository/value';
 import { ModelOptions } from '../types';
-import buildAttributesByInstance from '../utils/scopeAttributes';
+import applyScopeToInstance from '../utils/scopeAttributes';
 
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
@@ -23,7 +23,7 @@ export const beforeUpdate = (scopeAttributes: string[], modelOptions: ModelOptio
   logger.debug('sadot - before update hook');
   const { fields } = options;
   const modelType = instance.constructor.name;
-  const identifiers = buildAttributesByInstance(instance, scopeAttributes);
+  const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
   const customFieldsIdx = fields.indexOf('customFields');
   if (customFieldsIdx > -1) {

package/src/models/index.ts

@@ -6,11 +6,11 @@ import CustomFieldDefinition from './CustomFieldDefinition';
 import CustomFieldValue from './CustomFieldValue';
 import TestModel from './tests/TestModel';
 import ContextAwareTestModel from './tests/contextAwareModels/ContextAwareTestModel';
-import ContextModel from './tests/contextAwareModels/ContextModel';
+import ContextTestModel from './tests/contextAwareModels/ContextTestModel';
 import AssociatedTestModel from './tests/AssociatedTestModel';
 
 const productionModels = [CustomFieldDefinition, CustomFieldValue];
-const testModels = [TestModel, AssociatedTestModel, ContextAwareTestModel, ContextModel];
+const testModels = [TestModel, AssociatedTestModel, ContextAwareTestModel, ContextTestModel];
 
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
 const SCHEMA_VERSION = 1;
@@ -90,7 +90,7 @@ const initTestModels = async (sequelize: Sequelize): Promise<void> => {
   logger.info('custom-fields: test models added');
   await TestModel.sync({ alter: true });
   await AssociatedTestModel.sync({ alter: true });
-  await ContextModel.sync({ alter: true });
+  await ContextTestModel.sync({ alter: true });
   await ContextAwareTestModel.sync({ alter: true });
   logger.info('custom-fields: test models synced');
 };
@@ -101,7 +101,7 @@ export {
   TestModel,
   AssociatedTestModel,
   ContextAwareTestModel,
-  ContextModel,
+  ContextTestModel,
   initTables,
   initTestModels,
 };

package/src/models/tests/contextAwareModels/ContextAwareTestModel.ts

@@ -10,7 +10,7 @@ import {
   ForeignKey,
 } from 'sequelize-typescript';
 import AssociatedTestModel from '../AssociatedTestModel';
-import ContextModel from './ContextModel';
+import ContextTestModel from './ContextTestModel';
 
 @Table({ createdAt: false, updatedAt: false })
 class ContextAwareTestModel extends Model {
@@ -22,7 +22,7 @@ class ContextAwareTestModel extends Model {
     })
     id!: string;
 
-    @ForeignKey(() => ContextModel)
+  @ForeignKey(() => ContextTestModel)
     @Column({
       type: DataType.UUID,
     })
@@ -38,8 +38,8 @@ class ContextAwareTestModel extends Model {
     })
     customFields?: any;
 
-    @BelongsTo(() => ContextModel)
-    context: ContextModel;
+  @BelongsTo(() => ContextTestModel)
+  context: ContextTestModel;
 }
 
 export default ContextAwareTestModel;

package/src/models/tests/contextAwareModels/{ContextModel.ts → ContextTestModel.ts}

@@ -16,7 +16,7 @@ import {
 }
 
 @Table({ createdAt: false, updatedAt: false })
-class ContextModel extends Model {
+class ContextTestModel extends Model {
   @PrimaryKey
   @Column({
     defaultValue: DataType.UUIDV4,
@@ -35,4 +35,4 @@ class ContextModel extends Model {
     entityType: EEntityTypes;
 }
 
-export default ContextModel;
+export default ContextTestModel;

package/src/repository/definition.ts

@@ -22,7 +22,6 @@ export const findAll = (
     transaction: options.transaction,
     raw: true,
     include: options.include,
-    logging: console.log,
   });
 };
 

package/src/repository/value.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-len */
-import { FindOptions, WhereOptions } from 'sequelize';
+import type { FindOptions, WhereOptions } from 'sequelize';
 import { CustomFieldValue, CustomFieldDefinition } from '../models';
 import * as DefinitionRepo from './definition';
 import { CreateCustomFieldValue, ValuesToUpdate } from '../types/value';
@@ -55,7 +55,7 @@ export const updateValues = async (
   options: FindOptions & { modelOptions?: ModelOptions } = {},
 ): Promise<CustomFieldValue[]> => {
   const names = Object.keys(valuesToUpdate);
-  logger.info(`custom-fiel  ds: updating values for ${modelType} ${modelId}`, {
+  logger.info(`custom-fields: updating values for ${modelType} ${modelId}`, {
     names, options, valuesToUpdate, identifiers,
   });
   const { modelOptions, transaction } = options;

package/src/tests/helpers/index.ts

@@ -1,5 +1,5 @@
 import {
-  ContextAwareTestModel, ContextModel, CustomFieldDefinition, TestModel,
+  ContextAwareTestModel, ContextTestModel, CustomFieldDefinition, TestModel,
 } from '../../models';
 
 // eslint-disable-next-line import/prefer-default-export
@@ -8,7 +8,7 @@ export const cleanup = async (): Promise<void> => {
     await CustomFieldDefinition.unscoped().destroy({ where: {} });
     await TestModel.destroy({ where: {} });
     await ContextAwareTestModel.destroy({ where: {} });
-    await ContextModel.destroy({ where: {} });
+    await ContextTestModel.destroy({ where: {} });
   }
 };
 

package/src/types/index.ts

@@ -1,23 +1,22 @@
-import { Includeable } from 'sequelize';
+import { IncludeOptions } from 'sequelize';
 import { ModelCtor } from 'sequelize-typescript';
 
 export type ModelFetcher = (name: string) => any;
 
 export type ModelOptions = {
-  include?: (entityIds: string[]) => Includeable[];
   /**
-   * A function that will be called to resolve the entity id.
-   * @param {string | string[]}  -  The entity id.
-   * @returns {void}
+   * Include options for the model
+   */
+  include?: (entityIds: string[]) => IncludeOptions[];
+  /**
+    * Custom association for the model
+    * @param model - The model to associate with
    */
 
   customAssociation?: (model: ModelCtor) => void;
   /**
    * Whether to use the entity id  from the instance per scope attribute
-   * @param {string}  -
-   * @returns {void}
    */
-
   useEntityIdFromInclude?: boolean
 }
 export type Models = {
@@ -33,5 +32,4 @@ export type CustomFieldOptions = {
   models: Models[];
   databaseConfig: any;
   getUser: () => any;
-
 };

package/src/utils/scopeAttributes.ts

@@ -1,7 +1,7 @@
 const mapAttributeToInstance = (scopeAttributes: string[], instance: any) =>
   scopeAttributes.map((attr) => instance[attr]);
 
-const buildAttributesByInstance = (instance: any, scopeAttributes: string[]) => {
+const applyScopeToInstance = (instance: any, scopeAttributes: string[]) => {
   const uniqueAttributes = Array.from(new Set(scopeAttributes));
   if (Array.isArray(instance)) {
     return instance.flatMap((ins) => mapAttributeToInstance(uniqueAttributes, ins));
@@ -9,4 +9,4 @@ const buildAttributesByInstance = (instance: any, scopeAttributes: string[]) =>
   return mapAttributeToInstance(uniqueAttributes, instance);
 };
 
-export default buildAttributesByInstance;
+export default applyScopeToInstance;