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

package/dist/hooks/create.d.ts

@@ -1,4 +1,3 @@
-import { ModelOptions } from '../types';
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
  */
@@ -7,4 +6,4 @@ export declare const beforeBulkCreate: (options: any) => void;
  * A hook to create the custom fields when updating a model instance.
  * TODO - cleanup if update fail
  */
-export declare const beforeCreate: (scopeAttributes: string[], modelOptions?: ModelOptions) => (instance: any, options: any) => Promise<void>;
+export declare const beforeCreate: (scopeAttributes: string[]) => (instance: any, options: any) => Promise<void>;

package/dist/hooks/create.js

@@ -31,7 +31,6 @@ const logger_1 = __importDefault(require("../utils/logger"));
 const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
 const errors_1 = require("../errors");
-const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
  */
@@ -45,13 +44,13 @@ exports.beforeBulkCreate = beforeBulkCreate;
  * A hook to create the custom fields when updating a model instance.
  * TODO - cleanup if update fail
  */
-const beforeCreate = (scopeAttributes, modelOptions = {}) => async (instance, options) => {
+const beforeCreate = (scopeAttributes) => async (instance, options) => {
     logger_1.default.debug('sadot - before create hook');
     const { fields } = options;
     const modelType = instance.constructor.name;
-    const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
+    const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
     // get all model's required definitions
-    const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers, modelOptions);
+    const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers);
     const customFieldsIdx = fields.indexOf('customFields');
     const { customFields } = instance;
     if (customFieldsIdx > -1 && customFields) {
@@ -60,10 +59,7 @@ const beforeCreate = (scopeAttributes, modelOptions = {}) => async (instance, op
         if (missingFields?.length > 0) {
             throw new errors_1.MissingRequiredCustomFieldError(missingFields);
         }
-        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, {
-            transaction: options.transaction,
-            modelOptions,
-        });
+        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, { transaction: options.transaction });
         // eslint-disable-next-line no-param-reassign
         fields.splice(customFieldsIdx, 1);
     }

package/dist/hooks/enrich.d.ts

@@ -1,7 +1,6 @@
-import { ModelOptions } from '../types';
 type SupportedHookTypes = 'afterFind' | 'afterCreate' | 'afterUpdate';
 /**
  * A hook to attach the custom fields when fetching a model instances.
  */
-declare const enrichResults: (modelType: string, scopeAttributes: string[], hookType?: SupportedHookTypes, modelOptions?: ModelOptions) => (instancesOrInstance: any | any[], options: any) => Promise<void>;
+declare const enrichResults: (modelType: string, scopeAttributes: string[], hookType?: SupportedHookTypes) => (instancesOrInstance: any | any[], options: any) => Promise<void>;
 export default enrichResults;

package/dist/hooks/enrich.js

@@ -22,15 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 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]}
  */
@@ -45,7 +40,7 @@ const serializeCustomFields = (customFieldValues, customFieldDefinitionsHash) =>
 /**
  * A hook to attach the custom fields when fetching a model instances.
  */
-const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {}) => async (instancesOrInstance, options) => {
+const enrichResults = (modelType, scopeAttributes, hookType) => async (instancesOrInstance, options) => {
     if (options.originalAttributes?.length > 0
         && !options.originalAttributes?.includes?.('customFields')) {
         return;
@@ -55,21 +50,20 @@ const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {})
         ? instancesOrInstance
         : [instancesOrInstance];
     instances = instances.filter(Boolean);
-    const identifiers = (0, scopeAttributes_1.default)(instances, scopeAttributes);
-    logger_1.default.info('enrichResults - sadot - indentifiers: ', identifiers);
+    const identifiers = instances.map((instance) => scopeAttributes
+        .map((attr) => instance[attr])).flat();
     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 });
+    const customFieldDefinitions = await DefinitionRepo.findByEntityIds(modelType, uniqueIdentifiers, { transaction: options.transaction });
     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/hooks/update.d.ts

@@ -1,4 +1,3 @@
-import { ModelOptions } from '../types';
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
  */
@@ -7,4 +6,4 @@ export declare const beforeBulkUpdate: (options: any) => void;
  * A hook to update the custom fields when updating a model instance.
  * TODO - cleanup if update fail
  */
-export declare const beforeUpdate: (scopeAttributes: string[], modelOptions?: ModelOptions) => (instance: any, options: any) => Promise<void>;
+export declare const beforeUpdate: (scopeAttributes: string[]) => (instance: any, options: any) => Promise<void>;

package/dist/hooks/update.js

@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeUpdate = exports.beforeBulkUpdate = void 0;
 const logger_1 = __importDefault(require("../utils/logger"));
 const ValueRepo = __importStar(require("../repository/value"));
