@dynamatix/cat-shared 0.0.89 → 0.0.91

package/middlewares/audit.middleware.js

@@ -87,6 +87,13 @@ async function resolveEntityDescription(doc, auditConfig) {
     return value;
 }
 
+// Add new function to resolve deletion description
+async function resolveDeletionDescription(doc, auditConfig) {
+    if (!auditConfig.descriptionResolutorForDeletion) return '';
+    const expression = auditConfig.descriptionResolutorForDeletion;
+    return await resolveExpressionDescription(doc, expression, 'direct');
+}
+
 function applyAuditMiddleware(schema, collectionName) {
     // Handle creation audit
     schema.post('save', async function (doc) {
@@ -212,28 +219,39 @@ function applyAuditMiddleware(schema, collectionName) {
     });
 
     // Handle delete audits
+    schema.pre(['findOneAndDelete', 'findByIdAndDelete', 'deleteOne', 'deleteMany'], async function (next) {
+        // Store the query to fetch document before deletion
+        this._deleteQuery = this.getQuery();
+        next();
+    });
+
     schema.post(['findOneAndDelete', 'findByIdAndDelete', 'deleteOne', 'deleteMany'], async function (result) {
         if (!result) return;
 
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
         if (!auditConfig?.trackDeletion) return;
 
+        // Fetch the document before it was deleted
+        const deletedDoc = await this.model.findOne(this._deleteQuery).lean();
+        if (!deletedDoc) return;
+
         const context = getContext();
         const userId = context?.userId || 'anonymous';
         const contextId = context?.contextId;
 
-        const entityDescription = await resolveEntityDescription(result, auditConfig);
+        const entityDescription = await resolveEntityDescription(deletedDoc, auditConfig);
+        const deletionDescription = await resolveDeletionDescription(deletedDoc, auditConfig);
 
         const log = {
-            name: 'Entity Deletion',
+            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
             }
         };
 

package/models/audit-config.model.js

@@ -6,6 +6,7 @@ const auditConfigSchema = new mongoose.Schema({
     trackCreation: { type: Boolean, default: false },
     trackDeletion: { type: Boolean, default: false },
     descriptionResolutorForExternalData: { type: String, default: null },
+    descriptionResolutorForDeletion: { type: String, default: null },
 });
 
 const AuditConfigModel = mongoose.models.AuditConfig || mongoose.model('AuditConfig', auditConfigSchema);

package/package.json

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