@autofleet/sadot 0.13.0-beta.1 → 0.13.0-beta.10

package/dist/api/v1/validator/index.js

@@ -69,7 +69,7 @@ router.get('/', async (req, res) => {
             ...(entityType && { entityType }),
         };
         const validators = await ValidatorRepo.findAll(where);
-        return res.status(http_status_codes_1.StatusCodes.OK).json(validators);
+        return res.status(http_status_codes_1.StatusCodes.OK).json({ validators });
     }
     catch (err) {
         return (0, errors_2.default)(err, res, { logger: logger_1.default, message: `Error in get all ${ENTITY} request` });

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

@@ -23,7 +23,6 @@ const validationSchemas = {
     }),
     update: joi_1.default.object({
         entityId: joi_1.default.string().uuid(),
-        entityType: joi_1.default.string(),
         schema: joi_1.default.object({
             type: joi_1.default.string().valid('object'),
             properties: joi_1.default.object({

package/dist/hooks/hooks.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeBulkUpdate = exports.beforeBulkCreate = exports.beforeUpdate = exports.beforeCreate = void 0;
 const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const errors_1 = require("@autofleet/errors");
 const logger_1 = __importDefault(require("../utils/logger"));
 const ValidatorRepo = __importStar(require("../repository/validator"));
@@ -40,7 +41,9 @@ const ajv = new ajv_1.default({
     allErrors: true,
     strict: false, // Disable strict mode to avoid warnings
     strictTypes: false, // Disable strict type checking
+    $data: true, // Enable $data references
 });
+(0, ajv_formats_1.default)(ajv);
 /**
  * Validates the model using custom validators
  */
@@ -104,31 +107,41 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
                         after: typedSchema.properties.after,
                     },
                 });
-                const isValid = validateSchema({
+                const isValid = validateSchema(JSON.stringify({
                     after: {
                         ...instance.dataValues,
-                        ...instance.customFields,
+                        customFields: instance.customFields,
                     },
-                });
+                }));
                 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}`)], [`Validation failed for ${modelType}`]);
+                    throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
                 }
             }
         }
         else {
             // For update operations, we need both before and after
             const validateSchema = ajv.compile(typedSchema);
-            const isValid = validateSchema({
+            const isValid = validateSchema(JSON.stringify({
                 before: originalValues,
                 after: {
                     ...instance.dataValues,
-                    ...instance.customFields,
+                    customFields: instance.customFields,
+                },
+            }));
+            logger_1.default.info('sadot - validation result', {
+                isValid,
+                test: {
+                    before: originalValues,
+                    after: {
+                        ...instance.dataValues,
+                        ...instance.customFields,
+                    },
                 },
             });
             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}`)], [`Validation failed for ${modelType}`]);
+                throw new errors_1.BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
             }
         }
     }

package/dist/utils/validations/schema/validator-schema.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateValidatorSchema = void 0;
 const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const errors_1 = require("@autofleet/errors");
 const logger_1 = __importDefault(require("../../logger"));
 // Instantiate Ajv for meta-validation
@@ -12,7 +13,9 @@ const metaValidator = new ajv_1.default({
     allErrors: true,
     strict: false,
     strictTypes: false,
+    $data: true, // Enable $data references
 });
+(0, ajv_formats_1.default)(metaValidator);
 /**
  * Schema for validating JSON Schema objects in custom validators
  * This is a meta-schema to ensure that custom validator schemas are valid Ajv schemas

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.10",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "@autofleet/common-types": "^4.4.0",
     "@autofleet/events": "^4.0.0",
     "ajv": "^8.12.0",
+    "ajv-formats": "^3.0.1",
     "http-status-codes": "^2.3.0",
     "joi": "^17.7.0",
     "pg": "^8.10.0",

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

@@ -39,7 +39,7 @@ router.post<{ modelName: string }>('/', async (req, res) => {
  */
 router.get<
   { modelName: string },