-const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
  */
@@ -43,15 +42,15 @@ exports.beforeBulkUpdate = beforeBulkUpdate;
  * A hook to update the custom fields when updating a model instance.
  * TODO - cleanup if update fail
  */
-const beforeUpdate = (scopeAttributes, modelOptions = {}) => async (instance, options) => {
+const beforeUpdate = (scopeAttributes) => async (instance, options) => {
     logger_1.default.debug('sadot - before update hook');
     const { fields } = options;
     const modelType = instance.constructor.name;
-    const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
+    const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
     const customFieldsIdx = fields.indexOf('customFields');
     if (customFieldsIdx > -1) {
         const { customFields } = instance;
-        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, { transaction: options.transaction, modelOptions });
+        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, { transaction: options.transaction });
         // eslint-disable-next-line no-param-reassign
         fields.splice(customFieldsIdx, 1);
     }

package/dist/index.js

@@ -42,7 +42,6 @@ const useCustomFields = async (app, getModel, options) => {
     (0, init_1.addHooks)(models, getModel);
     await (0, models_1.initTables)(sequelize, options.getUser);
     (0, init_1.addScopes)(models, getModel);
-    (0, init_1.applyCustomAssociation)(models);
     logger_1.default.debug('sadot - custom fields finished initializing with models', models);
     return sequelize;
 };

package/dist/models/index.d.ts

@@ -2,9 +2,7 @@ import type { Sequelize } from 'sequelize-typescript';
 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 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, 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.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"));
@@ -13,14 +13,10 @@ const CustomFieldValue_1 = __importDefault(require("./CustomFieldValue"));
 exports.CustomFieldValue = CustomFieldValue_1.default;
 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 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];
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
 const SCHEMA_VERSION = 1;
 const CUSTOM_FIELDS_SCHEMA_VERSION = `${SADOT_MIGRATION_PREFIX}_${SCHEMA_VERSION}`;
@@ -86,8 +82,6 @@ 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 ContextAwareTestModel_1.default.sync({ alter: true });
     logger_1.default.info('custom-fields: test models synced');
 };
 exports.initTestModels = initTestModels;

package/dist/repository/definition.d.ts

@@ -1,14 +1,11 @@
-import { FindOptions, WhereOptions } from 'sequelize';
 import { CustomFieldDefinition } from '../models';
 import type { CreateCustomFieldDefinition, UpdateCustomFieldDefinition } from '../types/definition';
-import { ModelOptions } from '../types';
 export declare const create: (data: CreateCustomFieldDefinition) => Promise<CustomFieldDefinition>;
-export declare const findAll: (where: WhereOptions, options?: any) => Promise<CustomFieldDefinition[]>;
+export declare const findAll: (where: any, options?: any) => Promise<CustomFieldDefinition[]>;
 export declare const findByIds: (ids: string[], options?: any) => Promise<CustomFieldDefinition[]>;
 export declare const findById: (id: string, options?: any) => Promise<CustomFieldDefinition | null>;
-export declare const findByEntityIds: (modelType: string, entityIds: string[], options?: FindOptions & {
-    modelOptions?: ModelOptions;
-}) => Promise<CustomFieldDefinition[]>;
+export declare const findByEntityId: (entityId: string, options?: any) => Promise<CustomFieldDefinition[]>;
+export declare const findByEntityIds: (modelType: string, entityIds: string[], options?: any) => Promise<CustomFieldDefinition[]>;
 export declare const findByWhere: (where: any) => Promise<CustomFieldDefinition | null>;
 export declare const findDefinitionsByModels: (modelTypes: string[], options?: any) => Promise<CustomFieldDefinition[]>;
 export declare const update: (id: string, data: UpdateCustomFieldDefinition) => Promise<CustomFieldDefinition>;
@@ -17,4 +14,4 @@ export declare const destroy: (id: string) => Promise<any>;
 /**
  * Return the names of the required fields for a given model
  */
-export declare const getRequiredFields: (modelType: string, modelId: string | string[], entityId: string | string[], modelOptions?: ModelOptions) => Promise<string[]>;
+export declare const getRequiredFields: (modelType: string, modelId: string | string[], entityId: string | string[]) => Promise<string[]>;

package/dist/repository/definition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequiredFields = exports.destroy = exports.disable = exports.update = exports.findDefinitionsByModels = exports.findByWhere = exports.findByEntityIds = exports.findById = exports.findByIds = exports.findAll = exports.create = void 0;
+exports.getRequiredFields = exports.destroy = exports.disable = exports.update = exports.findDefinitionsByModels = exports.findByWhere = exports.findByEntityIds = exports.findByEntityId = exports.findById = exports.findByIds = exports.findAll = exports.create = void 0;
 const sequelize_1 = require("sequelize");
 const models_1 = require("../models");
 const create = (data) => models_1.CustomFieldDefinition.create(data);
