@dynamatix/cat-shared 0.0.129 → 0.0.132

package/middlewares/audit.middleware.js

@@ -7,6 +7,54 @@ import FormConfigurationModel from '../models/form-configuration.model.js';
 
 let onAuditLogCreated = null;
 
+// Utility function to safely access nested properties
+function getNestedProperty(obj, path) {
+    if (!path || !obj) return undefined;
+
+    // Handle simple property access
+    if (!path.includes('.')) {
+        return obj[path];
+    }
+
+    // First check if the flattened key exists (MongoDB style: "additionalData.statusLid")
+    if (obj.hasOwnProperty(path)) {
+        return obj[path];
+    }
+
+    // Then try nested object structure
+    return path.split('.').reduce((current, key) => {
+        return current && current[key] !== undefined ? current[key] : undefined;
+    }, obj);
+}
+
+// Utility function to check if nested property exists in object
+function hasNestedProperty(obj, path) {
+    if (!path || !obj) return false;
+
+    // Handle simple property access
+    if (!path.includes('.')) {
+        return obj.hasOwnProperty(path);
+    }
+
+    // First check if the flattened key exists (MongoDB style: "additionalData.statusLid")
+    if (obj.hasOwnProperty(path)) {
+        return true;
+    }
+
+    // Then check nested object structure
+    const keys = path.split('.');
+    let current = obj;
+
+    for (let i = 0; i < keys.length - 1; i++) {
+        if (!current || !current.hasOwnProperty(keys[i])) {
+            return false;
+        }
+        current = current[keys[i]];
+    }
+
+    return current && current.hasOwnProperty(keys[keys.length - 1]);
+}
+
 // Optionally, define custom resolvers here
 const customResolvers = {
     // Example:
@@ -21,7 +69,7 @@ async function resolveExpressionDescription(doc, expression, resolverType) {
     let result = expression;
     for (const match of matches) {
         const fieldName = match[1];
-        let value = doc[fieldName];
+        let value = getNestedProperty(doc, fieldName);
         if (resolverType === 'lookup' && value && mongoose.models['Lookup']) {
             const lookupDoc = await mongoose.models['Lookup'].findById(value).lean();
             value = lookupDoc?.name || value;
@@ -45,18 +93,18 @@ async function resolveDescription(field, doc) {
     console.log("config.descriptionResolverType", config.descriptionResolverType);
     switch (config.descriptionResolverType) {
         case 'lookup': {
-            const lookupId = doc[config.descriptionField];
+            const lookupId = getNestedProperty(doc, config.descriptionField);
             if (!lookupId) return '';
             const lookupDoc = await mongoose.models['Lookup'].findById(lookupId).lean();
             return lookupDoc?.name || '';
         }
         case 'direct':
-            return doc[config.descriptionField] || '';
+            return getNestedProperty(doc, config.descriptionField) || '';
         case 'displayFieldReturn': // For case we just want to show display field value directly
             return config.displayField || '';
         case 'composite':
             return (config.descriptionFields || [])
-                .map(f => doc[f])
+                .map(f => getNestedProperty(doc, f))
                 .filter(Boolean)
                 .join(' ');
         case 'custom':
@@ -73,7 +121,7 @@ async function resolveDescription(field, doc) {
 async function resolveEntityDescription(doc, auditConfig) {
     if (!auditConfig.descriptionResolutorForExternalData) return '';
     const field = auditConfig.descriptionResolutorForExternalData;
-    const value = doc[field];
+    const value = getNestedProperty(doc, field);
     // Try to resolve via ValueReferenceMap
     console.log("field-", field);
     const map = await ValueReferenceMap.findOne({ field });
@@ -144,7 +192,7 @@ function applyAuditMiddleware(schema, collectionName) {
         if (auditConfig.fields?.length) {
             for (const field of auditConfig.fields) {
                 let lookupName;
-                const newValue = doc[field];
+                const newValue = getNestedProperty(doc, field);
                 if (field.endsWith('Lid')) {
                     const newlookupDoc = await mongoose.models['Lookup'].findById(newValue).lean();
                     if (newlookupDoc) {
@@ -217,11 +265,12 @@ function applyAuditMiddleware(schema, collectionName) {
         for (const field of auditConfig.fields) {
             console.log("field", field);
             const hasChanged =
-                update?.$set?.hasOwnProperty(field) || update?.hasOwnProperty(field);
+                (update?.$set && hasNestedProperty(update.$set, field)) ||
+                (update && hasNestedProperty(update, field));
             console.log("hasChanged", hasChanged);
             if (hasChanged) {
-                const newValue = update?.$set?.[field] ?? update?.[field];
-                const oldValue = this._originalDoc ? this._originalDoc[field] : '';
+                const newValue = getNestedProperty(update?.$set, field) ?? getNestedProperty(update, field);
+                const oldValue = this._originalDoc ? getNestedProperty(this._originalDoc, field) : '';
                 let lookupOldName;
                 let lookupNewName;
                 if (field.endsWith('Lid')) {

package/package.json

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