@dynamatix/cat-shared 0.0.10 → 0.0.12

package/index.js

@@ -1,2 +1,3 @@
 export * from './models/index.js';
-export * from './middlewares/index.js';
+export * from './middlewares/index.js';
+export * from './services/index.js';

package/middlewares/audit.middleware.js

@@ -1,35 +1,59 @@
 import AuditConfigModel from '../models/audit-config.model.js';
-
+import AuditLog from '../models/audit.model.js';
+import { getContext } from '../services/request-context.service.js';
 
 function applyAuditMiddleware(schema, collectionName) {
-    schema.pre(['save', 'updateOne', 'findByIdAndUpdate'], async function (next) {
+    // Handle create and save
+    schema.pre('save', async function (next) {
         const doc = this;
         const isNewDoc = doc.isNew;
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
         if (!auditConfig) return next();
 
         const logs = [];
+        const context = getContext();
+        const userId = context?.userId || 'anonymous';
 
         if (isNewDoc && auditConfig.trackCreation) {
             logs.push({
-                name: collectionName + ' created',
+                name: `${collectionName} created`,
                 documentId: doc._id,
                 oldValue: null,
                 newValue: 'Document created',
-                createdBy: doc._updatedBy || null
+                createdBy: userId
             });
-        } else if (!isNewDoc && auditConfig.fields?.length) {
-            const original = await doc.constructor.findById(doc._id).lean();
-            if (!original) return next();
+        }
 
-            for (const field of auditConfig.fields) {
-                if (doc.isModified(field)) {
+        if (logs.length) await AuditLog.insertMany(logs);
+        next();
+    });
+
+    // Handle update queries like findByIdAndUpdate
+    schema.pre(['findOneAndUpdate', 'findByIdAndUpdate'], async function (next) {
+        const query = this;
+        const update = query.getUpdate();
+        const auditConfig = await AuditConfigModel.findOne({ collectionName });
+        if (!auditConfig || !auditConfig.fields?.length) return next();
+
+        const original = await query.model.findOne(query.getQuery()).lean();
+        if (!original) return next();
+
+        const logs = [];
+        const context = getContext();
+        const userId = context?.userId || 'anonymous';
+
+        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];
+
+                if (oldValue !== newValue) {
                     logs.push({
-                        name: collectionName + '.'+ field,
-                        documentId: doc._id,
-                        oldValue: original[field],
-                        newValue: doc[field],
-                        createdBy: doc._updatedBy || null
+                        name: `${collectionName}.${field}`,
+                        documentId: original._id,
+                        oldValue,
+                        newValue,
+                        createdBy: userId
                     });
                 }
             }
@@ -40,5 +64,4 @@ function applyAuditMiddleware(schema, collectionName) {
     });
 }
 
-
 export default applyAuditMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/cat-shared",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -11,6 +11,7 @@
   "description": "",
   "exports": {
     "./models": "./models/index.js",
-    "./middlewares": "./middlewares/index.js"
+    "./middlewares": "./middlewares/index.js",
+    "./services": "./services/index.js"
   }
 }

package/services/index.js

@@ -0,0 +1 @@
+export { getContext, setContext } from './request-context.service.js';

package/services/request-context.service.js

@@ -0,0 +1,8 @@
+// utils/request-context.js
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+const asyncLocalStorage = new AsyncLocalStorage();
+
+export const setContext = (data) => asyncLocalStorage.enterWith(data);
+
+export const getContext = () => asyncLocalStorage.getStore();