@autofleet/sadot 0.7.4 → 0.7.6-beta-0ecad376.1

package/.nvmrc

@@ -1 +1 @@
-18.17.1
+22.9.0

package/dist/hooks/create.js

@@ -48,27 +48,38 @@ exports.beforeBulkCreate = beforeBulkCreate;
 const beforeCreate = (scopeAttributes, modelOptions = {}) => async (instance, options) => {
     logger_1.default.debug('sadot - before create hook');
     const { fields } = options;
+    const { include, useEntityIdFromInclude } = modelOptions;
     const modelType = instance.constructor.name;
     const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
-    // get all model's required definitions
-    const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers, modelOptions);
+    const where = {
+        modelType,
+        ...(!useEntityIdFromInclude && { entityId: identifiers }),
+    };
+    const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: false, transaction: options.transaction, include: include?.(identifiers) });
+    const requiredFieldsNames = Array.from(new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)));
     const customFieldsIdx = fields.indexOf('customFields');
+    if ((customFieldsIdx === -1 || !instance.customFields) && requiredFieldsNames?.length > 0) {
+        throw new errors_1.MissingRequiredCustomFieldError(requiredFieldsNames);
+    }
+    // eslint-disable-next-line no-param-reassign
+    instance.customFields || (instance.customFields = {});
     const { customFields } = instance;
-    if (customFieldsIdx > -1 && customFields) {
-        const fieldsNames = Object.keys(customFields);
-        const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
-        if (missingFields?.length > 0) {
-            throw new errors_1.MissingRequiredCustomFieldError(missingFields);
-        }
-        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, {
-            transaction: options.transaction,
-            modelOptions,
-        }, true);
-        // eslint-disable-next-line no-param-reassign
-        fields.splice(customFieldsIdx, 1);
+    fieldDefinitions.filter((def) => !(def.name in customFields) && ![null, undefined].includes(def.defaultValue)).forEach(({ name, defaultValue }) => {
+        customFields[name] = defaultValue;
+    });
+    if (customFieldsIdx === -1) {
+        return;
     }
-    else if (requiredFieldsNames?.length > 0) {
-        throw new errors_1.MissingRequiredCustomFieldError(requiredFieldsNames);
+    const fieldsNames = Object.keys(customFields);
+    const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
+    if (missingFields?.length > 0) {
+        throw new errors_1.MissingRequiredCustomFieldError(missingFields);
     }
+    await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, {
+        transaction: options.transaction,
+        modelOptions,
+    });
+    // eslint-disable-next-line no-param-reassign
+    fields.splice(customFieldsIdx, 1);
 };
 exports.beforeCreate = beforeCreate;

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

