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

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

@@ -1,10 +1,4 @@
-import type { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../types/definition';
-export declare const contextAwareFieldDefinition: {
-    name: string;
-    modelType: string;
-    fieldType: string;
-    entityType: string;
-};
+import { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../types/definition';
 export declare const coolFieldDefinition: CreateCustomFieldDefinition;
 export declare const coolFieldDefinition2: {
     name: string;
@@ -37,7 +31,7 @@ export declare const coolFieldDefinition3: {
     modelType: string;
 };
 export declare const booleanField: (modelType: string) => CreateCustomFieldDefinition;
-export declare const selectField: (modelType: string, options: any) => CreateCustomFieldDefinition;
-export declare const statusField: (modelType: string, options: any) => CreateCustomFieldDefinition;
+export declare const enumField: (modelType: string, options: any) => CreateCustomFieldDefinition;
+export declare const rangeField: (modelType: string) => CreateCustomFieldDefinition;
 export declare const createDefinition: (defaults: Partial<CustomFieldDefinitionDTO>) => CreateCustomFieldDefinition;
 export declare const createDefinitions: (defaults: Partial<CustomFieldDefinitionDTO>, length?: number) => CreateCustomFieldDefinition[];

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

@@ -1,13 +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;
+exports.createDefinitions = exports.createDefinition = exports.rangeField = exports.enumField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = void 0;
 const uuid_1 = require("uuid");
-exports.contextAwareFieldDefinition = {
-    name: 'cool field',
-    modelType: 'ContextAwareTestModel',
-    fieldType: 'number',
-    entityType: 'fleetId',
-};
 exports.coolFieldDefinition = {
     name: 'cool field',
     modelType: 'TestModel',
@@ -31,7 +25,7 @@ const booleanField = (modelType) => ({
     entityType: 'fleetId',
 });
 exports.booleanField = booleanField;
-const selectField = (modelType, options) => ({
+const enumField = (modelType, options) => ({
     name: 'choices',
     modelType,
     fieldType: 'select',
@@ -39,16 +33,18 @@ const selectField = (modelType, options) => ({
     entityId: (0, uuid_1.v4)(),
     entityType: 'fleetId',
 });
-exports.selectField = selectField;
-const statusField = (modelType, options) => ({
-    name: 'lifecycle',
+exports.enumField = enumField;
+const rangeField = (modelType) => ({
+    name: 'ranges',
     modelType,
-    fieldType: 'status',
-    validation: options,
+    fieldType: 'number',
+    validation: {
+        between: [10, 12],
+    },
     entityId: (0, uuid_1.v4)(),
     entityType: 'fleetId',
 });
-exports.statusField = statusField;
+exports.rangeField = rangeField;
 // eslint-disable-next-line max-len
 const createDefinition = (defaults) => ({
     name: defaults?.name || `def_${(0, uuid_1.v4)()}`,

package/dist/tests/mocks/testModel.d.ts

@@ -3,7 +3,7 @@ export declare const createTestModel: (payload?: {}) => Promise<TestModel>;
 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>;
-export declare const getTestModel: (id: string, options?: {}) => Promise<TestModel | null>;
+export declare const getTestModel: (id: string, options?: {}) => Promise<TestModel>;
 export declare const getSomeTestModels: (options?: {
     limit: number;
 }) => Promise<TestModel[]>;

package/dist/types/index.d.ts

@@ -1,31 +1,13 @@
-import type { IncludeOptions } from 'sequelize';
-import type { ModelCtor } from 'sequelize-typescript';
 export type ModelFetcher = (name: string) => any;
 export type ModelOptions = {
-    /**
-     * Include options for the model
-     */
-    include?: (entityIds: string[]) => IncludeOptions[];
-    /**
-      * Custom association for the model
-      * @param model - The model to associate with
-     */
-    customAssociation?: (model: ModelCtor) => void;
-    /**
-     * Whether to use the entity id  from the instance per scope attribute
-     */
-    useEntityIdFromInclude?: boolean;
-};
-export type Models = {
     name: string;
-    scopeAttributes: any[];
-    modelOptions?: ModelOptions;
+    scopeAttributes: string[];
     creationWebhookHandler?: (instance: any) => any;
     updateWebhookHandler?: (instance: any) => any;
     deletionWebhookHandler?: (instance: any) => any;
 };
 export type CustomFieldOptions = {
-    models: Models[];
+    models: ModelOptions[];
     databaseConfig: any;
     getUser: () => any;
 };

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

@@ -1,19 +1,2 @@
-declare const CUSTOM_FIELDS_FILTER_SCOPE: string;
 export declare const supportedEntities: string[];
-/**
- * Supported custom field types
- */
-export declare enum CustomFieldDefinitionType {
-    NUMBER = "number",
-    BOOLEAN = "boolean",
-    DATE = "date",
-    DATETIME = "datetime",
-    TEXT = "text",
-    IMAGE = "image",
-    SELECT = "select",
-    STATUS = "status",
-    FILE = "file"
-}
-export { 
-/** @deprecated Use the value from `@autofleet/common-types` instead */
-CUSTOM_FIELDS_FILTER_SCOPE, };
+export declare const CUSTOM_FIELDS_FILTER_SCOPE = "filterByCustomFields";

package/dist/utils/constants/index.js

@@ -1,22 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CUSTOM_FIELDS_FILTER_SCOPE = exports.CustomFieldDefinitionType = exports.supportedEntities = void 0;
-const common_types_1 = require("@autofleet/common-types");
-const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
-exports.CUSTOM_FIELDS_FILTER_SCOPE = CUSTOM_FIELDS_FILTER_SCOPE;
+exports.CUSTOM_FIELDS_FILTER_SCOPE = exports.supportedEntities = void 0;
+// eslint-disable-next-line import/prefer-default-export
 exports.supportedEntities = ['businessModelId', 'fleetId', 'demandSourceId'];
-/**
- * Supported custom field types
- */
-var CustomFieldDefinitionType;
-(function (CustomFieldDefinitionType) {
-    CustomFieldDefinitionType["NUMBER"] = "number";
-    CustomFieldDefinitionType["BOOLEAN"] = "boolean";
-    CustomFieldDefinitionType["DATE"] = "date";
-    CustomFieldDefinitionType["DATETIME"] = "datetime";
-    CustomFieldDefinitionType["TEXT"] = "text";
-    CustomFieldDefinitionType["IMAGE"] = "image";
-    CustomFieldDefinitionType["SELECT"] = "select";
-    CustomFieldDefinitionType["STATUS"] = "status";
-    CustomFieldDefinitionType["FILE"] = "file";
-})(CustomFieldDefinitionType || (exports.CustomFieldDefinitionType = CustomFieldDefinitionType = {}));
+exports.CUSTOM_FIELDS_FILTER_SCOPE = 'filterByCustomFields';

package/dist/utils/init.d.ts

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

package/dist/utils/init.js

@@ -3,16 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyCustomAssociation = exports.addScopes = exports.removeHooks = exports.addHooks = void 0;
+exports.addScopes = exports.removeHooks = exports.addHooks = void 0;
 const sequelize_1 = require("sequelize");
-const common_types_1 = require("@autofleet/common-types");
 const models_1 = require("../models");
 const hooks_1 = require("../hooks");
 const scopes_1 = require("../scopes");
 const logger_1 = __importDefault(require("./logger"));
-const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
+const constants_1 = require("./constants");
 const addHooks = (models, getModel) => {
-    models.forEach(async ({ name, scopeAttributes, modelOptions, }) => {
+    models.forEach(async ({ name, scopeAttributes }) => {
         try {
             const model = getModel(name);
             if (!model) {
@@ -31,11 +30,11 @@ const addHooks = (models, getModel) => {
             model.addHook('beforeFind', 'sadot-beforeFind', (0, hooks_1.beforeFind)(scopeAttributes));
             model.addHook('beforeBulkCreate', 'sadot-beforeBulkCreate', hooks_1.beforeBulkCreate);
             model.addHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate', hooks_1.beforeBulkUpdate);
-            model.addHook('beforeCreate', 'sadot-beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes, modelOptions));
-            model.addHook('beforeUpdate', 'sadot-beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes, modelOptions));
-            model.addHook('afterFind', 'sadot-afterFind', (0, hooks_1.enrichResults)(name, scopeAttributes, 'afterFind', modelOptions));
-            model.addHook('afterUpdate', 'sadot-afterUpdate', (0, hooks_1.enrichResults)(name, scopeAttributes, null, modelOptions));
-            model.addHook('afterCreate', 'sadot-afterCreate', (0, hooks_1.enrichResults)(name, scopeAttributes, null, modelOptions));
+            model.addHook('beforeCreate', 'sadot-beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes));
+            model.addHook('beforeUpdate', 'sadot-beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes));
+            model.addHook('afterFind', 'sadot-afterFind', (0, hooks_1.enrichResults)(name, scopeAttributes));
+            model.addHook('afterUpdate', 'sadot-afterUpdate', (0, hooks_1.enrichResults)(name, scopeAttributes));
+            model.addHook('afterCreate', 'sadot-afterCreate', (0, hooks_1.enrichResults)(name, scopeAttributes));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields hook to model ${name}. `, e);
@@ -90,7 +89,7 @@ const addScopes = (models, getModel) => {
             // Necessary associations for the filtering scope
             addAssociations(model, name);
             // Add filter scope
-            model.addScope(CUSTOM_FIELDS_FILTER_SCOPE, (0, scopes_1.customFieldsFilterScope)(name));
+            model.addScope(constants_1.CUSTOM_FIELDS_FILTER_SCOPE, (0, scopes_1.customFieldsFilterScope)(name));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields scopes to model ${name}. `, e);
@@ -98,9 +97,3 @@ const addScopes = (models, getModel) => {
     });
 };
 exports.addScopes = addScopes;
-const applyCustomAssociation = (models) => {
-    models.forEach(({ modelOptions }) => {
-        modelOptions?.customAssociation?.(models_1.CustomFieldDefinition);
-    });
-};
-exports.applyCustomAssociation = applyCustomAssociation;

package/dist/utils/validations/custom-fields.d.ts

@@ -0,0 +1,2 @@
+declare const CustomFieldsSchema: any;
+export { CustomFieldsSchema };

package/dist/utils/validations/{schema/custom-fields.js → custom-fields.js}

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomFieldsSchema = void 0;
-const joi_1 = __importDefault(require("joi"));
+/* eslint-disable import/prefer-default-export */
+const joi_1 = __importDefault(require("@hapi/joi"));
 const CustomFieldsSchema = joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.any());
 exports.CustomFieldsSchema = CustomFieldsSchema;

package/dist/utils/validations/custom.d.ts

@@ -0,0 +1,15 @@
+export declare const mustHaveCustomValidation: {
+    select: boolean;
+};
+/**
+ * Validates the given validations object against the supported field types and their validators.
+ * @return true if the validation is valid, false otherwise.
+ */
+export declare const validateValidation: (valueType: any, validation: any) => boolean;
+/**
+ * Validates the given value against the custom validation rules for the specified field type.
+ * If no custom validation rules are provided, it falls back to the default validation.
+ * @returns true if the value is valid according to the validation rules, false otherwise.
+ */
+declare const customValidation: (value: any, valueType: any, validation: any) => boolean;
+export default customValidation;

package/dist/utils/validations/custom.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateValidation = exports.mustHaveCustomValidation = void 0;
+/* eslint-disable no-shadow */
+const logger_1 = __importDefault(require("../logger"));
+const type_1 = require("./type");
+const validators_1 = __importDefault(require("./validators"));
+exports.mustHaveCustomValidation = {
+    [type_1.CustomFieldDefinitionType.SELECT]: true,
+};
+/**
+ * Validates the given validations object against the supported field types and their validators.
+ * @return true if the validation is valid, false otherwise.
+ */
+const validateValidation = (valueType, validation) => {
+    if (!validation) {
+        if (exports.mustHaveCustomValidation[valueType]) {
+            logger_1.default.error(`No custom validation for custom field type ${valueType} found`);
+            return false;
+        }
+        return true;
+    }
+    return true;
+};
+exports.validateValidation = validateValidation;
+/**
+ * Validates the given value against the custom validation rules for the specified field type.
+ * If no custom validation rules are provided, it falls back to the default validation.
+ * @returns true if the value is valid according to the validation rules, false otherwise.
+ */
+const customValidation = (value, valueType, validation) => {
+    const validator = validators_1.default?.[valueType];
+    if (!validation || !validator) {
+        return (0, exports.validateValidation)(valueType, validation);
+    }
+    // Always allow null values
+    return value === null || validator(value, validation);
+};
+exports.default = customValidation;

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

@@ -1,2 +1,2 @@
-import type { CustomFieldDefinitionType } from '../constants';
-export declare const validateValue: (value: unknown, valueType: CustomFieldDefinitionType, validation?: unknown) => boolean;
+declare const validateValue: (value: any, valueType: any, customValidations: any) => boolean;
+export default validateValue;

package/dist/utils/validations/index.js

@@ -1,20 +1,20 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateValue = void 0;
-const validators_1 = require("./validators");
-const validateValue = (value, valueType, validation) => {
-    const validator = validators_1.validators[valueType];
-    if (!validator) {
-        // Unsupported field type
+const custom_1 = __importDefault(require("./custom"));
+const type_1 = __importDefault(require("./type"));
+const validateValue = (value, valueType, customValidations) => {
+    if (!(0, type_1.default)(value, valueType)) {
         return false;
     }
-    // Always allow null values
-    return value === null || validator(value, validation);
-    /** TODO: Add validation for required fields
-     * @example
-     * if (validations.required && !value) {
-     *  return false;
-     * }
-     */
+    if (customValidations) {
+        return (0, custom_1.default)(value, valueType, customValidations);
+    }
+    // if (validations.required && !value) {
+    //   return false;
+    // }
+    return true;
 };
-exports.validateValue = validateValue;
+exports.default = validateValue;

package/dist/utils/validations/type.d.ts

@@ -1,14 +1,18 @@
-import type { CustomFieldDefinitionType } from '../constants';
 /**
- * Validator is a function that validates a custom-field `value`,
- * against a custom-field definition `validation object`.
- * @returns `true` if the value is valid, `false` otherwise.
+ * Supported custom field types
  */
-export type Validator<Value, DefinitionValidationObject> = (value: Value, validation?: DefinitionValidationObject) => boolean;
+export declare enum CustomFieldDefinitionType {
+    NUMBER = "number",
+    BOOLEAN = "boolean",
+    DATE = "date",
+    DATETIME = "datetime",
+    TEXT = "text",
+    IMAGE = "image",
+    SELECT = "select"
+}
 /**
- * Validators is a map of custom-field types to their respective validators.
- * The key is the custom-field type, and the value is the validator function.
+ * Validate that the given value is really of type "valueType"
+ * TODO: verify that required field not set to null
  */
-export type Validators = {
-    [K in CustomFieldDefinitionType]: Validator<unknown, unknown>;
-};
+declare const validateValueType: (value: unknown, valueType: CustomFieldDefinitionType) => boolean;
+export default validateValueType;

package/dist/utils/validations/type.js

@@ -1,2 +1,50 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomFieldDefinitionType = void 0;
+const joi_1 = __importDefault(require("@hapi/joi"));
+/**
+ * Supported custom field types
+ */
+// eslint-disable-next-line no-shadow
+var CustomFieldDefinitionType;
+(function (CustomFieldDefinitionType) {
+    CustomFieldDefinitionType["NUMBER"] = "number";
+    CustomFieldDefinitionType["BOOLEAN"] = "boolean";
+    CustomFieldDefinitionType["DATE"] = "date";
+    CustomFieldDefinitionType["DATETIME"] = "datetime";
+    CustomFieldDefinitionType["TEXT"] = "text";
+    CustomFieldDefinitionType["IMAGE"] = "image";
+    CustomFieldDefinitionType["SELECT"] = "select";
+})(CustomFieldDefinitionType = exports.CustomFieldDefinitionType || (exports.CustomFieldDefinitionType = {}));
+/**
+ * Validate that the given value is really of type "valueType"
+ * TODO: verify that required field not set to null
+ */
+const validateValueType = (value, valueType) => {
+    if (value === null) {
+        // Null is always allowed
+        return true;
+    }
+    switch (valueType) {
+        case CustomFieldDefinitionType.TEXT:
+            return typeof value === 'string';
+        case CustomFieldDefinitionType.NUMBER:
+            return typeof value === 'number';
+        case CustomFieldDefinitionType.BOOLEAN:
+            return typeof value === 'boolean';
+        case CustomFieldDefinitionType.DATE:
+        case CustomFieldDefinitionType.DATETIME:
+            return !joi_1.default.date().validate(value).error;
+        case CustomFieldDefinitionType.SELECT:
+            return true; // custom validation
+        case CustomFieldDefinitionType.IMAGE:
+            return !joi_1.default.array().min(1).unique().items(joi_1.default.string().uri())
+                .validate(value).error;
+        default:
+            return false;
+    }
+};
+exports.default = validateValueType;

package/dist/utils/validations/validators.d.ts

@@ -0,0 +1,12 @@
+export declare enum CustomValidations {
+    SELECT = "select",
+    RANGE = "between"
+}
+type Validator = (value: any, validation: any) => boolean;
+/**
+ * Validators for custom fields
+ */
+declare const validators: {
+    [key: string]: Validator;
+};
+export default validators;

package/dist/utils/validations/validators.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomValidations = void 0;
+// eslint-disable-next-line no-shadow
+var CustomValidations;
+(function (CustomValidations) {
+    CustomValidations["SELECT"] = "select";
+    CustomValidations["RANGE"] = "between";
+})(CustomValidations = exports.CustomValidations || (exports.CustomValidations = {}));
+/**
+ * Validate {@link CustomValidations.ENUM Enum}
+ */
+const validateEnum = (value, enumValues) => (Array.isArray(enumValues)
+    && enumValues.length > 0
+    && enumValues.includes(value));
+/**
+ * Validate {@link CustomValidations.RANGE Range}
+ */
+const validateRange = (value, range) => {
+    const [min, max] = range;
+    if (min === undefined || max === undefined) {
+        return false;
+    }
+    return value >= range.min && value <= range.max;
+};
+/**
+ * Validators for custom fields
+ */
+const validators = {
+    [CustomValidations.SELECT]: validateEnum,
+    [CustomValidations.RANGE]: validateRange,
+};
+exports.default = validators;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.6.2-temp-file-6",
+  "version": "0.6.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -59,4 +59,4 @@
   },
   "author": "Autofleet",
   "license": "ISC"
-}
+}

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

@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { CustomFieldDefinitionType } from '../../../utils/constants';
+import { CustomFieldDefinitionType } from '../../../utils/validations/type';
 
 /**
  * Schema for the validation of custom field definition

package/src/index.ts

@@ -17,6 +17,7 @@ export * from './utils/constants';
 
 export * from './utils/helpers';
 
+export { CustomFieldDefinitionType } from './utils/validations/type';
 /**
  * Adding custom fields enrichment to the models inside the MODELS_FILE_NAME json file
  * @see {@link 'custom-fields/config'} for configurations

package/src/models/CustomFieldDefinition.ts

@@ -10,7 +10,8 @@ import {
   AfterSave,
   Is,
 } from 'sequelize-typescript';
-import { CustomFieldDefinitionType } from '../utils/constants';
+
+import { CustomFieldDefinitionType } from '../utils/validations/type';
 import { CustomValidationTypes } from '../utils/validations/validators';
 import { CustomFieldValue } from '.';
 import { sendDimEvent } from '../events';
@@ -30,10 +31,11 @@ import logger from '../utils/logger';
   validate: {
     validationByType(this: CustomFieldDefinition) {
       // Verify the validation is provided if needed
-      if (!this.validation && CustomValidationTypes[this.fieldType]) {
-        // TODO: enforce the validation-object schema based on the fieldType
-        logger.error(`No custom validation for custom field type ${this.fieldType} found`);
-        throw new UnsupportedCustomValidationError(`Validation provided for "${this.fieldType}" is not supported`);
+      if (!this.validation) {
+        if (CustomValidationTypes[this.fieldType]) {
+          logger.error(`No custom validation for custom field type ${this.fieldType} found`);
+          throw new UnsupportedCustomValidationError(`Validation provided for "${this.fieldType}" is not supported`);
+        }
       }
     },
   },

package/src/utils/constants/index.ts

@@ -2,23 +2,9 @@ import { customFields } from '@autofleet/common-types';
 
 const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
 
+// eslint-disable-next-line import/prefer-default-export
 export const supportedEntities = ['businessModelId', 'fleetId', 'demandSourceId'];
 
-/**
- * Supported custom field types
- */
-export enum CustomFieldDefinitionType {
-  NUMBER = 'number',
-  BOOLEAN = 'boolean',
-  DATE = 'date',
-  DATETIME = 'datetime',
-  TEXT = 'text',
-  IMAGE = 'image',
-  SELECT = 'select',
-  STATUS = 'status',
-  FILE = 'file',
-}
-
 export {
   /** @deprecated Use the value from `@autofleet/common-types` instead */
   CUSTOM_FIELDS_FILTER_SCOPE,

package/src/utils/helpers/index.ts

@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import { type WhereOptions, Op, type BindOrReplacements } from 'sequelize';
 import { type ModelStatic, Sequelize } from 'sequelize-typescript';
-import { CustomFieldDefinitionType } from '../constants';
+import { CustomFieldDefinitionType } from '../validations/type';
 
 /**
  * Builds a WHERE clause and replacements for free-text search by custom fields.

package/src/utils/validations/index.ts

@@ -1,4 +1,4 @@
-import type { CustomFieldDefinitionType } from '../constants';
+import type { CustomFieldDefinitionType } from './type';
 import { validators } from './validators';
 
 export const validateValue = (

package/src/utils/validations/type.ts

@@ -1,19 +1,18 @@
-import type { CustomFieldDefinitionType } from '../constants';
-
 /**
- * Validator is a function that validates a custom-field `value`,
- * against a custom-field definition `validation object`.
- * @returns `true` if the value is valid, `false` otherwise.
+ * Supported custom field types enum
  */
-export type Validator<Value, DefinitionValidationObject> = (
-   value: Value,
-   validation?: DefinitionValidationObject
-  ) => boolean;
+export enum CustomFieldDefinitionType {
+  NUMBER = 'number',
+  BOOLEAN = 'boolean',
+  DATE = 'date',
+  DATETIME = 'datetime',
+  TEXT = 'text',
+  IMAGE = 'image',
+  SELECT = 'select',
+  STATUS = 'status',
+}
 
-/**
- * Validators is a map of custom-field types to their respective validators.
- * The key is the custom-field type, and the value is the validator function.
- */
+export type Validator<Value, Validation> = (value: Value, validation?: Validation) => boolean;
 export type Validators = {
   [K in CustomFieldDefinitionType]: Validator<unknown, unknown>;
 };

package/src/utils/validations/validators/index.ts

@@ -1,13 +1,11 @@
 import Joi from 'joi';
-import { CustomFieldDefinitionType } from '../../constants';
-import type { Validators } from '../type';
+import { CustomFieldDefinitionType, type Validators } from '../type';
 import { validateSelect } from './select.validator';
 import { validateStatus } from './status.validator';
 
 type CustomValidationTypes = Extract<CustomFieldDefinitionType, 'select' | 'status'>;
 /**
  * Custom field types that must have custom validation.
- * TODO: remove this after moving to schema-based validation
  */
 export const CustomValidationTypes = {
   [CustomFieldDefinitionType.SELECT]: CustomFieldDefinitionType.SELECT,
@@ -28,11 +26,4 @@ export const validators: Validators = {
   [CustomFieldDefinitionType.IMAGE]: (value) => (!Joi.array().min(1).unique()
     .items(Joi.string().uri())
     .validate(value).error),
-  [CustomFieldDefinitionType.FILE]: (value) => (!Joi.array().min(1).unique().items(Joi.object({
-    name: Joi.string().required(),
-    type: Joi.string(),
-    size: Joi.string(),
-    addedBy: Joi.string().uuid(),
-  }))
-    .validate(value).error),
 };