@@ -13,8 +13,6 @@ const findAll = (where, options = { withDisabled: false }) => {
         where,
         transaction: options.transaction,
         raw: true,
-        include: options.include,
-        logging: console.log,
     });
 };
 exports.findAll = findAll;
@@ -28,21 +26,19 @@ const findById = (id, options = { withDisabled: false }) => {
     return models_1.CustomFieldDefinition.scope('userScope').findByPk(id);
 };
 exports.findById = findById;
-const findByEntityIds = async (modelType, entityIds, options = {}) => {
-    const { include, useEntityIdFromInclude } = options.modelOptions;
-    const where = {
+const findByEntityId = async (entityId, options = {}) => models_1.CustomFieldDefinition.findAll({
+    where: { entityId },
+    transaction: options.transaction,
+});
+exports.findByEntityId = findByEntityId;
+const findByEntityIds = async (modelType, entityIds, options = {}) => models_1.CustomFieldDefinition.findAll({
+    where: {
         modelType,
-    };
-    if (!useEntityIdFromInclude) {
-        where.entityId = entityIds;
-    }
-    return models_1.CustomFieldDefinition.findAll({
-        where,
-        transaction: options.transaction,
-        include: include?.(entityIds),
-        raw: true,
-    });
-};
+        entityId: entityIds,
+    },
+    transaction: options.transaction,
+    raw: true,
+});
 exports.findByEntityIds = findByEntityIds;
 const findByWhere = (where) => models_1.CustomFieldDefinition.scope('userScope').findOne({
     where,
@@ -72,19 +68,10 @@ exports.destroy = destroy;
 /**
  * Return the names of the required fields for a given model
  */
-const getRequiredFields = async (modelType, modelId, entityId, modelOptions = {}) => {
+const getRequiredFields = async (modelType, modelId, entityId) => {
     const entityIds = Array.isArray(entityId) ? entityId : [entityId];
-    const { include, useEntityIdFromInclude } = modelOptions;
-    const where = {
-        modelType,
-        required: true,
-    };
-    if (!useEntityIdFromInclude) {
-        where.entityId = entityIds;
-    }
     const requiredFields = await models_1.CustomFieldDefinition.findAll({
-        where,
-        include: include?.(entityIds),
+        where: { required: true, modelType, entityId: { [sequelize_1.Op.in]: entityIds } },
         logging: true,
     });
     const requiredFieldsNames = requiredFields.map((definition) => definition.name);

package/dist/repository/value.d.ts

@@ -1,7 +1,5 @@
-import { FindOptions } from 'sequelize';
 import { CustomFieldValue } from '../models';
 import { CreateCustomFieldValue, ValuesToUpdate } from '../types/value';
-import { ModelOptions } from '../types';
 export declare const findByModelIdAndDefinition: (modelId: string, customFieldDefinitionId: string) => Promise<CustomFieldValue[]>;
 export declare const create: (data: CreateCustomFieldValue, withAssociations?: boolean) => Promise<CustomFieldValue>;
 export declare const findAllValues: () => Promise<CustomFieldValue[]>;
@@ -22,7 +20,5 @@ export declare const findValuesByModelIds: (modelIds: string[], options?: any) =
  * Create new value record if not exists, but fails if value's definition not exist.
  * Return the updated values
  */
-export declare const updateValues: (modelType: string, modelId: string, identifiers: string[], valuesToUpdate: ValuesToUpdate, options?: FindOptions & {
-    modelOptions?: ModelOptions;
-}) => Promise<CustomFieldValue[]>;
+export declare const updateValues: (modelType: string, modelId: string, identifiers: string[], valuesToUpdate: ValuesToUpdate, options?: any) => Promise<CustomFieldValue[]>;
 export declare const deleteValue: (id: string, options?: any) => Promise<any>;

package/dist/repository/value.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteValue = exports.updateValues = exports.findValuesByModelIds = exports.findValuesByModelId = exports.findAllValues = exports.create = exports.findByModelIdAndDefinition = void 0;
+/* eslint-disable max-len */
 const models_1 = require("../models");
 const DefinitionRepo = __importStar(require("./definition"));
 const logger_1 = __importDefault(require("../utils/logger"));
@@ -73,18 +74,8 @@ 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}`, {
-        names, options, valuesToUpdate, identifiers,
-    });
-    const { modelOptions, transaction } = options;
-    const where = {
-        modelType,
-        name: names,
-    };
-    if (!options.modelOptions?.useEntityIdFromInclude) {
-        where.entityId = identifiers;
-    }
-    const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) || [];
+    const fieldDefinitions = await DefinitionRepo.findAll({ modelType, name: names, entityId: identifiers }, { withDisabled: true, transaction: options.transaction }) || [];
+    logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate, entityId: identifiers });
     const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
         logger_1.default.info(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });

package/dist/tests/helpers/database-config.d.ts

@@ -4,7 +4,6 @@ declare const _default: {
         password: string;
         database: string;
         host: string;
-        port: string | number;
         dialect: string;
         define: {
             underscored: boolean;

package/dist/tests/helpers/database-config.js

@@ -6,7 +6,6 @@ exports.default = {
         password: process.env.DB_PASSWORD || null,
         database: process.env.DB_NAME || 'sadot_package_test',
         host: process.env.DB_HOST || '127.0.0.1',
-        port: process.env.DB_PORT || 5432,
         dialect: process.env.DB_TYPE || 'postgres',
         define: {
             underscored: true,

package/dist/tests/helpers/index.js

@@ -7,8 +7,6 @@ const cleanup = async () => {
     if (process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development') {
         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: {} });
     }
 };
 exports.cleanup = cleanup;

package/dist/tests/mocks/definition.mock.d.ts

@@ -1,10 +1,4 @@
 import { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../types/definition';
-export declare const contextAwareFieldDefinition: {
-    name: string;
-    modelType: string;
-    fieldType: string;
-    entityType: string;
-};
 export declare const coolFieldDefinition: CreateCustomFieldDefinition;
 export declare const coolFieldDefinition2: {
     name: string;

package/dist/tests/mocks/definition.mock.js

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefinitions = exports.createDefinition = exports.rangeField = exports.enumField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = exports.contextAwareFieldDefinition = void 0;
+exports.createDefinitions = exports.createDefinition = exports.rangeField = exports.enumField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = void 0;
 const uuid_1 = require("uuid");
-exports.contextAwareFieldDefinition = {
-    name: 'cool field',
-    modelType: 'ContextAwareTestModel',
-    fieldType: 'number',
-    entityType: 'fleetId',
-};
 exports.coolFieldDefinition = {
     name: 'cool field',
     modelType: 'TestModel',

package/dist/types/index.d.ts

@@ -1,31 +1,13 @@
-import { Includeable } 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}
-     */
-    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 = {
     name: string;
-    scopeAttributes: any[];
-    modelOptions?: ModelOptions;
+    scopeAttributes: string[];
     creationWebhookHandler?: (instance: any) => any;
     updateWebhookHandler?: (instance: any) => any;
     deletionWebhookHandler?: (instance: any) => any;
 };
 export type CustomFieldOptions = {
-    models: Models[];
+    models: ModelOptions[];
     databaseConfig: any;
     getUser: () => any;
 };

package/dist/utils/init.d.ts

@@ -1,5 +1,4 @@
-import type { ModelFetcher, Models } from '../types';
-export declare const addHooks: (models: Models[], getModel: ModelFetcher) => void;
-export declare const removeHooks: (models: Models[], getModel: ModelFetcher) => void;
-export declare const addScopes: (models: Models[], getModel: ModelFetcher) => void;
-export declare const applyCustomAssociation: (models: Models[]) => void;
+import type { ModelFetcher, ModelOptions } from '../types';
+export declare const addHooks: (models: ModelOptions[], getModel: ModelFetcher) => void;
+export declare const removeHooks: (models: ModelOptions[], getModel: ModelFetcher) => void;
+export declare const addScopes: (models: ModelOptions[], getModel: ModelFetcher) => void;

package/dist/utils/init.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.applyCustomAssociation = exports.addScopes = exports.removeHooks = exports.addHooks = void 0;
+exports.addScopes = exports.removeHooks = exports.addHooks = void 0;
 const sequelize_1 = require("sequelize");
 const common_types_1 = require("@autofleet/common-types");
 const models_1 = require("../models");
@@ -12,7 +12,7 @@ const scopes_1 = require("../scopes");
 const logger_1 = __importDefault(require("./logger"));
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 const addHooks = (models, getModel) => {
-    models.forEach(async ({ name, scopeAttributes, modelOptions, }) => {
+    models.forEach(async ({ name, scopeAttributes }) => {
         try {
             const model = getModel(name);
             if (!model) {
@@ -31,11 +31,11 @@ const addHooks = (models, getModel) => {
             model.addHook('beforeFind', 'sadot-beforeFind', (0, hooks_1.beforeFind)(scopeAttributes));
             model.addHook('beforeBulkCreate', 'sadot-beforeBulkCreate', hooks_1.beforeBulkCreate);
             model.addHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate', hooks_1.beforeBulkUpdate);
-            model.addHook('beforeCreate', 'sadot-beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes, modelOptions));
-            model.addHook('beforeUpdate', 'sadot-beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes, modelOptions));
-            model.addHook('afterFind', 'sadot-afterFind', (0, hooks_1.enrichResults)(name, scopeAttributes, 'afterFind', modelOptions));
-            model.addHook('afterUpdate', 'sadot-afterUpdate', (0, hooks_1.enrichResults)(name, scopeAttributes, null, modelOptions));
-            model.addHook('afterCreate', 'sadot-afterCreate', (0, hooks_1.enrichResults)(name, scopeAttributes, null, modelOptions));
+            model.addHook('beforeCreate', 'sadot-beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes));
+            model.addHook('beforeUpdate', 'sadot-beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes));
+            model.addHook('afterFind', 'sadot-afterFind', (0, hooks_1.enrichResults)(name, scopeAttributes, 'afterFind'));
+            model.addHook('afterUpdate', 'sadot-afterUpdate', (0, hooks_1.enrichResults)(name, scopeAttributes));
+            model.addHook('afterCreate', 'sadot-afterCreate', (0, hooks_1.enrichResults)(name, scopeAttributes));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields hook to model ${name}. `, e);
@@ -98,9 +98,3 @@ const addScopes = (models, getModel) => {
     });
 };
 exports.addScopes = addScopes;
