@dynamatix/cat-shared 0.0.13 → 0.0.15

package/middlewares/audit.middleware.js

@@ -1,67 +1,74 @@
-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 and save
-    schema.pre('save', async function (next) {
-        const doc = this;
-        const isNewDoc = doc.isNew;
+    // Handle create
+    schema.post('save', async function (doc) {
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
-        if (!auditConfig) return next();
+        if (!auditConfig?.trackCreation) return;
 
-        const logs = [];
         const context = getContext();
         const userId = context?.userId || 'anonymous';
+        const contextId = context?.contextId;
 
-        if (isNewDoc && auditConfig.trackCreation) {
-            logs.push({
-                name: `${collectionName} created`,
-                recordId: doc._id,
-                oldValue: null,
-                newValue: 'Document created',
-                createdBy: userId
-            });
+        const log = {
+            name: `${collectionName} created`,
+            recordId: doc._id,
+            oldValue: null,
+            newValue: 'Document created',
+            createdBy: userId,
+            contextId
+        };
+        if (onAuditLogCreated) {
+            onAuditLogCreated(logs, contextId); // 👈 Call the hook with the logs
         }
 
-        if (logs.length) await AuditLog.insertMany(logs);
-        next();
+        await AuditLog.create(log);
     });
 
-    // Handle update queries like findByIdAndUpdate
-    schema.pre(['findOneAndUpdate', 'findByIdAndUpdate'], async function (next) {
-        const query = this;
-        const update = query.getUpdate();
+    // Handle updates (after successful update)
+    schema.post(['findOneAndUpdate', 'findByIdAndUpdate'], async function (result) {
+        if (!result) return; // No doc was updated
+
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
-        if (!auditConfig || !auditConfig.fields?.length) return next();
+        if (!auditConfig?.fields?.length) return;
 
-        const original = await query.model.findOne(query.getQuery()).lean();
-        if (!original) return next();
+        const query = this;
+        const update = query.getUpdate();
 
         const logs = [];
         const context = getContext();
         const userId = context?.userId || 'anonymous';
+        const contextId = context?.contextId;
 
         for (const field of auditConfig.fields) {
             if (update?.$set?.hasOwnProperty(field) || update?.hasOwnProperty(field)) {
                 const newValue = update?.$set?.[field] ?? update?.[field];
-                const oldValue = original[field];
+                const oldValue = result[field];
 
                 if (oldValue !== newValue) {
                     logs.push({
                         name: `${collectionName}.${field}`,
-                        recordId: original._id,
+                        recordId: result._id,
                         oldValue,
                         newValue,
-                        createdBy: userId
+                        createdBy: userId,
+                        contextId
                     });
                 }
             }
         }
 
         if (logs.length) await AuditLog.insertMany(logs);
-        next();
+        if (onAuditLogCreated) {
+            onAuditLogCreated(logs, contextId); // 👈 Call the hook with the logs
+        }
     });
 }
 
-export default applyAuditMiddleware;
+
+export function registerAuditHook(callback) {
+    onAuditLogCreated = callback;
+}
+
+export default applyAuditMiddleware;

package/middlewares/index.js

@@ -1 +1,2 @@
 export {default as applyAuditMiddleware} from './audit.middleware.js';
+export { registerAuditHook } from './audit.middleware.js';

package/models/audit.model.js

@@ -3,6 +3,7 @@ import mongoose from 'mongoose';
 const auditSchema = new mongoose.Schema({
     name: String,
     recordId: mongoose.Schema.Types.ObjectId,
+    contextId: mongoose.Schema.Types.ObjectId,
     oldValue: mongoose.Schema.Types.Mixed,
     newValue: mongoose.Schema.Types.Mixed,
     timestamp: { type: Date, default: Date.now },

package/package.json

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

package/services/audit-log.hook.js

@@ -0,0 +1,2 @@
+
+