@dynamatix/cat-shared 0.0.98 → 0.0.100

package/middlewares/audit.middleware.js

@@ -3,6 +3,7 @@ import AuditLog from '../models/audit.model.js';
 import ValueReferenceMap from '../models/value-reference-map.model.js';
 import { getContext } from '../services/request-context.service.js';
 import mongoose from 'mongoose';
+import FormConfigurationModel from '../models/form-configuration.model.js';
 
 let onAuditLogCreated = null;
 
@@ -96,12 +97,33 @@ async function resolveDeletionDescription(doc, auditConfig) {
     return await resolveExpressionDescription(doc, expression, 'direct');
 }
 
+// Utility to build a fieldName -> dataType map from multiple formConfig.sections
+function buildFieldTypeMapFromConfigs(formConfigs) {
+    const map = {};
+    function extractFields(sections) {
+        for (const section of sections || []) {
+            if (section.fields) {
+                for (const f of section.fields) map[f.fieldName] = f.dataType;
+            }
+            if (section.sections) extractFields(section.sections);
+        }
+    }
+    for (const config of formConfigs) {
+        extractFields(config.sections);
+    }
+    return map;
+}
+
 function applyAuditMiddleware(schema, collectionName) {
     // Handle creation audit
     schema.post('save', async function (doc) {
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
         if (!auditConfig?.trackCreation) return;
 
+        // Fetch all form configs and build fieldTypeMap once
+        const formConfigs = await FormConfigurationModel.find({ collectionName });
+        const fieldTypeMap = buildFieldTypeMapFromConfigs(formConfigs);
+
         const context = getContext();
         const userId = context?.userId || 'anonymous';
         const contextId = context?.contextId;
@@ -123,12 +145,18 @@ function applyAuditMiddleware(schema, collectionName) {
                     }
                 }
                 const fieldDescription = await resolveDescription(field, doc);
+                // --- Add pound prefix if needed ---
+                let displayNewValue = lookupName || newValue;
+                const dataType = fieldTypeMap[field];
+                if (dataType === 'pound' && displayNewValue != null && displayNewValue !== '') {
+                    displayNewValue = `£${displayNewValue}`;
+                }
                 logs.push({
                     name: fieldDescription,
                     entity: entityDescription,
                     recordId: contextId || doc._id,
                     oldValue: null,
-                    newValue: lookupName || newValue,
+                    newValue: displayNewValue,
                     createdBy: userId,
                     externalData: {
                         description: entityDescription,
@@ -165,6 +193,10 @@ function applyAuditMiddleware(schema, collectionName) {
         const auditConfig = await AuditConfigModel.findOne({ collectionName });
         if (!auditConfig?.fields?.length) return;
 
+        // Fetch all form configs and build fieldTypeMap once
+        const formConfigs = await FormConfigurationModel.find({ collectionName });
+        const fieldTypeMap = buildFieldTypeMapFromConfigs(formConfigs);
+
         const update = this.getUpdate();
         let logs = [];
         const context = getContext();
@@ -174,7 +206,6 @@ function applyAuditMiddleware(schema, collectionName) {
         const entityDescription = await resolveEntityDescription(result, auditConfig);
 
         for (const field of auditConfig.fields) {
-
             const hasChanged =
                 update?.$set?.hasOwnProperty(field) || update?.hasOwnProperty(field);
 
@@ -199,16 +230,22 @@ function applyAuditMiddleware(schema, collectionName) {
                 }
 
                 // Convert null/undefined to empty string for comparison
-                const oldVal = lookupOldName ?? oldValue ?? '';
-                const newVal = lookupNewName ?? newValue ?? '';
-                if (oldVal !== newVal) {
+                let displayOldValue = lookupOldName ?? oldValue ?? '';
+                let displayNewValue = lookupNewName ?? newValue ?? '';
+                // --- Add pound prefix if needed ---
+                const dataType = fieldTypeMap[field];
+                if (dataType === 'pound') {
+                    if (displayOldValue != null && displayOldValue !== '') displayOldValue = `£${displayOldValue}`;
+                    if (displayNewValue != null && displayNewValue !== '') displayNewValue = `£${displayNewValue}`;
+                }
+                if (displayOldValue !== displayNewValue) {
                     const fieldDescription = await resolveDescription(field, result);
                     logs.push({
                         name: fieldDescription,
                         entity: entityDescription,
                         recordId: contextId || result._id,
-                        oldValue: oldVal,
-                        newValue: newVal,
+                        oldValue: displayOldValue,
+                        newValue: displayNewValue,
                         createdBy: userId,
                         externalData: {
                             description: entityDescription,

package/package.json

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