-const applyCustomAssociation = (models) => {
-    models.forEach(({ modelOptions }) => {
-        modelOptions?.customAssociation?.(models_1.CustomFieldDefinition);
-    });
-};
-exports.applyCustomAssociation = applyCustomAssociation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.5.4-beta.25",
+  "version": "0.5.4-beta.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -9,24 +9,7 @@
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit --runInBand",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
-    "build-to-local-repo": "npm run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
-    "dev": "nodemon",
-    "watch": "npm-watch build-to-local-repo"
-  },
-  "watch": {
-    "build-to-local-repo": {
-      "extensions": [
-        "js",
-        "jsx",
-        "ts",
-        "tsx",
-        "css"
-      ],
-      "patterns": [
-        "src"
-      ],
-      "quiet": false
-    }
+    "dev": "nodemon"
   },
   "dependencies": {
     "@autofleet/common-types": "^1.7.29",
@@ -51,7 +34,6 @@
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^27.0.5",
-    "npm-watch": "^0.11.0",
     "ts-jest": "^27.0.3",
     "ts-node": "^8.6.2",
     "typescript": "^4.9.5",

package/src/api/v1/definition/index.ts

@@ -65,8 +65,10 @@ router.get('/', async (req, res) => {
     if (entityIds?.length > 0) {
       where.entityId = entityIds;
     }
-    const customFieldDefinitions = await DefinitionRepo.findAll({ ...where },
-      { withDisabled: true });
+    const customFieldDefinitions = await DefinitionRepo.findAll(
+      { ...where },
+      { withDisabled: true },
+    );
     return res.json(customFieldDefinitions);
   } catch (err) {
     logger.error('Failed to fetch custom field definitions', err);

package/src/hooks/create.ts

@@ -2,8 +2,6 @@ import logger from '../utils/logger';
 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';
 
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
@@ -17,20 +15,18 @@ export const beforeBulkCreate = (options): void => {
  * A hook to create the custom fields when updating a model instance.
  * TODO - cleanup if update fail
  */
-export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptions = {}) => async (
+export const beforeCreate = (scopeAttributes: string[]) => async (
   instance,
   options,
 ): Promise<void> => {
   logger.debug('sadot - before create hook');
   const { fields } = options;
   const modelType = instance.constructor.name;
-
-  const identifiers = buildAttributesByInstance(instance, scopeAttributes);
-
+  const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
   // get all model's required definitions
   const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType,
-    instance.id, identifiers, modelOptions);
-
+    instance.id,
+    identifiers);
   const customFieldsIdx = fields.indexOf('customFields');
   const { customFields } = instance;
   if (customFieldsIdx > -1 && customFields) {
@@ -45,12 +41,8 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
       instance.id,
       identifiers,
       customFields,
-      {
-        transaction: options.transaction,
-        modelOptions,
-      },
+      { transaction: options.transaction },
     );
-
     // eslint-disable-next-line no-param-reassign
     fields.splice(customFieldsIdx, 1);
   } else if (requiredFieldsNames?.length > 0) {