@@ -28,9 +28,7 @@ __decorate([
 ], ContextAwareTestModel.prototype, "id", void 0);
 __decorate([
     (0, sequelize_typescript_1.ForeignKey)(() => ContextTestModel_1.default),
-    (0, sequelize_typescript_1.Column)({
-        type: sequelize_typescript_1.DataType.UUID,
-    }),
+    (0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.UUID }),
     __metadata("design:type", String)
 ], ContextAwareTestModel.prototype, "contextId", void 0);
 __decorate([

package/dist/repository/definition.d.ts

@@ -1,20 +1,26 @@
-import { type FindOptions, type WhereOptions } from 'sequelize';
+import { type Includeable, type Transaction, 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 findByIds: (ids: string[], options?: any) => Promise<CustomFieldDefinition[]>;
-export declare const findById: (id: string, options?: any) => Promise<CustomFieldDefinition | null>;
+interface SadotFindOptions {
+    withDisabled?: boolean;
+    transaction?: Transaction;
+    include?: Includeable | Includeable[];
+}
+export declare const findAll: (where: WhereOptions, options?: SadotFindOptions) => Promise<CustomFieldDefinition[]>;
+export declare const findByIds: (ids: string[], options?: SadotFindOptions) => Promise<CustomFieldDefinition[]>;
+export declare const findById: (id: string, options?: Pick<SadotFindOptions, 'withDisabled'>) => Promise<CustomFieldDefinition | null>;
 export declare const findByEntityIds: (modelType: string, entityIds: string[], options?: FindOptions & {
     modelOptions?: ModelOptions;
 }) => 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>;
-export declare const disable: (id: string) => Promise<any>;
-export declare const destroy: (id: string) => Promise<any>;
+export declare const disable: (id: string) => Promise<[affectedCount: number]>;
+export declare const destroy: (id: string) => Promise<number>;
 /**
  * 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 {};

package/dist/repository/value.d.ts

@@ -24,5 +24,5 @@ export declare const findValuesByModelIds: (modelIds: string[], options?: any) =
  */
 export declare const updateValues: (modelType: string, modelId: string, identifiers: string[], valuesToUpdate: ValuesToUpdate, options?: FindOptions & {
     modelOptions?: ModelOptions;
-}, defineAllDefaults?: boolean) => Promise<CustomFieldValue[]>;
+}) => Promise<CustomFieldValue[]>;
 export declare const deleteValue: (id: string, options?: any) => Promise<any>;

package/dist/repository/value.js

@@ -84,7 +84,7 @@ const formatFunctions = {
  * Create new value record if not exists, but fails if value's definition not exist.
  * Return the updated values
  */
-const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}, defineAllDefaults = false) => {
+const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
     const names = Object.keys(valuesToUpdate);
     logger_1.default.debug(`custom-fields: updating values for ${modelType} ${modelId}`, {
         names,
@@ -96,11 +96,9 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
     const where = {
         modelType,
         name: names,
+        ...(!options.modelOptions?.useEntityIdFromInclude && { entityId: identifiers }),
     };
-    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(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) ?? [];
     const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
         logger_1.default.warn(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
@@ -112,10 +110,8 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
     if (valuesWithDisabledDefinitions?.length > 0) {
         logger_1.default.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
     }
-    const visitedFields = new Set();
     const values = names.map((name) => {
         const fieldDefinition = fieldDefinitions.find((def) => def.name === name);
-        visitedFields.add(fieldDefinition);
         const formatFunction = formatFunctions[fieldDefinition.fieldType];
         return {
             modelId,
@@ -124,16 +120,6 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
             customFieldDefinitionId: fieldDefinition.id,
         };
     });
-    if (defineAllDefaults) {
-        fieldDefinitions.filter((def) => !visitedFields.has(def) && ![null, undefined].includes(def.defaultValue)).forEach(({ id, defaultValue }) => {
-            values.push({
-                modelId,
-                value: defaultValue,
-                updatedAt: new Date(),
-                customFieldDefinitionId: id,
-            });
-        });
-    }
     return Promise.all(values.map(async (value) => {
         const [cfv] = await models_1.CustomFieldValue.upsert(value, {
             transaction: options.transaction,

package/dist/scopes/filter.js

@@ -1,18 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFieldsSortScope = 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 moment_1 = __importDefault(require("moment"));
 const helpers_1 = require("../utils/helpers");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
+const isDate = (input) => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
 const castIfNeeded = (conditionValue) => {
-    if (moment_1.default.isDate(conditionValue)) {
+    if (isDate(conditionValue)) {
         return '::timestamp';
     }
     if (!Number.isNaN(Number(conditionValue))) {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDefinitions = exports.createDefinition = exports.statusField = exports.selectField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = exports.contextAwareFieldDefinition = void 0;
-const uuid_1 = require("uuid");
+const node_crypto_1 = require("node:crypto");
 exports.contextAwareFieldDefinition = {
     name: 'cool field',
     modelType: 'ContextAwareTestModel',
@@ -12,7 +12,7 @@ exports.coolFieldDefinition = {
     name: 'cool field',
     modelType: 'TestModel',
     fieldType: 'number',
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 };
 exports.coolFieldDefinition2 = {
@@ -27,7 +27,7 @@ const booleanField = (modelType) => ({
     name: 'shapeless',
     modelType,
     fieldType: 'boolean',
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 });
 exports.booleanField = booleanField;
@@ -36,7 +36,7 @@ const selectField = (modelType, options) => ({
     modelType,
     fieldType: 'select',
     validation: options,
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 });
 exports.selectField = selectField;
@@ -45,25 +45,25 @@ const statusField = (modelType, options) => ({
     modelType,
     fieldType: 'status',
     validation: options,
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 });
 exports.statusField = statusField;
 // eslint-disable-next-line max-len
 const createDefinition = (defaults) => ({
-    name: defaults?.name || `def_${(0, uuid_1.v4)()}`,
+    name: defaults?.name || `def_${(0, node_crypto_1.randomUUID)()}`,
     modelType: defaults?.modelType || 'TestModel',
     fieldType: defaults?.fieldType || 'boolean',
-    entityId: defaults?.entityId || (0, uuid_1.v4)(),
+    entityId: defaults?.entityId || (0, node_crypto_1.randomUUID)(),
     entityType: defaults?.entityType || 'fleetId',
     ...(defaults?.defaultValue && { defaultValue: defaults.defaultValue }),
 });
 exports.createDefinition = createDefinition;
 const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map((_) => ({
-    name: defaults?.name || `def_${(0, uuid_1.v4)()}`,
+    name: defaults?.name || `def_${(0, node_crypto_1.randomUUID)()}`,
     modelType: defaults?.modelType || 'TestModel',
     fieldType: defaults?.fieldType || 'boolean',
-    entityId: defaults?.entityId || (0, uuid_1.v4)(),
+    entityId: defaults?.entityId || (0, node_crypto_1.randomUUID)(),
     entityType: defaults?.entityType || 'fleetId',
 })));
 exports.createDefinitions = createDefinitions;

package/dist/utils/logger/index.d.ts

@@ -1,2 +1,2 @@
-declare const logger: any;
+declare const logger: import("@autofleet/logger").LoggerInstanceManager;
 export default logger;

package/dist/utils/logger/index.js

@@ -1,6 +1,8 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Logger = require('@autofleet/logger');
-const logger = Logger();
+const logger_1 = __importDefault(require("@autofleet/logger"));
+const logger = (0, logger_1.default)();
 exports.default = logger;

package/package.json

@@ -1,27 +1,24 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.7.4",
+  "version": "0.7.6-beta-0ecad376.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
-    "start": "ts-node  src/index.ts",
+    "start": "ts-node src/index.ts",
     "build": "rm -rf dist && tsc",
-    "linter": "./node_modules/.bin/eslint .",
+    "linter": "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",
+    "build-to-local-repo": "node --run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
     "dev": "nodemon",
     "watch": "npm-watch build-to-local-repo",
-    "publish-dev": "npm run build && npm publish --tag dev"
+    "publish-dev": "node --run build && npm publish --tag dev"
   },
   "watch": {
     "build-to-local-repo": {
       "extensions": [
         "js",
-        "jsx",
-        "ts",
-        "tsx",
-        "css"
+        "ts"
       ],
       "patterns": [
         "src"
@@ -30,27 +27,24 @@
     }
   },
   "dependencies": {
-    "@autofleet/common-types": "^1.7.42",
-    "@autofleet/errors": "^1.0.10",
+    "@autofleet/common-types": "^1.7.58",
+    "@autofleet/errors": "^1.2.3",
     "@autofleet/events": "^2.0.0",
-    "@autofleet/logger": "^2.0.5",
+    "@autofleet/logger": "^4.1.0",
     "express": "^4.18.2",
     "joi": "^17.7.0",
-    "moment": "^2.30.1",
     "pg": "^8.10.0",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.31.1",
-    "sequelize-typescript": "^2.1.5",
-    "uuid": "^9.0.0"
+    "sequelize-typescript": "^2.1.5"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/jest": "^27.0.9",
-    "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-typescript": "^12.0.0",
+    "@types/jest": "^29.5.13",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^29.7.0",
     "npm-watch": "^0.11.0",

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

@@ -65,8 +65,7 @@ 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

@@ -1,3 +1,4 @@
+import type { WhereOptions } from 'sequelize';
 import logger from '../utils/logger';
 import * as ValueRepo from '../repository/value';
 import * as DefinitionRepo from '../repository/definition';
@@ -23,38 +24,49 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
 ): Promise<void> => {
   logger.debug('sadot - before create hook');
   const { fields } = options;
+  const { include, useEntityIdFromInclude } = modelOptions;
   const modelType = instance.constructor.name;
 
   const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
-  // get all model's required definitions
-  const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType,
-    instance.id, identifiers, modelOptions);
+  const where: WhereOptions = {
+    modelType,
+    ...(!useEntityIdFromInclude && { entityId: identifiers }),
+  };
+  const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: false, transaction: options.transaction, include: include?.(identifiers) });
+  const requiredFieldsNames = Array.from(new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)));
 
   const customFieldsIdx = fields.indexOf('customFields');
-  const { customFields } = instance;
-  if (customFieldsIdx > -1 && customFields) {
-    const fieldsNames = Object.keys(customFields);
-    const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
-    if (missingFields?.length > 0) {
-      throw new MissingRequiredCustomFieldError(missingFields);
-    }
-
-    await ValueRepo.updateValues(
-      modelType,
-      instance.id,
-      identifiers,
-      customFields,
-      {
-        transaction: options.transaction,
-        modelOptions,
-      },
-      true,
-    );
 
-    // eslint-disable-next-line no-param-reassign
-    fields.splice(customFieldsIdx, 1);
-  } else if (requiredFieldsNames?.length > 0) {
+  if ((customFieldsIdx === -1 || !instance.customFields) && requiredFieldsNames?.length > 0) {
     throw new MissingRequiredCustomFieldError(requiredFieldsNames);
   }
+  // eslint-disable-next-line no-param-reassign
+  instance.customFields ||= {};
+  const { customFields } = instance;
+  fieldDefinitions.filter((def) => !(def.name in customFields) && ![null, undefined].includes(def.defaultValue)).forEach(({ name, defaultValue }) => {
+    customFields[name] = defaultValue;
+  });
+  if (customFieldsIdx === -1) {
+    return;
+  }
+  const fieldsNames = Object.keys(customFields);
+  const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
+  if (missingFields?.length > 0) {
+    throw new MissingRequiredCustomFieldError(missingFields);
+  }
+
+  await ValueRepo.updateValues(
+    modelType,
+    instance.id,
+    identifiers,
+    customFields,
+    {
+      transaction: options.transaction,
+      modelOptions,
+    },
+  );
+
+  // eslint-disable-next-line no-param-reassign
+  fields.splice(customFieldsIdx, 1);
 };

package/src/models/CustomFieldDefinition.ts

@@ -46,18 +46,18 @@ class CustomFieldDefinition extends Model {
     defaultValue: DataType.UUIDV4,
     allowNull: false,
   })
-  id!: string;
+    id!: string;
 
   @Column({
     type: DataType.STRING,
     allowNull: false,
   })
-  name!: string;
+    name!: string;
 
   @Column({
     type: DataType.STRING,
   })
-  displayName?: string; // Defaulted to name with beforeCreate hook
+    displayName?: string; // Defaulted to name with beforeCreate hook
 
   @Is('SupportedType', (value) => {
     if (!Object.values(CustomFieldDefinitionType).includes(value as CustomFieldDefinitionType)) {
@@ -68,65 +68,65 @@ class CustomFieldDefinition extends Model {
     type: DataType.STRING,
     allowNull: false,
   })
-  fieldType!: CustomFieldDefinitionType;
+    fieldType!: CustomFieldDefinitionType;
 
   @Column({
     type: DataType.JSONB,
   })
-  validation?: any;
+    validation?: any;
 
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  entityId!: string; /** Client association entity id */
+    entityId!: string; /** Client association entity id */
 
   @Column({
     type: DataType.STRING,
     allowNull: false,
   })
-  entityType!: string; /** Client association entity type (demand source / fleet / etc.) */
+    entityType!: string; /** Client association entity type (demand source / fleet / etc.) */
 
   @Column({
     type: DataType.STRING,
     allowNull: false,
   })
-  modelType!: string; /** Model type. e.g. Vehicle / StopPoint / etc. */
+    modelType!: string; /** Model type. e.g. Vehicle / StopPoint / etc. */
 
   @Column({
     type: DataType.TEXT,
   })
-  description?: string;
+    description?: string;
 
   @Column({
     type: DataType.BOOLEAN,
     defaultValue: false,
   })
-  required?: boolean;
+    required?: boolean;
 
   @Column({
     type: DataType.BOOLEAN,
     defaultValue: false,
   })
-  disabled?: boolean;
+    disabled?: boolean;
 
-    @Column({
-      type: DataType.JSONB,
-      allowNull: true,
-    })
-      defaultValue?: any;
+  @Column({
+    type: DataType.JSONB,
+    allowNull: true,
+  })
+    defaultValue?: any;
 
   @Column
-  createdAt?: Date;
+    createdAt?: Date;
 
   @Column
-  updatedAt?: Date;
+    updatedAt?: Date;
 
   @Column
-  deletedAt?: Date;
+    deletedAt?: Date;
 
   @HasMany(() => CustomFieldValue)
-  values: CustomFieldValue[];
+    values: CustomFieldValue[];
 
   @BeforeCreate
   static displayNameDefaultValue(instance: CustomFieldDefinition): void {

package/src/models/CustomFieldValue.ts

@@ -28,7 +28,7 @@ class CustomFieldValue extends Model {
     type: DataType.UUID,
     allowNull: false,
   })
-  modelId!: string;
+    modelId!: string;
 
   @PrimaryKey
   @ForeignKey(() => CustomFieldDefinition)
@@ -36,25 +36,25 @@ class CustomFieldValue extends Model {
     type: DataType.UUID,
     allowNull: false,
   })
-  customFieldDefinitionId!: string;
+    customFieldDefinitionId!: string;
 
   @Column({
     type: DataType.JSONB,
     allowNull: true,
   })
-  value!: any;
+    value!: any;
 
   @Column
-  createdAt?: Date;
+    createdAt?: Date;
 
   @Column
-  updatedAt?: Date;
+    updatedAt?: Date;
 
   @Column
-  deletedAt?: Date;
+    deletedAt?: Date;
 
   @BelongsTo(() => CustomFieldDefinition, { scope: { disabled: false } })
-  customFieldDefinition: CustomFieldDefinition;
+    customFieldDefinition: CustomFieldDefinition;
 
   @BeforeBulkCreate
   @BeforeBulkUpdate

package/src/models/tests/AssociatedTestModel.ts

@@ -18,40 +18,40 @@ class AssociatedTestModel extends Model {
     defaultValue: DataType.UUIDV4,
     allowNull: false,
   })
-  id!: string;
+    id!: string;
 
   @ForeignKey(() => TestModel)
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  testModelId!: string;
+    testModelId!: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  fleetId: string;
+    fleetId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  businessModelId: string;
+    businessModelId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  demandSourceId: string;
+    demandSourceId: string;
 
   @Column({
     type: DataType.BOOLEAN,
   })
-  anotherAttribute?: boolean;
+    anotherAttribute?: boolean;
 
   @BelongsTo(() => TestModel)
-  testModel: TestModel;
+    testModel: TestModel;
 }
 
 export default AssociatedTestModel;

package/src/models/tests/TestModel.ts

@@ -17,38 +17,38 @@ class TestModel extends Model {
     defaultValue: DataType.UUIDV4,
     allowNull: false,
   })
-  id!: string;
+    id!: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  fleetId: string;
+    fleetId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  businessModelId: string;
+    businessModelId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  demandSourceId: string;
+    demandSourceId: string;
 
   @Column({
     type: DataType.BOOLEAN,
   })
-  coolAttribute?: boolean;
+    coolAttribute?: boolean;
 
   @HasMany(() => AssociatedTestModel)
-  associatedModels: AssociatedTestModel[];
+    associatedModels: AssociatedTestModel[];
 
   @Column({
     type: DataType.VIRTUAL,
   })
-  customFields?: any;
+    customFields?: any;
 }
 
 export default TestModel;

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

@@ -14,32 +14,30 @@ import ContextTestModel from './ContextTestModel';
 
 @Table({ createdAt: false, updatedAt: false })
 class ContextAwareTestModel extends Model {
-    @PrimaryKey
-    @Column({
-      type: DataType.UUID,
-      defaultValue: DataType.UUIDV4,
-      allowNull: false,
-    })
+  @PrimaryKey
+  @Column({
+    type: DataType.UUID,
+    defaultValue: DataType.UUIDV4,
+    allowNull: false,
+  })
     id!: string;
 
   @ForeignKey(() => ContextTestModel)
-    @Column({
-      type: DataType.UUID,
-    })
-      contextId: string;
+  @Column({ type: DataType.UUID })
+    contextId: string;
 
-    @Column({
-      type: DataType.BOOLEAN,
-    })
+  @Column({
+    type: DataType.BOOLEAN,
+  })
     coolAttribute?: boolean;
 
-    @Column({
-      type: DataType.VIRTUAL,
-    })
+  @Column({
+    type: DataType.VIRTUAL,
+  })
     customFields?: any;
 
   @BelongsTo(() => ContextTestModel)
-  context: ContextTestModel;
+    context: ContextTestModel;
 }
 
 export default ContextAwareTestModel;

package/src/repository/definition.ts

@@ -1,4 +1,7 @@
-import { Op, type FindOptions, type WhereOptions } from 'sequelize';
+import {
+  Op,
+  type Includeable, type Transaction, type FindOptions, type WhereOptions,
+} from 'sequelize';
 import { CustomFieldDefinition } from '../models';
 import type { CreateCustomFieldDefinition, UpdateCustomFieldDefinition } from '../types/definition';
 import type { ModelOptions } from '../types';
@@ -6,9 +9,15 @@ import type { ModelOptions } from '../types';
 export const create = (data: CreateCustomFieldDefinition): Promise<CustomFieldDefinition> =>
   CustomFieldDefinition.create(data);
 
+interface SadotFindOptions {
+  withDisabled?: boolean;
+  transaction?: Transaction;
+  include?: Includeable | Includeable[];
+}
+
 export const findAll = (
   where: WhereOptions,
-  options: any = { withDisabled: false },
+  options: SadotFindOptions = { withDisabled: false },
 ): Promise<CustomFieldDefinition[]> => {
   const queryModel = options.withDisabled
     ? CustomFieldDefinition.unscoped()
@@ -24,12 +33,12 @@ export const findAll = (
 
 export const findByIds = (
   ids: string[],
-  options: any = { withDisabled: false },
+  options: SadotFindOptions = { withDisabled: false },
 ): Promise<CustomFieldDefinition[]> => findAll({ id: { [Op.in]: ids } }, options);
 
 export const findById = (
   id: string,
-  options: any = { withDisabled: false },
+  options: Pick<SadotFindOptions, 'withDisabled'> = { withDisabled: false },
 ): Promise<CustomFieldDefinition | null> => {
   const { withDisabled } = options;
   if (withDisabled) {
@@ -87,13 +96,13 @@ export const update = async (
   return updatedDefinition;
 };
 
-export const disable = (id: string): Promise<any> =>
+export const disable = (id: string): Promise<[affectedCount: number]> =>
   CustomFieldDefinition.update(
     { disabled: true },
     { where: { id } },
   );
 
-export const destroy = (id: string): Promise<any> =>
+export const destroy = (id: string): Promise<number> =>
   CustomFieldDefinition.destroy({ where: { id } });
 
 /**

package/src/repository/value.ts

@@ -67,7 +67,6 @@ export const updateValues = async (
   identifiers: string[],
   valuesToUpdate: ValuesToUpdate,
   options: FindOptions & { modelOptions?: ModelOptions } = {},
-  defineAllDefaults = false,
 ): Promise<CustomFieldValue[]> => {
   const names = Object.keys(valuesToUpdate);
   logger.debug(`custom-fields: updating values for ${modelType} ${modelId}`, {
@@ -81,12 +80,10 @@ export const updateValues = async (
   const where: WhereOptions = {
     modelType,
     name: names,
+    ...(!options.modelOptions?.useEntityIdFromInclude && { entityId: identifiers }),
   };
 
-  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(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) ?? [];
 
   const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
   if (fieldDefinitions.length !== names.length) {
@@ -101,11 +98,8 @@ export const updateValues = async (
     logger.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
   }
 
-  const visitedFields = new Set<CustomFieldDefinition>();
-
   const values: CreateCustomFieldValue[] = names.map((name) => {
     const fieldDefinition = fieldDefinitions.find((def) => def.name === name);
-    visitedFields.add(fieldDefinition);
     const formatFunction = formatFunctions[fieldDefinition.fieldType];
     return {
       modelId,
@@ -115,17 +109,6 @@ export const updateValues = async (
     };
   });
 
-  if (defineAllDefaults) {
-    fieldDefinitions.filter((def) => !visitedFields.has(def) && ![null, undefined].includes(def.defaultValue)).forEach(({ id, defaultValue }) => {
-      values.push({
-        modelId,
-        value: defaultValue,
-        updatedAt: new Date(),
-        customFieldDefinitionId: id,
-      });
-    });
-  }
-
   return Promise.all(values.map(async (value) => {
     const [cfv] = await CustomFieldValue.upsert(value, {
       transaction: options.transaction,

package/src/scopes/filter.ts

@@ -2,7 +2,6 @@
 import { Op, type WhereOptions } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
 import { customFields } from '@autofleet/common-types';
-import moment from 'moment';
 import { generateRandomString } from '../utils/helpers';
 
 const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
@@ -33,8 +32,10 @@ type customFieldsFilterScopeParams = {
     scopeValue: Record<string, ConditionValue>;
 }
 
+const isDate = (input: any): input is Date => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+
 const castIfNeeded = (conditionValue: string): string => {
-  if (moment.isDate(conditionValue)) {
+  if (isDate(conditionValue)) {
     return '::timestamp';
   }
   if (!Number.isNaN(Number(conditionValue))) {

package/src/tests/mocks/definition.mock.ts

@@ -1,4 +1,4 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID as uuidv4 } from 'node:crypto';
 import type { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../types/definition';
 
 export const contextAwareFieldDefinition = {

package/src/utils/logger/index.ts

@@ -1,5 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Logger = require('@autofleet/logger');
+import Logger from '@autofleet/logger';
 
 const logger = Logger();