@dynamatix/cat-shared 0.0.16 → 0.0.17

package/middlewares/audit.middleware.js

@@ -2,13 +2,12 @@ import AuditConfigModel from '../models/audit-config.model.js';
 import AuditLog from '../models/audit.model.js';
 import { getContext } from '../services/request-context.service.js';
 
-
 let onAuditLogCreated = null;
 
 function applyAuditMiddleware(schema, collectionName) {
-    // Handle create
+    // Handle create (after save)
     schema.post('save', async function (doc) {
-        const auditConfig = await AuditLog.findOne({ collectionName });
+        const auditConfig = await AuditConfigModel.findOne({ collectionName });
         if (!auditConfig?.trackCreation) return;
 
         const context = getContext();
@@ -23,23 +22,28 @@ function applyAuditMiddleware(schema, collectionName) {
             createdBy: userId,
             contextId
         };
+
+        await AuditLog.create(log);
+
         if (onAuditLogCreated) {
-            onAuditLogCreated(logs, contextId); // 👈 Call the hook with the logs
+            await onAuditLogCreated([log], contextId);
         }
+    });
 
-        await AuditLog.create(log);
+    // Capture original doc before update
+    schema.pre(['findOneAndUpdate', 'findByIdAndUpdate'], async function (next) {
+        this._originalDoc = await this.model.findOne(this.getQuery()).lean();
+        next();
     });
 
     // Handle updates (after successful update)
     schema.post(['findOneAndUpdate', 'findByIdAndUpdate'], async function (result) {
-        if (!result) return; // No doc was updated
+        if (!result || !this._originalDoc) return;
 
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
         if (!auditConfig?.fields?.length) return;
 
-        const query = this;
-        const update = query.getUpdate();
-
+        const update = this.getUpdate();
         const logs = [];
         const context = getContext();
         const userId = context?.userId || 'anonymous';
@@ -48,7 +52,7 @@ function applyAuditMiddleware(schema, collectionName) {
         for (const field of auditConfig.fields) {
             if (update?.$set?.hasOwnProperty(field) || update?.hasOwnProperty(field)) {
                 const newValue = update?.$set?.[field] ?? update?.[field];
-                const oldValue = result[field];
+                const oldValue = this._originalDoc[field];
 
                 if (oldValue !== newValue) {
                     logs.push({
@@ -63,16 +67,17 @@ function applyAuditMiddleware(schema, collectionName) {
             }
         }
 
-        if (logs.length) await AuditLog.insertMany(logs);
-        if (onAuditLogCreated) {
-            onAuditLogCreated(logs, contextId); // 👈 Call the hook with the logs
+        if (logs.length) {
+            await AuditLog.insertMany(logs);
+            if (onAuditLogCreated) {
+                await onAuditLogCreated(logs, contextId);
+            }
         }
     });
 }
 
-
 export function registerAuditHook(callback) {
     onAuditLogCreated = callback;
 }
 
-export default applyAuditMiddleware;
+export default applyAuditMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/cat-shared",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"