@autofleet/sadot 0.7.10-beta.0 → 0.7.10-beta.2

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

@@ -40,11 +40,11 @@ const DefaultValueSchema = joi_1.default.when('fieldType', {
         { is: constants_1.CustomFieldDefinitionType.BOOLEAN, then: joi_1.default.boolean().allow(null) },
         { is: constants_1.CustomFieldDefinitionType.DATE, then: joi_1.default.date().allow(null) },
         { is: constants_1.CustomFieldDefinitionType.DATETIME, then: joi_1.default.date().allow(null) },
-        { is: constants_1.CustomFieldDefinitionType.FILE, then: FileValidationSchema },
-        { is: constants_1.CustomFieldDefinitionType.IMAGE, then: joi_1.default.string().uri().allow(null) },
+        { is: constants_1.CustomFieldDefinitionType.FILE, then: joi_1.default.array().items(FileValidationSchema).allow(null) },
+        { is: constants_1.CustomFieldDefinitionType.IMAGE, then: joi_1.default.array().items(joi_1.default.string().uri()).allow(null) },
         { is: constants_1.CustomFieldDefinitionType.NUMBER, then: joi_1.default.number().allow(null) },
         { is: constants_1.CustomFieldDefinitionType.SELECT, then: joi_1.default.string().allow(null) },
-        { is: constants_1.CustomFieldDefinitionType.STATUS, then: statusValidationObject.allow(null) },
+        { is: constants_1.CustomFieldDefinitionType.STATUS, then: joi_1.default.string().allow(null) },
         { is: constants_1.CustomFieldDefinitionType.TEXT, then: joi_1.default.string().allow(null) },
     ],
 });

package/dist/errors/index.d.ts

@@ -1,4 +1,5 @@
 import { BadRequest } from '@autofleet/errors';
+import type { ValidationError } from 'joi';
 export declare class MissingRequiredCustomFieldError extends BadRequest {
     constructor(missingFields: string[]);
 }
