@autofleet/sadot 0.6.2-temp-file-6 → 0.6.2

package/.env

@@ -0,0 +1,3 @@
+NODE_ENV=test
+# LOG_LEVEL=debug
+# SADOT_DEBUG=true

package/dist/api/v1/definition/validations.d.ts

@@ -1,2 +1,2 @@
-export declare const validateCustomFieldDefinitionCreation: (payload: any) => Promise<any>;
-export declare const validateCustomFieldDefinitionUpdate: (payload: any) => Promise<any>;
+export declare const validateCustomFieldDefinitionCreation: (payload: any) => any;
+export declare const validateCustomFieldDefinitionUpdate: (payload: any) => any;

package/dist/api/v1/definition/validations.js

@@ -4,31 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateCustomFieldDefinitionUpdate = exports.validateCustomFieldDefinitionCreation = void 0;
-const joi_1 = __importDefault(require("joi"));
-const constants_1 = require("../../../utils/constants");
-/**
- * Schema for the validation of custom field definition
- * The only custom validation is for
- * {@link CustomFieldDefinitionType.SELECT SELECT}
- * and
- * {@link CustomFieldDefinitionType.STATUS STATUS}
- * field types.
- * The rest of the field types are validated by Joi
- */
+const joi_1 = __importDefault(require("@hapi/joi"));
+const type_1 = require("../../../utils/validations/type");
 const ValidationSchema = joi_1.default.when('fieldType', {
-    is: constants_1.CustomFieldDefinitionType.SELECT,
+    is: type_1.CustomFieldDefinitionType.SELECT,
     then: joi_1.default.array().items(joi_1.default.string()).min(1).unique(),
     otherwise: joi_1.default.any(),
-}).when('fieldType', {
-    is: constants_1.CustomFieldDefinitionType.STATUS,
-    then: joi_1.default.string().min(1).required(),
-    otherwise: joi_1.default.any(),
 });
 const CustomFieldDefinitionCreationSchema = joi_1.default.object({
     name: joi_1.default.string().required(),
     displayName: joi_1.default.string().required(),
     validation: ValidationSchema,
-    fieldType: joi_1.default.string().valid(...Object.values(constants_1.CustomFieldDefinitionType)).required(),
+    fieldType: joi_1.default.string().valid(...Object.values(type_1.CustomFieldDefinitionType)).required(),
     entityId: joi_1.default.string().guid().required(),
     entityType: joi_1.default.string().required(),
     description: joi_1.default.string(),
@@ -38,8 +25,8 @@ const CustomFieldDefinitionCreationSchema = joi_1.default.object({
 const CustomFieldDefinitionUpdateSchema = joi_1.default.object({
     displayName: joi_1.default.string(),
     validation: ValidationSchema,
-    fieldType: joi_1.default.string().valid(...Object.values(constants_1.CustomFieldDefinitionType)),
-    description: joi_1.default.string().allow(null),
+    fieldType: joi_1.default.string().valid(...Object.values(type_1.CustomFieldDefinitionType)),
+    description: joi_1.default.string(),
     required: joi_1.default.boolean(),
     disabled: joi_1.default.boolean(),
 });

package/dist/api/v1/errors.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("@autofleet/errors");
-const joi_1 = require("joi");
+const joi_1 = require("@hapi/joi");
 const sequelize_1 = require("sequelize");
 exports.default = (err, res, additionalData = undefined) => {
     let error = err;

package/dist/hooks/create.d.ts

@@ -1,4 +1,3 @@
-import type { 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,5 @@
-import type { 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[]) => (instancesOrInstance: any | any[], options: any) => Promise<void>;
 export default enrichResults;

package/dist/hooks/enrich.js

@@ -22,14 +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 scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * Serialize custom fields value into the format of {[name] -> [fieldData]}
  */
@@ -44,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) => async (instancesOrInstance, options) => {
     if (options.originalAttributes?.length > 0
         && !options.originalAttributes?.includes?.('customFields')) {
         return;
@@ -54,23 +50,14 @@ const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {})
         ? instancesOrInstance
         : [instancesOrInstance];
     instances = instances.filter(Boolean);
-    const identifiers = (0, scopeAttributes_1.default)(instances, scopeAttributes);
+    const identifiers = instances.map((instance) => scopeAttributes
+        .map((attr) => instance[attr])).flat();
     const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
     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 customFieldDefinitions = await DefinitionRepo.findByEntityIds(modelType, uniqueIdentifiers, { transaction: options.transaction });
     const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({
         ...map,
         [definition.id]: definition,
@@ -116,11 +103,6 @@ const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {})
             // if raw:
             delete instance?.[attribute];
         });
-        // sequelize will think customFields changed also in 'find', so we need to mark it as unchanged
-        if (hookType === 'afterFind') {
-            // changed() could be undefined, i.e in raw: true
-            instance?.changed?.('customFields', false);
-        }
     });
 };
 exports.default = enrichResults;

package/dist/hooks/update.d.ts

@@ -1,4 +1,3 @@
-import type { 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.d.ts

@@ -1,9 +1,8 @@
 import type { Application } from 'express';
-import type { Sequelize } from 'sequelize-typescript';
+import { Sequelize } from 'sequelize-typescript';
 import type { CustomFieldOptions, ModelFetcher } from './types';
-export * from './utils/validations/schema/custom-fields';
+export * from './utils/validations/custom-fields';
 export * from './utils/constants';
-export * from './utils/helpers';
 /**
  * Adding custom fields enrichment to the models inside the MODELS_FILE_NAME json file
  * @see {@link 'custom-fields/config'} for configurations

package/dist/index.js

@@ -23,9 +23,8 @@ const api_1 = __importDefault(require("./api"));
 const db_1 = __importDefault(require("./utils/db"));
 const logger_1 = __importDefault(require("./utils/logger"));
 const init_1 = require("./utils/init");
-__exportStar(require("./utils/validations/schema/custom-fields"), exports);
+__exportStar(require("./utils/validations/custom-fields"), exports);
 __exportStar(require("./utils/constants"), exports);
-__exportStar(require("./utils/helpers"), exports);
 /**
  * Adding custom fields enrichment to the models inside the MODELS_FILE_NAME json file
  * @see {@link 'custom-fields/config'} for configurations
@@ -43,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/CustomFieldDefinition.d.ts

@@ -1,5 +1,5 @@
 import { Model } from 'sequelize-typescript';
-import { CustomFieldDefinitionType } from '../utils/constants';
+import { CustomFieldDefinitionType } from '../utils/validations/type';
 import { CustomFieldValue } from '.';
 declare class CustomFieldDefinition extends Model {
     id: string;

package/dist/models/CustomFieldDefinition.js

@@ -8,17 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable indent */
 const sequelize_typescript_1 = require("sequelize-typescript");
-const constants_1 = require("../utils/constants");
-const validators_1 = require("../utils/validations/validators");
+const custom_1 = require("../utils/validations/custom");
+const type_1 = require("../utils/validations/type");
 const _1 = require(".");
 const events_1 = require("../events");
 const errors_1 = require("../errors");
-const logger_1 = __importDefault(require("../utils/logger"));
 let CustomFieldDefinition = class CustomFieldDefinition extends sequelize_typescript_1.Model {
     static displayNameDefaultValue(instance) {
         if (!instance?.displayName) {
@@ -59,7 +57,7 @@ __decorate([
 ], CustomFieldDefinition.prototype, "displayName", void 0);
 __decorate([
     (0, sequelize_typescript_1.Is)('SupportedType', (value) => {
-        if (!Object.values(constants_1.CustomFieldDefinitionType).includes(value)) {
+        if (!Object.values(type_1.CustomFieldDefinitionType).includes(value)) {
             throw new errors_1.UnsupportedCustomFieldTypeError(`"${value}" is not a supported type.`);
         }
     }),
@@ -157,10 +155,7 @@ CustomFieldDefinition = __decorate([
         timestamps: true,
         validate: {
             validationByType() {
-                // Verify the validation is provided if needed
-                if (!this.validation && validators_1.CustomValidationTypes[this.fieldType]) {
-                    // TODO: enforce the validation-object schema based on the fieldType
-                    logger_1.default.error(`No custom validation for custom field type ${this.fieldType} found`);
+                if (!(0, custom_1.validateValidation)(this.fieldType, this.validation)) {
                     throw new errors_1.UnsupportedCustomValidationError(`Validation provided for "${this.fieldType}" is not supported`);
                 }
             },

package/dist/models/CustomFieldValue.js

@@ -31,11 +31,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable indent */
 const sequelize_typescript_1 = require("sequelize-typescript");
 const events_1 = require("../events");
 const _1 = require(".");
-const validations_1 = require("../utils/validations");
+const validations_1 = __importDefault(require("../utils/validations"));
 const CustomFieldDefinitionRepo = __importStar(require("../repository/definition"));
 const errors_1 = require("../errors");
 let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Model {
@@ -49,7 +54,7 @@ let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Mod
         instances.forEach((instance) => {
             const { validation, fieldType, } = definitions
                 .find((definition) => definition.id === instance.customFieldDefinitionId);
-            const isValid = (0, validations_1.validateValue)(instance.value, fieldType, validation);
+            const isValid = (0, validations_1.default)(instance.value, fieldType, validation);
             if (!isValid) {
                 throw new errors_1.InvalidValueError(instance.value, fieldType);
             }
@@ -60,7 +65,7 @@ let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Mod
         // eslint-disable-next-line max-len
         const cfd = await CustomFieldDefinitionRepo.findById(customFieldDefinitionId, { withDisabled: true });
         const { validation, fieldType } = cfd;
-        const isValid = (0, validations_1.validateValue)(instance.value, fieldType, validation);
+        const isValid = (0, validations_1.default)(instance.value, fieldType, validation);
         if (!isValid) {
             throw new errors_1.InvalidValueError(instance.value, fieldType);
         }

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 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, ContextTestModel, 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.ContextTestModel = 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 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, ContextTestModel_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 ContextTestModel_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 { type FindOptions, type WhereOptions } from 'sequelize';
 import { CustomFieldDefinition } from '../models';
 import type { CreateCustomFieldDefinition, UpdateCustomFieldDefinition } from '../types/definition';
-import type { 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,7 +13,6 @@ const findAll = (where, options = { withDisabled: false }) => {
         where,
         transaction: options.transaction,
         raw: true,
-        include: options.include,
     });
 };
 exports.findAll = findAll;
@@ -27,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,
@@ -71,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 type { FindOptions } from 'sequelize';
 import { CustomFieldValue } from '../models';
-import type { CreateCustomFieldValue, ValuesToUpdate } from '../types/value';
-import type { ModelOptions } from '../types';
+import { CreateCustomFieldValue, ValuesToUpdate } from '../types/value';
 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"));
@@ -72,22 +73,11 @@ exports.findValuesByModelIds = findValuesByModelIds;
  * Return the updated values
  */
 const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
+    logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate });
     const names = Object.keys(valuesToUpdate);
-    logger_1.default.info(`custom-fields: 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 }) || [];
     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 });
         const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
         throw new errors_1.MissingDefinitionError(missingDefinitions);
     }

package/dist/scopes/filter.d.ts

@@ -1,4 +1,4 @@
-import { type WhereOptions } from 'sequelize';
+import { WhereOptions } from 'sequelize';
 /**
  * Type representing possible condition values.
  * Currently supporting strings and arrays of strings.

package/dist/scopes/filter.js

@@ -4,8 +4,7 @@ exports.scopeName = exports.customFieldsFilterScope = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
-const common_types_1 = require("@autofleet/common-types");
-const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
+const constants_1 = require("../utils/constants");
 /**
  * A Sequelize scope for filtering models by custom fields.
  * This scope builds a WHERE clause to be applied on the main query.
@@ -14,27 +13,16 @@ const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
  * @returns {Function} - A function that takes conditions and returns the Sequelize options object.
  */
 const customFieldsFilterScope = (name) => (conditions) => {
-    if (!conditions || Object.keys(conditions).length === 0) {
-        return {};
-    }
     // Build the WHERE clause for custom field filtering
-    const conditionsStrings = Object.entries(conditions)
+    const customFieldConditions = Object.entries(conditions)
         .map(([key, value]) => {
         if (Array.isArray(value)) {
-            if (value.length === 0) {
-                // if empty array, the condition is ignored
-                return false;
-            }
             const values = value.map((v) => `'${v}'`).join(',');
             return `custom_fields->>'${key}' IN (${values})`;
         }
         return `custom_fields->>'${key}' = '${value}'`;
     })
-        .filter(Boolean);
-    if (conditionsStrings.length === 0) {
-        return {};
-    }
-    const customFieldConditions = conditionsStrings.join(' AND ');
+        .join(' AND ');
     const subQuery = `${'SELECT model_id FROM ('
         + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '
         + 'FROM custom_field_values AS cv '
@@ -52,4 +40,4 @@ const customFieldsFilterScope = (name) => (conditions) => {
     };
 };
 exports.customFieldsFilterScope = customFieldsFilterScope;
-exports.scopeName = CUSTOM_FIELDS_FILTER_SCOPE;
+exports.scopeName = constants_1.CUSTOM_FIELDS_FILTER_SCOPE;

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.ContextTestModel.destroy({ where: {} });
     }
 };
 exports.cleanup = cleanup;