@autofleet/sadot 0.5.4-beta.17 → 0.5.4-beta.19

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

@@ -41,7 +41,6 @@ const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, (subStr) => subStr.repla
 router.post('/', async (req, res) => {
     const { modelName } = req.params;
     const modelType = toPascalCase(modelName);
-    logger_1.default.info('sadot Creating custom field definition', { modelName });
     try {
         const validatedPayload = await (0, validations_1.validateCustomFieldDefinitionCreation)(req.body);
         const customFieldDefinition = await DefinitionRepo.create({
@@ -84,9 +83,7 @@ router.get('/', async (req, res) => {
         if (entityIds?.length > 0) {
             where.entityId = entityIds;
         }
-        logger_1.default.info('sadot Fetching custom field definitions', { modelType, entityIds, where });
         const customFieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true });
-        logger_1.default.info('sadot Fetched custom field definitions customFieldDefinitions', { customFieldDefinitions });
         return res.json(customFieldDefinitions);
     }
     catch (err) {
@@ -101,7 +98,6 @@ router.patch('/:customFieldDefinitionId', async (req, res) => {
     const { customFieldDefinitionId, modelName } = req.params;
     const modelType = toPascalCase(modelName);
     try {
-        logger_1.default.info('sadot Updating custom field definition', { customFieldDefinitionId, modelType });
         // eslint-disable-next-line max-len
         const validatedPayload = await (0, validations_1.validateCustomFieldDefinitionUpdate)(req.body);
         const customFieldDefinition = await DefinitionRepo.findByWhere({

package/dist/hooks/create.d.ts

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

package/dist/hooks/create.js

@@ -22,12 +22,8 @@ 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 });
 exports.beforeCreate = exports.beforeBulkCreate = void 0;
-const logger_1 = __importDefault(require("../utils/logger"));
 const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
 const errors_1 = require("../errors");
@@ -44,11 +40,14 @@ exports.beforeBulkCreate = beforeBulkCreate;
  * A hook to create the custom fields when updating a model instance.
  * TODO - cleanup if update fail
  */
-const beforeCreate = (scopeAttributes) => async (instance, options) => {
-    logger_1.default.debug('sadot - before create hook');
+const beforeCreate = (scopeAttributes, modelOptions) => async (instance, options) => {
     const { fields } = options;
     const modelType = instance.constructor.name;
-    const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
+    const { scopeAttributeReplacer } = modelOptions;
+    let identifiers = scopeAttributes.map((attribute) => instance[attribute]);
+    if (scopeAttributeReplacer) {
+        identifiers = await scopeAttributeReplacer(identifiers);
+    }
     // get all model's required definitions
     const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers);
     const customFieldsIdx = fields.indexOf('customFields');
@@ -59,7 +58,9 @@ const beforeCreate = (scopeAttributes) => async (instance, options) => {
         if (missingFields?.length > 0) {
             throw new errors_1.MissingRequiredCustomFieldError(missingFields);
         }
-        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, { transaction: options.transaction });
+        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,6 +1,7 @@
+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) => (instancesOrInstance: any | any[], options: any) => Promise<void>;
+declare const enrichResults: (modelType: string, scopeAttributes: string[], getScope: any, hookType?: SupportedHookTypes, modelOptions?: ModelOptions) => (instancesOrInstance: any | any[], options: any) => Promise<void>;
 export default enrichResults;

package/dist/hooks/enrich.js

@@ -22,10 +22,14 @@ 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"));
 /**
  * Serialize custom fields value into the format of {[name] -> [fieldData]}
  */
@@ -40,7 +44,8 @@ const serializeCustomFields = (customFieldValues, customFieldDefinitionsHash) =>
 /**
  * A hook to attach the custom fields when fetching a model instances.
  */
-const enrichResults = (modelType, scopeAttributes, hookType) => async (instancesOrInstance, options) => {
+const enrichResults = (modelType, scopeAttributes, getScope, hookType, modelOptions) => async (instancesOrInstance, options) => {
+    const { scopeAttributeReplacer } = modelOptions;
     if (options.originalAttributes?.length > 0
         && !options.originalAttributes?.includes?.('customFields')) {
         return;
@@ -50,20 +55,24 @@ const enrichResults = (modelType, scopeAttributes, hookType) => async (instances
         ? instancesOrInstance
         : [instancesOrInstance];
     instances = instances.filter(Boolean);
-    const identifiers = instances.map((instance) => scopeAttributes
+    let identifiers = instances.map((instance) => scopeAttributes
         .map((attr) => instance[attr])).flat();
+    if (scopeAttributeReplacer) {
+        identifiers = await scopeAttributeReplacer(identifiers);
+    }
+    logger_1.default.info('enrichResults - sadot - indentifiers: ', identifiers);
     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 });
+    const customFieldDefinitions = await DefinitionRepo.findByEntityIds(modelType, uniqueIdentifiers, { transaction: options.transaction, getScope });
     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,3 +1,4 @@
+import { ModelOptions } from '../types';
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
  */
@@ -6,4 +7,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[]) => (instance: any, options: any) => Promise<void>;
+export declare const beforeUpdate: (scopeAttributes: string[], modelOptions: ModelOptions) => (instance: any, options: any) => Promise<void>;

package/dist/hooks/update.js

@@ -42,11 +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) => async (instance, options) => {
+const beforeUpdate = (scopeAttributes, modelOptions) => async (instance, options) => {
     logger_1.default.debug('sadot - before update hook');
     const { fields } = options;
+    const { scopeAttributeReplacer } = modelOptions;
     const modelType = instance.constructor.name;
-    const identifiers = scopeAttributes.map((attribute) => instance[attribute]);
+    let identifiers = scopeAttributes.map((attribute) => instance[attribute]);
+    if (scopeAttributeReplacer) {
+        identifiers = await scopeAttributeReplacer(identifiers);
+    }
     const customFieldsIdx = fields.indexOf('customFields');
     if (customFieldsIdx > -1) {
         const { customFields } = instance;

package/dist/index.js

@@ -32,7 +32,7 @@ __exportStar(require("./utils/constants"), exports);
 const useCustomFields = async (app, getModel, options) => {
     const { models } = options;
     if (app) {
-        app.use('/api', options.middleware, api_1.default);
+        app.use('/api', api_1.default);
     }
     const sequelize = (0, db_1.default)(options.databaseConfig);
     if (process.env.NODE_ENV === 'test') {
@@ -40,7 +40,7 @@ const useCustomFields = async (app, getModel, options) => {
     }
     // The order is important
     (0, init_1.addHooks)(models, getModel);
-    await (0, models_1.initTables)(sequelize, options.getUser, options.enrichUserPermissions);
+    await (0, models_1.initTables)(sequelize, options.getUser);
     (0, init_1.addScopes)(models, getModel);
     logger_1.default.debug('sadot - custom fields finished initializing with models', models);
     return sequelize;

package/dist/models/index.d.ts

@@ -2,7 +2,9 @@ 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, enrichUserPermissions: any) => Promise<void>;
+declare const initTables: (sequelize: Sequelize, getUser: any) => Promise<void>;
 declare const initTestModels: (sequelize: Sequelize) => Promise<void>;
-export { CustomFieldValue, CustomFieldDefinition, TestModel, AssociatedTestModel, initTables, initTestModels, };
+export { CustomFieldValue, CustomFieldDefinition, TestModel, AssociatedTestModel, ContextAwareTestModel, ContextModel, 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.AssociatedTestModel = exports.TestModel = exports.CustomFieldDefinition = exports.CustomFieldValue = void 0;
+exports.initTestModels = exports.initTables = exports.ContextModel = 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"));
@@ -13,14 +13,18 @@ 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];
+const testModels = [TestModel_1.default, AssociatedTestModel_1.default, ContextAwareTestModel_1.default, ContextModel_1.default];
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
 const SCHEMA_VERSION = 1;
 const CUSTOM_FIELDS_SCHEMA_VERSION = `${SADOT_MIGRATION_PREFIX}_${SCHEMA_VERSION}`;
-const initTables = async (sequelize, getUser, enrichUserPermissions) => {
+const initTables = async (sequelize, getUser) => {
     logger_1.default.info('custom-fields: initialize custom-fields tables');
     // Detect models and import them to the orm
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@@ -28,22 +32,16 @@ const initTables = async (sequelize, getUser, enrichUserPermissions) => {
         throw new Error('sequelize instance must have addModels function');
     }
     sequelize.addModels(productionModels);
-    CustomFieldDefinition_1.default.addScope('userScope', (entityIds) => {
+    CustomFieldDefinition_1.default.addScope('userScope', () => {
         const user = getUser();
         if (user?.permissions) {
-            logger_1.default.info('custom fields scope added', { entityIds, permissions: user.permissions, enrichUserPermissions: !!enrichUserPermissions });
-            const entityId = [
-                ...Object.keys(user.permissions.fleets),
-                ...Object.keys(user.permissions.businessModels),
-                ...Object.keys(user.permissions.demandSources),
-            ];
-            if (enrichUserPermissions && entityIds && Array.isArray(entityIds)) {
-                entityId.push(...entityIds);
-            }
-            logger_1.default.info('custom fields scope added updated entity:', { entityId });
             return {
                 where: {
-                    entityId,
+                    entityId: [
+                        ...Object.keys(user.permissions.fleets),
+                        ...Object.keys(user.permissions.businessModels),
+                        ...Object.keys(user.permissions.demandSources),
+                    ],
                 },
             };
         }
@@ -88,6 +86,8 @@ 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/models/tests/contextAwareModels/ContextAwareTestModel.d.ts

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

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

@@ -0,0 +1,55 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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 */
+const sequelize_typescript_1 = require("sequelize-typescript");
+const ContextModel_1 = __importDefault(require("./ContextModel"));
+let ContextAwareTestModel = class ContextAwareTestModel extends sequelize_typescript_1.Model {
+};
+__decorate([
+    sequelize_typescript_1.PrimaryKey,
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.UUID,
+        defaultValue: sequelize_typescript_1.DataType.UUIDV4,
+        allowNull: false,
+    }),
+    __metadata("design:type", String)
+], ContextAwareTestModel.prototype, "id", void 0);
+__decorate([
+    (0, sequelize_typescript_1.ForeignKey)(() => ContextModel_1.default),
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.UUID,
+    }),
+    __metadata("design:type", String)
+], ContextAwareTestModel.prototype, "contextId", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.BOOLEAN,
+    }),
+    __metadata("design:type", Boolean)
+], ContextAwareTestModel.prototype, "coolAttribute", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.VIRTUAL,
+    }),
+    __metadata("design:type", Object)
+], ContextAwareTestModel.prototype, "customFields", void 0);
+__decorate([
+    (0, sequelize_typescript_1.BelongsTo)(() => ContextModel_1.default),
+    __metadata("design:type", ContextModel_1.default)
+], ContextAwareTestModel.prototype, "context", void 0);
+ContextAwareTestModel = __decorate([
+    (0, sequelize_typescript_1.Table)({ createdAt: false, updatedAt: false })
+], ContextAwareTestModel);
+exports.default = ContextAwareTestModel;

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

@@ -0,0 +1,13 @@
+import { Model } from 'sequelize-typescript';
+declare enum EEntityTypes {
+    BUSINESS_MODEL = "businessModel",
+    CONTEXT = "context",
+    DEMAND_SOURCE = "demandSource",
+    FLEET = "fleet"
+}
+declare class ContextModel extends Model {
+    id: string;
+    entityId: string;
+    entityType: EEntityTypes;
+}
+export default ContextModel;

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

@@ -0,0 +1,47 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const sequelize_typescript_1 = require("sequelize-typescript");
+// eslint-disable-next-line no-shadow
+var EEntityTypes;
+(function (EEntityTypes) {
+    EEntityTypes["BUSINESS_MODEL"] = "businessModel";
+    EEntityTypes["CONTEXT"] = "context";
+    EEntityTypes["DEMAND_SOURCE"] = "demandSource";
+    EEntityTypes["FLEET"] = "fleet";
+})(EEntityTypes || (EEntityTypes = {}));
+let ContextModel = class ContextModel extends sequelize_typescript_1.Model {
+};
+__decorate([
+    sequelize_typescript_1.PrimaryKey,
+    (0, sequelize_typescript_1.Column)({
+        defaultValue: sequelize_typescript_1.DataType.UUIDV4,
+        type: sequelize_typescript_1.DataType.UUID,
+    }),
+    __metadata("design:type", String)
+], ContextModel.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);
+__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([
+    (0, sequelize_typescript_1.Table)({ createdAt: false, updatedAt: false })
+], ContextModel);
+exports.default = ContextModel;

package/dist/repository/definition.d.ts

@@ -1,10 +1,10 @@
+import { WhereOptions } from 'sequelize';
 import { CustomFieldDefinition } from '../models';
 import type { CreateCustomFieldDefinition, UpdateCustomFieldDefinition } from '../types/definition';
 export declare const create: (data: CreateCustomFieldDefinition) => Promise<CustomFieldDefinition>;
-export declare const findAll: (where: any, options?: any) => Promise<CustomFieldDefinition[]>;
+export declare const findAll: (where: WhereOptions, 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 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[]>;

package/dist/repository/definition.js

@@ -1,19 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getRequiredFields = exports.destroy = exports.disable = exports.update = exports.findDefinitionsByModels = exports.findByWhere = exports.findByEntityIds = exports.findById = exports.findByIds = exports.findAll = exports.create = void 0;
 const sequelize_1 = require("sequelize");
 const models_1 = require("../models");
+const logger_1 = __importDefault(require("../utils/logger"));
 const create = (data) => models_1.CustomFieldDefinition.create(data);
 exports.create = create;
 const findAll = (where, options = { withDisabled: false }) => {
     const queryModel = options.withDisabled
         ? models_1.CustomFieldDefinition.unscoped()
         : models_1.CustomFieldDefinition;
-    return queryModel.scope({ method: ['userScope', where.entityId] }).findAll({
+    logger_1.default.info('sadot - whereQuery', { options });
+    return queryModel.scope('userScope').findAll({
         where,
-        transaction: options.transaction,
         raw: true,
-        logging: console.log,
+        logging: true,
     });
 };
 exports.findAll = findAll;
@@ -27,23 +31,18 @@ const findById = (id, options = { withDisabled: false }) => {
     return models_1.CustomFieldDefinition.scope('userScope').findByPk(id);
 };
 exports.findById = findById;
-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,
         entityId: entityIds,
     },
     transaction: options.transaction,
+    include: options.include,
     raw: true,
 });
 exports.findByEntityIds = findByEntityIds;
 const findByWhere = (where) => models_1.CustomFieldDefinition.scope('userScope').findOne({
     where,
-    logging: console.log,
 });
 exports.findByWhere = findByWhere;
 const findDefinitionsByModels = async (modelTypes, options) => {
@@ -73,7 +72,11 @@ exports.destroy = destroy;
 const getRequiredFields = async (modelType, modelId, entityId) => {
     const entityIds = Array.isArray(entityId) ? entityId : [entityId];
     const requiredFields = await models_1.CustomFieldDefinition.findAll({
-        where: { required: true, modelType, entityId: { [sequelize_1.Op.in]: entityIds } },
+        where: {
+            required: true,
+            modelType,
+            entityId: { [sequelize_1.Op.in]: entityIds },
+        },
         logging: true,
     });
     const requiredFieldsNames = requiredFields.map((definition) => definition.name);

package/dist/repository/value.js

@@ -73,11 +73,18 @@ 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);
-    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}`, {
+        names, options, valuesToUpdate, entityId: 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/tests/helpers/database-config.d.ts

@@ -4,6 +4,7 @@ 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,6 +6,7 @@ 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,6 +7,8 @@ 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,4 +1,10 @@
 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,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefinitions = exports.createDefinition = exports.rangeField = exports.enumField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = void 0;
+exports.createDefinitions = exports.createDefinition = exports.rangeField = exports.enumField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = exports.contextAwareFieldDefinition = 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/tests/mocks/testModel.d.ts

@@ -1,5 +1,5 @@
 import { TestModel } from '../../models';
-export declare const createTestModel: (payload?: {}) => Promise<TestModel>;
+export declare const createTestModel: (payload?: {}, model?: any) => any;
 export declare const createTestModels: (fleetId: any, total: number) => Promise<TestModel[]>;
 export declare const upsertTestModel: (payload: any) => Promise<[TestModel, boolean]>;
 export declare const destroyTestModels: () => Promise<number>;

package/dist/tests/mocks/testModel.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTestModelWithAssociation = exports.createTestModelWithAssociation = exports.updateTestModel = exports.getSomeTestModels = exports.getTestModel = exports.destroyTestModels = exports.upsertTestModel = exports.createTestModels = exports.createTestModel = void 0;
 const models_1 = require("../../models");
-const createTestModel = (payload = {}) => models_1.TestModel.create(payload);
+const createTestModel = (payload = {}, model = models_1.TestModel) => model.create(payload);
 exports.createTestModel = createTestModel;
 const createTestModels = (fleetId, total) => {
     const models = [];

package/dist/types/index.d.ts

@@ -1,16 +1,17 @@
-import { RequestHandler } from 'express';
 export type ModelFetcher = (name: string) => any;
 export type ModelOptions = {
+    scopeAttributeReplacer?: (attributes?: string[]) => Promise<any>;
+};
+export type Models = {
     name: string;
     scopeAttributes: string[];
+    modelOptions?: ModelOptions;
     creationWebhookHandler?: (instance: any) => any;
     updateWebhookHandler?: (instance: any) => any;
     deletionWebhookHandler?: (instance: any) => any;
 };
 export type CustomFieldOptions = {
-    models: ModelOptions[];
+    models: Models[];
     databaseConfig: any;
     getUser: () => any;
-    enrichUserPermissions?: (entityIds: string[]) => any;
-    middleware?: RequestHandler;
 };

package/dist/utils/init.d.ts

@@ -1,4 +1,4 @@
-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;
+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;