-  CustomValidator[],
+  { validators: CustomValidator[] },
   never,
   { entityId?: string; entityType?: string }
 >('/', async (req, res) => {
@@ -55,7 +55,7 @@ router.get<
 
     const validators = await ValidatorRepo.findAll(where);
 
-    return res.status(StatusCodes.OK).json(validators);
+    return res.status(StatusCodes.OK).json({ validators });
   } catch (err) {
     return handleError(err, res, { logger, message: `Error in get all ${ENTITY} request` });
   }

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

@@ -21,7 +21,6 @@ const validationSchemas = {
 
   update: Joi.object({
     entityId: Joi.string().uuid(),
-    entityType: Joi.string(),
     schema: Joi.object({
       type: Joi.string().valid('object'),
       properties: Joi.object({

package/src/hooks/hooks.ts

@@ -1,5 +1,6 @@
 import type { WhereOptions } from 'sequelize';
 import Ajv from 'ajv';
+import addFormats from 'ajv-formats';
 import { BadRequest } from '@autofleet/errors';
 import logger from '../utils/logger';
 import * as ValidatorRepo from '../repository/validator';
@@ -14,8 +15,11 @@ const ajv = new Ajv({
   allErrors: true,
   strict: false, // Disable strict mode to avoid warnings
   strictTypes: false, // Disable strict type checking
+  $data: true, // Enable $data references
 });
 
+addFormats(ajv);
+
 /**
  * Validates the model using custom validators
  */
@@ -103,29 +107,40 @@ const validateModel = async (
           },
         });
 
-        const isValid = validateSchema({
+        const isValid = validateSchema(JSON.stringify({
           after: {
             ...instance.dataValues,
-            ...instance.customFields,
+            customFields: instance.customFields,
           },
-        });
+        }));
 
         if (!isValid) {
           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}`)], [`Validation failed for ${modelType}`]);
+          throw new BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
         }
       }
     } else {
       // For update operations, we need both before and after
       const validateSchema = ajv.compile(typedSchema);
 
-      const isValid = validateSchema({
+      const isValid = validateSchema(JSON.stringify({
         before: originalValues,
         after: {
           ...instance.dataValues,
-          ...instance.customFields,
+          customFields: instance.customFields,
+        },
+      }));
+
+      logger.info('sadot - validation result', {
+        isValid,
+        test: {
+          before: originalValues,
+          after: {
+            ...instance.dataValues,
+            ...instance.customFields,
+          },
         },
       });
 
@@ -133,7 +148,7 @@ 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}`)], [`Validation failed for ${modelType}`]);
+        throw new BadRequest([new Error(`Validation failed for ${modelType}: ${errorDetails}`)]);
       }
     }
   }

package/src/utils/validations/schema/validator-schema.ts

@@ -1,4 +1,5 @@
 import Ajv from 'ajv';
+import addFormats from 'ajv-formats';
 import { BadRequest } from '@autofleet/errors';
 import logger from '../../logger';
 
@@ -7,7 +8,9 @@ const metaValidator = new Ajv({
   allErrors: true,
   strict: false,
   strictTypes: false,
+  $data: true, // Enable $data references
 });
+addFormats(metaValidator);
 
 /**
  * Schema for validating JSON Schema objects in custom validators

package/validator-test.js

@@ -0,0 +1,79 @@
+const Ajv = require("ajv");
+const addFormats = require("ajv-formats");
+const ajv = new Ajv({
+    allErrors: true,
+    strict: false, // Disable strict mode to avoid warnings
+    strictTypes: false, // Disable strict type checking
+    $data: true, // Enable $data references
+  }); // options can be passed, e.g. {allErrors: true}
+  addFormats(ajv);
+
+
+const schema = {
+    "type": "object",
+    "properties": {
+        "after": {
+            "type": "object",
+            "properties": {
+                "customFields": {
+                    "type": "object",
+                    "properties": {
+                        "actualStartTime": {
+                            "type": "string",
+                            "format": "date-time"
+                        },
+                        "actualEndTime": {
+                            "type": "string",
+                            "format": "date-time",
+                            "formatMinimum": {
+                                "$data": "/after/customFields/actualStartTime"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+  };
+
+const validate = ajv.compile(schema);
+
+const data = {
+    "id": "c9c87cec-28c7-4a1f-9376-4d8a4ba0f49c",
+    "typeId": "4fcd7096-4c90-46a2-a20e-91bb5bff3ced",
+    "priorityId": null,
+    "statusId": "51d28a37-c042-429f-a9cd-fbc81bba2b39",
+    "subjectId": null,
+    "subjectType": null,
+    "title": "ff",
+    "description": null,
+    "dueTime": null,
+    "startTime": null,
+    "endTime": null,
+    "driverId": null,
+    "vendorId": null,
+    "userId": null,
+    "businessModelId": "72ecf740-42a1-46f4-81ca-8132b08c4f04",
+    "createdAt": "2025-03-12T12:58:05.529Z",
+    "updatedAt": "2025-03-12T12:58:05.529Z",
+    "deletedAt": null,
+    "actions": [],
+    "customFields": {
+        "actualStartTime": "2025-03-14T12:48:01.373Z",
+        "actualEndTime": "2025-03-01T12:51:46.685Z"
+    },
+    "isBlocker": false
+};
+
+const valid = validate({after: data});
+
+if (!valid) {
+  console.log("invalid, the errors is: ");
+  validate.errors.forEach((error) =>
+    console.log(error.instancePath, error.message)
+  );
+} else {
+  console.log("valid");
+}
+
+console.log("--------------------");