@autofleet/sadot 0.13.5-beta-45e699d4.2 → 0.13.5-beta

package/dist/hooks/hooks.d.ts

@@ -1,4 +1,19 @@
 import type { CustomFieldOptions, ModelOptions } from '../types';
+type AjvError = {
+    instancePath?: string;
+    keyword: string;
+    message?: string;
+    params?: Record<string, any>;
+    schemaPath?: string;
+    [key: string]: any;
+};
+export declare const formatAjvErrors: (errors?: AjvError[]) => {
+    path: string;
+    keyword: string;
+    message: string;
+    errorCode: string;
+    details: Record<string, any>;
+}[];
 /**
  * Hook to handle validation and custom fields during creation
  */
@@ -15,3 +30,4 @@ export declare const beforeBulkCreate: (options: any) => void;
  * Hook to enable individual hooks for bulk update operations
  */
 export declare const beforeBulkUpdate: (options: any) => void;
+export {};

package/dist/hooks/hooks.js

@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.beforeBulkUpdate = exports.beforeBulkCreate = exports.beforeUpdate = exports.beforeCreate = void 0;
+exports.beforeBulkUpdate = exports.beforeBulkCreate = exports.beforeUpdate = exports.beforeCreate = exports.formatAjvErrors = void 0;
 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,6 +90,21 @@ const getCompleteCustomFields = async (instance, options) => {
     }
     return instance.customFields || {};
 };
+const formatAjvErrors = (errors = []) => errors.map((err) => {
+    const path = err.instancePath || '/';
+    const { keyword } = err;
+    const message = err.message || 'Invalid value';
+    const normalizedPath = path.replace(/\//g, '_').replace(/^_/, '');
+    const errorCode = `${keyword}_${normalizedPath}`;
+    return {
+        path,
+        keyword,
+        message,
+        errorCode,
+        details: err.params || {},
+    };
+});
+exports.formatAjvErrors = formatAjvErrors;
 /**
  * Validates the model using custom validators
  */
@@ -172,8 +189,13 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
                     },
                 })));
                 if (!isValid) {
+                    const formattedErrors = (0, exports.formatAjvErrors)(validateSchema.errors);
+                    console.log(JSON.stringify({ AAAAAAA: formattedErrors, BBBBB: validateSchema.errors }));
                     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}`)]);
+                    throw new errors_1.BadRequest([
+                        new Error(`Validation failed for ${modelType}: ${errorDetails}`),
+                        ...formattedErrors.map((err) => new Error(err.message)),
+                    ]);
                 }
             }
         }

package/dist/models/index.js

@@ -59,6 +59,13 @@ const initTables = async (sequelize, getUser, { schemaPrefix = SADOT_MIGRATION_P
         if (!user?.permissions) {
             return {};
         }
+        console.log({
+            PPPPPPPP: JSON.stringify([
+                ...Object.keys(user.permissions.fleets),
+                ...Object.keys(user.permissions.businessModels),
+                ...Object.keys(user.permissions.demandSources),
+            ]),
+        });
         return {
             where: {
                 entityId: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.5-beta-45e699d4.2",
+  "version": "0.13.5-beta",
   "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",
@@ -42,7 +43,7 @@
   "devDependencies": {
     "@autofleet/errors": "^3.0.1",
     "@autofleet/logger": "^4.2.1",
-    "@autofleet/node-common": "4.0.12-beta-15e70722.0",
+    "@autofleet/node-common": "^4.0.2",
     "@autofleet/zehut": "^3.2.0",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.13",

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,33 @@ const getCompleteCustomFields = async (instance, options): Promise<Record<string
   return instance.customFields || {};
 };
 
+type AjvError = {
+  instancePath?: string;
+  keyword: string;
+  message?: string;
+  params?: Record<string, any>;
+  schemaPath?: string;
+  [key: string]: any;
+};
+
+export const formatAjvErrors = (errors: AjvError[] = []) =>
+  errors.map((err) => {
+    const path = err.instancePath || '/';
+    const { keyword } = err;
+    const message = err.message || 'Invalid value';
+
+    const normalizedPath = path.replace(/\//g, '_').replace(/^_/, '');
+    const errorCode = `${keyword}_${normalizedPath}`;
+
+    return {
+      path,
+      keyword,
+      message,
+      errorCode,
+      details: err.params || {},
+    };
+  });
+
 /**
  * Validates the model using custom validators
  */
@@ -186,10 +215,14 @@ const validateModel = async (
         })));
 
         if (!isValid) {
+          const formattedErrors = formatAjvErrors(validateSchema.errors);
           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}`)]);
+          throw new BadRequest([
+            new Error(`Validation failed for ${modelType}: ${errorDetails}`),
+            ...formattedErrors.map((err) => new Error(err.message)),
+          ]);
         }
       }
     } else {

package/.env

@@ -1,3 +0,0 @@
-DB_USERNAME=emiltayeb
-DB_PASSWORD=123456
-NODE_ENV=test