@autofleet/sadot 0.13.0-beta.7 → 0.13.0-beta.8

package/dist/hooks/hooks.js

@@ -129,6 +129,16 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
                     ...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}`)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.0-beta.7",
+  "version": "0.13.0-beta.8",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/hooks/hooks.ts

@@ -1,6 +1,6 @@
 import type { WhereOptions } from 'sequelize';
 import Ajv from 'ajv';
-import addFormats from "ajv-formats";
+import addFormats from 'ajv-formats';
 import { BadRequest } from '@autofleet/errors';
 import logger from '../utils/logger';
 import * as ValidatorRepo from '../repository/validator';
@@ -129,7 +129,18 @@ const validateModel = async (
         before: originalValues,
         after: {
           ...instance.dataValues,
-          ...instance.customFields,
+          customFields: instance.customFields,
+        },
+      });
+
+      logger.info('sadot - validation result', {
+        isValid,
+        test: {
+          before: originalValues,
+          after: {
+            ...instance.dataValues,
+            ...instance.customFields,
+          },
         },
       });
 

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("--------------------");