@dynamatix/cat-shared 0.0.90 → 0.0.92

package/middlewares/audit.middleware.js

@@ -135,7 +135,7 @@ function applyAuditMiddleware(schema, collectionName) {
                 });
             }
         }
-
+        logs = logs.filter(log => log.newValue !== log.oldValue);
         if (logs.length) {
             await AuditLog.insertMany(logs);
             await updateContextAuditCount(contextId, logs.length);
@@ -208,7 +208,7 @@ function applyAuditMiddleware(schema, collectionName) {
                 }
             }
         }
-
+        logs = logs.filter(log => log.newValue !== log.oldValue);
         if (logs.length) {
             await AuditLog.insertMany(logs);
             await updateContextAuditCount(contextId, logs.length);
@@ -219,6 +219,20 @@ function applyAuditMiddleware(schema, collectionName) {
     });
 
     // Handle delete audits
+    schema.pre(['findOneAndDelete', 'findByIdAndDelete', 'deleteOne', 'deleteMany'], async function (next) {
+        try {
+            // Fetch the document before deletion
+            const docToDelete = await this.model.findOne(this.getQuery()).lean();
+            if (docToDelete) {
+                // Store the document for use in post middleware
+                this._docToDelete = docToDelete;
+            }
+            next();
+        } catch (error) {
+            next(error);
+        }
+    });
+
     schema.post(['findOneAndDelete', 'findByIdAndDelete', 'deleteOne', 'deleteMany'], async function (result) {
         if (!result) return;
 
@@ -229,22 +243,24 @@ function applyAuditMiddleware(schema, collectionName) {
         const userId = context?.userId || 'anonymous';
         const contextId = context?.contextId;
 
-        const entityDescription = await resolveEntityDescription(result, auditConfig);
-        const deletionDescription = await resolveDeletionDescription(result, auditConfig);
+        const entityDescription = await resolveEntityDescription(this._docToDelete, auditConfig);
+        const deletionDescription = await resolveDeletionDescription(this._docToDelete, auditConfig);
 
         const log = {
             name: deletionDescription || 'Entity Deletion',
             entity: entityDescription,
-            recordId: contextId || result._id,
+            recordId: contextId || deletedDoc._id,
             oldValue: '',
             newValue: 'Deleted',
             createdBy: userId,
             externalData: {
                 description: entityDescription,
-                contextId: contextId || result._id
+                contextId: contextId || deletedDoc._id
             }
         };
-
+        if (log.newValue === log.oldValue) {
+            return;
+        }
         await AuditLog.create(log);
         await updateContextAuditCount(contextId, 1);
         if (onAuditLogCreated) {

package/package.json

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