@@ -12,7 +13,7 @@ export declare class InvalidFieldTypeError extends BadRequest {
     constructor(fieldType: string);
 }
 export declare class InvalidValueError extends BadRequest {
-    constructor(value: any, fieldDefinitionName: string, validationErrorMessage: string);
+    constructor(value: any, fieldDefinitionName: string, joiValidationError: ValidationError);
 }
 export declare class MissingDefinitionError extends BadRequest {
     constructor(fieldNames: string[]);

package/dist/errors/index.js

@@ -36,8 +36,17 @@ class InvalidFieldTypeError extends errors_1.BadRequest {
 }
 exports.InvalidFieldTypeError = InvalidFieldTypeError;
 class InvalidValueError extends errors_1.BadRequest {
-    constructor(value, fieldDefinitionName, validationErrorMessage) {
-        const err = new Error(`Invalid value ${value} for field ${fieldDefinitionName} - ${validationErrorMessage}`);
+    constructor(value, fieldDefinitionName, joiValidationError) {
+        const formattedErrorMessage = joiValidationError.message
+            .replace(/"/g, '')
+            .replace('value', fieldDefinitionName);
+        const formattedValue = typeof value === 'object' ? JSON.stringify(value) : value;
+        const detailedMessage = `
+      Invalid value for field ${fieldDefinitionName}
+      Received: ${formattedValue}
+      Error: ${formattedErrorMessage}
+      `.trim();
+        const err = new Error(detailedMessage);
         super([err], null, null);
         this.message = err.message;
     }

package/dist/models/CustomFieldDefinition.js

@@ -29,7 +29,7 @@ let CustomFieldDefinition = class CustomFieldDefinition extends sequelize_typesc
         if (![null, undefined].includes(instance.defaultValue)) {
             const isValid = (0, validations_1.validateValue)(instance.defaultValue, instance.fieldType, instance.validation);
             if (isValid.error) {
-                throw new errors_1.InvalidValueError(instance.defaultValue, instance.fieldType, isValid.error.details[0].message);
+                throw new errors_1.InvalidValueError(instance.defaultValue, instance.name, isValid.error);
             }
         }
     }

package/dist/models/CustomFieldValue.js

@@ -41,17 +41,16 @@ const errors_1 = require("../errors");
 let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Model {
     static validateValueAgainstDefinition(instance, definition) {
         const { validation, fieldType, displayName } = definition;
-        const isValidFieldType = (0, validations_1.validateFieldType)(fieldType); // check if can be removed for value
+        const isValidFieldType = (0, validations_1.validateFieldType)(fieldType);
         if (!isValidFieldType) {
             throw new errors_1.InvalidFieldTypeError(fieldType);
         }
         // Always allow null values
         if (instance.value === null)
-            return; // check if can be used in Joi
+            return;
         const validateValueResponse = (0, validations_1.validateValue)(instance.value, fieldType, validation);
         if (validateValueResponse.error) {
-            const validationErrorMessage = validateValueResponse.error.details[0].message;
-            throw new errors_1.InvalidValueError(instance.value, displayName, validationErrorMessage);
+            throw new errors_1.InvalidValueError(instance.value, displayName, validateValueResponse.error);
         }
     }
     static async validateCustomFieldValues(instances) {

package/dist/utils/validations/validators/index.js

@@ -20,12 +20,11 @@ exports.CustomValidationTypes = {
  * Validators for custom fields
  */
 exports.validators = {
-    // currently the name shows up as "value", i want to change it to be based on the type
     [constants_1.CustomFieldDefinitionType.SELECT]: select_validator_1.validateSelect,
     [constants_1.CustomFieldDefinitionType.STATUS]: status_validator_1.validateStatus,
     [constants_1.CustomFieldDefinitionType.TEXT]: (value) => joi_1.default.string().validate(value),
     [constants_1.CustomFieldDefinitionType.NUMBER]: (value) => joi_1.default.number().strict(true).validate(value),
-    [constants_1.CustomFieldDefinitionType.BOOLEAN]: (value) => joi_1.default.boolean().validate(value),
+    [constants_1.CustomFieldDefinitionType.BOOLEAN]: (value) => joi_1.default.boolean().strict().validate(value),
     [constants_1.CustomFieldDefinitionType.DATE]: (value) => joi_1.default.date().validate(value),
     [constants_1.CustomFieldDefinitionType.DATETIME]: (value) => joi_1.default.date().validate(value),
     [constants_1.CustomFieldDefinitionType.IMAGE]: (value) => joi_1.default.array().min(1).unique()

package/dist/utils/validations/validators/status.validator.js

@@ -8,5 +8,8 @@ const joi_1 = __importDefault(require("joi"));
 /**
 * Validate that the value is one of the status values
 */
-const validateStatus = (value, statusValues) => (joi_1.default.string().allow(null).valid(...statusValues.map((statusValue) => statusValue.value)).validate(value));
+const validateStatus = (value, statusValues) => (joi_1.default.string()
+    .allow(null)
+    .valid(...statusValues.map((statusValue) => statusValue.value))
+    .validate(value));
 exports.validateStatus = validateStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.7.10-beta.0",
+  "version": "0.7.10-beta.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

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

@@ -36,11 +36,11 @@ const DefaultValueSchema = Joi.when('fieldType', {
     { is: CustomFieldDefinitionType.BOOLEAN, then: Joi.boolean().allow(null) },
     { is: CustomFieldDefinitionType.DATE, then: Joi.date().allow(null) },
     { is: CustomFieldDefinitionType.DATETIME, then: Joi.date().allow(null) },
-    { is: CustomFieldDefinitionType.FILE, then: FileValidationSchema },
-    { is: CustomFieldDefinitionType.IMAGE, then: Joi.string().uri().allow(null) },
+    { is: CustomFieldDefinitionType.FILE, then: Joi.array().items(FileValidationSchema).allow(null) },
+    { is: CustomFieldDefinitionType.IMAGE, then: Joi.array().items(Joi.string().uri()).allow(null) },
     { is: CustomFieldDefinitionType.NUMBER, then: Joi.number().allow(null) },
     { is: CustomFieldDefinitionType.SELECT, then: Joi.string().allow(null) },
-    { is: CustomFieldDefinitionType.STATUS, then: statusValidationObject.allow(null) },
+    { is: CustomFieldDefinitionType.STATUS, then: Joi.string().allow(null) },
     { is: CustomFieldDefinitionType.TEXT, then: Joi.string().allow(null) },
   ],
 });

package/src/errors/index.ts

@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { BadRequest } from '@autofleet/errors';
+import type { ValidationError } from 'joi';
 
 export class MissingRequiredCustomFieldError extends BadRequest {
   constructor(missingFields: string[]) {
@@ -34,8 +35,20 @@ export class InvalidFieldTypeError extends BadRequest {
 }
 
 export class InvalidValueError extends BadRequest {
-  constructor(value: any, fieldDefinitionName: string, validationErrorMessage: string) {
-    const err = new Error(`Invalid value ${value} for field ${fieldDefinitionName} - ${validationErrorMessage}`);
+  constructor(value: any, fieldDefinitionName: string, joiValidationError: ValidationError) {
+    const formattedErrorMessage = joiValidationError.message
+      .replace(/"/g, '')
+      .replace('value', fieldDefinitionName);
+
+    const formattedValue = typeof value === 'object' ? JSON.stringify(value) : value;
+
+    const detailedMessage = `
+      Invalid value for field ${fieldDefinitionName}
+      Received: ${formattedValue}
+      Error: ${formattedErrorMessage}
+      `.trim();
+
+    const err = new Error(detailedMessage);
     super([err], null, null);
     this.message = err.message;
   }

package/src/models/CustomFieldDefinition.ts

@@ -137,7 +137,7 @@ class CustomFieldDefinition extends Model {
     if (![null, undefined].includes(instance.defaultValue)) {
       const isValid = validateValue(instance.defaultValue, instance.fieldType, instance.validation);
       if (isValid.error) {
-        throw new InvalidValueError(instance.defaultValue, instance.fieldType, isValid.error.details[0].message);
+        throw new InvalidValueError(instance.defaultValue, instance.name, isValid.error);
       }
     }
   }

package/src/models/CustomFieldValue.ts

@@ -61,16 +61,15 @@ class CustomFieldValue extends Model {
     definition: CustomFieldDefinition,
   ): void {
     const { validation, fieldType, displayName } = definition;
-    const isValidFieldType = validateFieldType(fieldType); // check if can be removed for value
+    const isValidFieldType = validateFieldType(fieldType);
     if (!isValidFieldType) {
       throw new InvalidFieldTypeError(fieldType);
     }
     // Always allow null values
-    if (instance.value === null) return; // check if can be used in Joi
+    if (instance.value === null) return;
     const validateValueResponse = validateValue(instance.value, fieldType, validation);
     if (validateValueResponse.error) {
-      const validationErrorMessage = validateValueResponse.error.details[0].message;
-      throw new InvalidValueError(instance.value, displayName, validationErrorMessage);
+      throw new InvalidValueError(instance.value, displayName, validateValueResponse.error);
     }
   }
 

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

@@ -18,12 +18,11 @@ export const CustomValidationTypes = {
  * Validators for custom fields
  */
 export const validators: Validators = {
-  // currently the name shows up as "value", i want to change it to be based on the type
   [CustomFieldDefinitionType.SELECT]: validateSelect,
   [CustomFieldDefinitionType.STATUS]: validateStatus,
   [CustomFieldDefinitionType.TEXT]: (value) => Joi.string().validate(value),
   [CustomFieldDefinitionType.NUMBER]: (value) => Joi.number().strict(true).validate(value),
-  [CustomFieldDefinitionType.BOOLEAN]: (value) => Joi.boolean().validate(value),
+  [CustomFieldDefinitionType.BOOLEAN]: (value) => Joi.boolean().strict().validate(value),
   [CustomFieldDefinitionType.DATE]: (value) => Joi.date().validate(value),
   [CustomFieldDefinitionType.DATETIME]: (value) => Joi.date().validate(value),
   [CustomFieldDefinitionType.IMAGE]: (value) => Joi.array().min(1).unique()

package/src/utils/validations/validators/status.validator.ts

@@ -15,5 +15,8 @@ export const validateStatus: Validator<StatusValue, StatusOption[]> = (
   value,
   statusValues,
 ) => (
-  Joi.string().allow(null).valid(...statusValues.map((statusValue) => statusValue.value)).validate(value)
+  Joi.string()
+    .allow(null)
+    .valid(...statusValues.map((statusValue) => statusValue.value))
+    .validate(value)
 );