@autofleet/sadot 1.0.2 → 1.0.3

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

@@ -4,36 +4,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const joi_1 = __importDefault(require("joi"));
-// Schema for validating JSON Schema objects
 const jsonSchemaValidation = joi_1.default.object().unknown(true);
+const schemaObject = joi_1.default.object({
+    type: joi_1.default.string().valid('object'),
+    properties: joi_1.default.object({
+        before: jsonSchemaValidation,
+        after: jsonSchemaValidation,
+    }).required(),
+    required: joi_1.default.array().items(joi_1.default.string()),
+    allOf: joi_1.default.array().items(joi_1.default.object()),
+    anyOf: joi_1.default.array().items(joi_1.default.object()),
+    oneOf: joi_1.default.array().items(joi_1.default.object()),
+    additionalProperties: joi_1.default.alternatives().try(joi_1.default.boolean(), joi_1.default.object()),
+    $id: joi_1.default.string(),
+    $schema: joi_1.default.string(),
+    if: joi_1.default.object(),
+    then: joi_1.default.object(),
+    else: joi_1.default.object(),
+});
 const validationSchemas = {
     create: joi_1.default.object({
         entityId: joi_1.default.string().uuid().required(),
         entityType: joi_1.default.string().required(),
-        schema: joi_1.default.object({
-            type: joi_1.default.string().valid('object').required(),
-            properties: joi_1.default.object({
-                before: jsonSchemaValidation,
-                after: jsonSchemaValidation,
-            }).required(),
-            if: joi_1.default.object().optional(),
-            then: joi_1.default.object().optional(),
-            else: joi_1.default.object().optional(),
-        }).required(),
+        schema: schemaObject.required(),
     }),
     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({
-                before: jsonSchemaValidation,
-                after: jsonSchemaValidation,
-            }),
-            if: joi_1.default.object().optional(),
-            then: joi_1.default.object().optional(),
-            else: joi_1.default.object().optional(),
-        }),
+        schema: schemaObject,
         disabled: joi_1.default.boolean(),
     }).min(1),
 };

package/dist/hooks/hooks.js

@@ -90,6 +90,21 @@ const getCompleteCustomFields = async (instance, options) => {
     }
     return instance.customFields || {};
 };
+const buildPreChangeState = (instance) => {
+    const beforeFull = { ...instance.dataValues };
+    const changedKeys = instance.changed?.() || [];
+    changedKeys.forEach((key) => {
+        const prevVal = instance.previous?.(key);
+        if (prevVal !== undefined) {
+            beforeFull[key] = prevVal;
+        }
+    });
+    const prevCF = instance.previous?.('customFields');
+    if (prevCF !== undefined) {
+        beforeFull.customFields = prevCF;
+    }
+    return beforeFull;
+};
 const formatAjvErrors = (errors) => errors.reduce((acc, err) => {
     const basePath = (err.instancePath || '')
         .split('/')
@@ -150,10 +165,7 @@ const validateModel = async (instance, options, scopeAttributes, modelOptions =
     // For updates, get the previous values
     let originalValues = null;
     if (!isCreate) {
-        // Create originalValues with our helper function
-        originalValues = manualObjectCopy(instance.previous());
-        // Add customFields separately
-        originalValues.customFields = instance.previous('customFields') || {};
+        originalValues = buildPreChangeState(instance);
     }
     // Get complete custom fields by merging DB values with update values
     // This is especially important for partial updates to ensure all related fields are available

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

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

@@ -1,37 +1,36 @@
 import Joi from 'joi';
 
-// Schema for validating JSON Schema objects
 const jsonSchemaValidation = Joi.object().unknown(true);
 
+const schemaObject = Joi.object({
+  type: Joi.string().valid('object'),
+  properties: Joi.object({
+    before: jsonSchemaValidation,
+    after: jsonSchemaValidation,
+  }).required(),
+  required: Joi.array().items(Joi.string()),
+  allOf: Joi.array().items(Joi.object()),
+  anyOf: Joi.array().items(Joi.object()),
+  oneOf: Joi.array().items(Joi.object()),
+  additionalProperties: Joi.alternatives().try(Joi.boolean(), Joi.object()),
+  $id: Joi.string(),
+  $schema: Joi.string(),
+  if: Joi.object(),
+  then: Joi.object(),
+  else: Joi.object(),
+});
+
 const validationSchemas = {
   create: Joi.object({
     entityId: Joi.string().uuid().required(),
     entityType: Joi.string().required(),
-    schema: Joi.object({
-      type: Joi.string().valid('object').required(),
-      properties: Joi.object({
-        before: jsonSchemaValidation,
-        after: jsonSchemaValidation,
-      }).required(),
-      if: Joi.object().optional(),
-      then: Joi.object().optional(),
-      else: Joi.object().optional(),
-    }).required(),
+    schema: schemaObject.required(),
   }),
 
   update: Joi.object({
     entityId: Joi.string().uuid(),
     entityType: Joi.string(),
-    schema: Joi.object({
-      type: Joi.string().valid('object'),
-      properties: Joi.object({
-        before: jsonSchemaValidation,
-        after: jsonSchemaValidation,
-      }),
-      if: Joi.object().optional(),
-      then: Joi.object().optional(),
-      else: Joi.object().optional(),
-    }),
+    schema: schemaObject,
     disabled: Joi.boolean(),
   }).min(1),
 };

package/src/hooks/hooks.ts

@@ -78,6 +78,25 @@ const getCompleteCustomFields = async (instance, options): Promise<Record<string
   return instance.customFields || {};
 };
 
+const buildPreChangeState = (instance: any) => {
+  const beforeFull: any = { ...instance.dataValues };
+
+  const changedKeys: string[] = instance.changed?.() || [];
+  changedKeys.forEach((key) => {
+    const prevVal = instance.previous?.(key);
+    if (prevVal !== undefined) {
+      beforeFull[key] = prevVal;
+    }
+  });
+
+  const prevCF = instance.previous?.('customFields');
+  if (prevCF !== undefined) {
+    beforeFull.customFields = prevCF;
+  }
+
+  return beforeFull;
+};
+
 const formatAjvErrors = (
   errors: {
   instancePath?: string;
@@ -169,11 +188,7 @@ const validateModel = async (
   // For updates, get the previous values
   let originalValues = null;
   if (!isCreate) {
-    // Create originalValues with our helper function
-    originalValues = manualObjectCopy(instance.previous());
-
-    // Add customFields separately
-    originalValues.customFields = instance.previous('customFields') || {};
+    originalValues = buildPreChangeState(instance);
   }
 
   // Get complete custom fields by merging DB values with update values