@autofleet/sadot 0.13.5 → 0.13.6

package/dist/hooks/hooks.js

@@ -31,6 +31,7 @@ const ajv_1 = __importDefault(require("ajv"));
 const joi_1 = __importDefault(require("joi"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const errors_1 = require("@autofleet/errors");
+const ajv_errors_1 = __importDefault(require("ajv-errors"));
 const logger_1 = __importDefault(require("../utils/logger"));
 const ValidatorRepo = __importStar(require("../repository/validator"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
@@ -48,6 +49,7 @@ const ajv = new ajv_1.default({
     $data: true, // Enable $data references
 });
 (0, ajv_formats_1.default)(ajv);
+(0, ajv_errors_1.default)(ajv);
 /**
  * Helper function to manually copy object properties
  * This is more efficient for large objects and avoids excessive object creation
@@ -88,10 +90,22 @@ const getCompleteCustomFields = async (instance, options) => {
     }
     return instance.customFields || {};
 };
+const formatAjvErrors = (errors) => errors.reduce((acc, err) => {
+    const basePath = (err.instancePath || '')
+        .split('/')
+        .filter(Boolean)
+        .join('.')
+        .replace(/^after\./, '');
+    const missingProp = err.keyword === 'required' ? `.${err.params?.missingProperty}` : '';
+    const key = (basePath + missingProp).replace(/^\./, '') || 'root';
+    const message = err.message || 'Invalid value';
+    acc[key] = message;
+    return acc;
+}, {});
 /**
  * Validates the model using custom validators
  */
-const validateModel = async (instance, options, scopeAttributes, isCreate = false) => {
+const validateModel = async (instance, options, scopeAttributes, modelOptions = {}, isCreate = false) => {
     var _a;
     const modelType = instance.constructor.name;
     logger_1.default.debug('sadot - validating model', { isCreate, modelType });
@@ -121,6 +135,9 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
         validatorsPromise = ValidatorRepo.findAllByModelType(modelType, entityId, {
             transaction: options.transaction,
             attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
+            ...(modelOptions.include && {
+                include: modelOptions.include?.(entityId),
+            }),
             raw: true,
         });
         if (options.transaction) {
@@ -173,7 +190,10 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
                 })));
                 if (!isValid) {
                     const errorDetails = validateSchema.errors?.map((err) => `${err.instancePath || ''} ${err.message || 'Invalid value'}`).join(', ');
-                    throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+                    const formattedErrors = formatAjvErrors(validateSchema.errors);
+                    throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)], undefined, {
+                        customError: formattedErrors,
+                    });
                 }
             }
         }
@@ -202,7 +222,10 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
                 const errorDetails = validateSchema
                     .errors
                     ?.map((err) => `${err.instancePath || ''} ${err.message || 'Invalid value'}`).join(', ');
-                throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+                const formattedErrors = formatAjvErrors(validateSchema.errors);
+                throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)], undefined, {
+                    customError: formattedErrors,
+                });
             }
         }
     }
@@ -270,7 +293,7 @@ const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
         throw new errors_2.MissingRequiredCustomFieldError(missingFields);
     }
     // Step 2: Validate the model data (including custom fields)
-    await validateModel(instance, options, scopeAttributes, true);
+    await validateModel(instance, options, scopeAttributes, modelOptions, true);
     // format date and datetime fields
     formatDates(fieldDefinitions, instance);
     // Step 3: Save custom field values if they exist
@@ -308,7 +331,7 @@ const beforeUpdate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
         modelType, modelOptions, identifiers, options,
     });
     // Step 1: Validate the model data (including custom fields)
-    await validateModel(instance, options, scopeAttributes, false);
+    await validateModel(instance, options, scopeAttributes, modelOptions, false);
     // format date and datetime fields
     formatDates(fieldDefinitions, instance);
     // Step 2: Update custom field values if they exist

package/dist/repository/validator.d.ts

@@ -1,9 +1,10 @@
-import type { Transactionable } from 'sequelize';
+import type { IncludeOptions, Transactionable } from 'sequelize';
 import { CustomValidator } from '../models';
 export interface FindValidatorOptions extends Transactionable {
     withDisabled?: boolean;
     attributes?: string[];
     raw?: boolean;
+    include?: IncludeOptions[];
 }
 export interface ValidatorAttributes {
     entityId: string;

package/dist/repository/validator.js

@@ -40,7 +40,9 @@ const findAllByModelType = async (modelType, entityId, options = { withDisabled:
     logger_1.default.debug('custom-validator - find all validators by model type');
     return (0, exports.findAll)({
         modelType,
-        entityId,
+        ...(!options.include && {
+            entityId,
+        }),
     }, options);
 };
 exports.findAllByModelType = findAllByModelType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -31,6 +31,7 @@
     "@autofleet/common-types": "^4.4.0",
     "@autofleet/events": "^4.0.0",
     "ajv": "^8.12.0",
+    "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",
     "http-status-codes": "^2.3.0",
     "joi": "^17.7.0",

package/src/hooks/hooks.ts

@@ -3,6 +3,7 @@ import Ajv from 'ajv';
 import Joi from 'joi';
 import addFormats from 'ajv-formats';
 import { BadRequest } from '@autofleet/errors';
+import ajvErrors from 'ajv-errors';
 import logger from '../utils/logger';
 import * as ValidatorRepo from '../repository/validator';
 import * as DefinitionRepo from '../repository/definition';
@@ -25,6 +26,7 @@ const ajv = new Ajv({
 });
 
 addFormats(ajv);
+ajvErrors(ajv);
 
 /**
  * Helper function to manually copy object properties
@@ -76,6 +78,29 @@ const getCompleteCustomFields = async (instance, options): Promise<Record<string
   return instance.customFields || {};
 };
 
+const formatAjvErrors = (
+  errors: {
+  instancePath?: string;
+  keyword: string;
+  message?: string;
+  params?: Record<string, any>;
+}[],
+): Record<string, string> => errors.reduce((acc, err) => {
+  const basePath = (err.instancePath || '')
+    .split('/')
+    .filter(Boolean)
+    .join('.')
+    .replace(/^after\./, '');
+
+  const missingProp = err.keyword === 'required' ? `.${err.params?.missingProperty}` : '';
+  const key = (basePath + missingProp).replace(/^\./, '') || 'root';
+
+  const message = err.message || 'Invalid value';
+  acc[key] = message;
+
+  return acc;
+}, {} as Record<string, string>);
+
 /**
  * Validates the model using custom validators
  */
@@ -83,6 +108,7 @@ const validateModel = async (
   instance,
   options,
   scopeAttributes: string[],
+  modelOptions: ModelOptions = {},
   isCreate = false,
 ): Promise<void> => {
   const modelType = instance.constructor.name;
@@ -124,6 +150,9 @@ const validateModel = async (
       {
         transaction: options.transaction,
         attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
+        ...(modelOptions.include && {
+          include: modelOptions.include?.(entityId),
+        }),
         raw: true,
       },
     );
@@ -189,7 +218,14 @@ const validateModel = async (
           const errorDetails = validateSchema.errors?.map((err) =>
             `${(err as any).instancePath || ''} ${(err as any).message || 'Invalid value'}`).join(', ');
 
-          throw new BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+          const formattedErrors = formatAjvErrors(validateSchema.errors);
+          throw new BadRequest(
+            [new Error(`Validation failed for ${modelType}: ${errorDetails}`)],
+            undefined,
+            {
+              customError: formattedErrors,
+            },
+          );
         }
       }
     } else {
@@ -224,7 +260,14 @@ const validateModel = async (
           .errors
           ?.map((err) => `${(err as any).instancePath || ''} ${(err as any).message || 'Invalid value'}`).join(', ');
 
-        throw new BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
+        const formattedErrors = formatAjvErrors(validateSchema.errors);
+        throw new BadRequest(
+          [new Error(`Validation failed for ${modelType}: ${errorDetails}`)],
+          undefined,
+          {
+            customError: formattedErrors,
+          },
+        );
       }
     }
   }
@@ -321,7 +364,7 @@ export const beforeCreate = (
   }
 
   // Step 2: Validate the model data (including custom fields)
-  await validateModel(instance, options, scopeAttributes, true);
+  await validateModel(instance, options, scopeAttributes, modelOptions, true);
 
   // format date and datetime fields
   formatDates(fieldDefinitions, instance);
@@ -372,7 +415,7 @@ export const beforeUpdate = (
   });
 
   // Step 1: Validate the model data (including custom fields)
-  await validateModel(instance, options, scopeAttributes, false);
+  await validateModel(instance, options, scopeAttributes, modelOptions, false);
 
   // format date and datetime fields
   formatDates(fieldDefinitions, instance);

package/src/repository/validator.ts

@@ -1,4 +1,4 @@
-import type { Transactionable } from 'sequelize';
+import type { IncludeOptions, Transactionable } from 'sequelize';
 import logger from '../utils/logger';
 import { CustomValidator } from '../models';
 
@@ -6,6 +6,7 @@ export interface FindValidatorOptions extends Transactionable {
   withDisabled?: boolean;
   attributes?: string[];
   raw?: boolean;
+  include?: IncludeOptions[];
 }
 
 // Make sure this interface is compatible with the Sequelize model
@@ -68,7 +69,9 @@ export const findAllByModelType = async (
   return findAll(
     {
       modelType,
-      entityId,
+      ...(!options.include && {
+        entityId,
+      }),
     },
     options,
   );