@dynamatix/cat-shared 0.0.132 → 0.0.133

package/middlewares/audit.middleware.js

@@ -7,52 +7,73 @@ import FormConfigurationModel from '../models/form-configuration.model.js';
 
 let onAuditLogCreated = null;
 
-// Utility function to safely access nested properties
+// Simple utility to get nested property - much cleaner approach
 function getNestedProperty(obj, path) {
-    if (!path || !obj) return undefined;
+    if (!obj || !path) return undefined;
 
-    // Handle simple property access
-    if (!path.includes('.')) {
+    // Handle flattened MongoDB keys first
+    if (obj[path] !== undefined) {
         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
+    // Handle nested path
     return path.split('.').reduce((current, key) => {
-        return current && current[key] !== undefined ? current[key] : undefined;
+        if (current == null) return undefined;
+
+        // Try Mongoose get method first
+        if (current.get && typeof current.get === 'function') {
+            try {
+                return current.get(key);
+            } catch (e) {
+                // Fall through to direct access
+            }
+        }
+
+        // Direct access or _doc access for Mongoose
+        return current[key] ?? current._doc?.[key];
     }, obj);
 }
 
-// Utility function to check if nested property exists in object
+// Simple utility to check if nested property exists
 function hasNestedProperty(obj, path) {
-    if (!path || !obj) return false;
+    if (!obj || !path) return false;
 
-    // Handle simple property access
-    if (!path.includes('.')) {
-        return obj.hasOwnProperty(path);
-    }
-
-    // First check if the flattened key exists (MongoDB style: "additionalData.statusLid")
+    // Handle flattened MongoDB keys first
     if (obj.hasOwnProperty(path)) {
         return true;
     }
 
-    // Then check nested object structure
+    // Check nested path
     const keys = path.split('.');
     let current = obj;
 
-    for (let i = 0; i < keys.length - 1; i++) {
-        if (!current || !current.hasOwnProperty(keys[i])) {
+    for (const key of keys) {
+        if (current == null) return false;
+
+        // Try Mongoose get method first
+        if (current.get && typeof current.get === 'function') {
+            try {
+                const value = current.get(key);
+                if (value !== undefined) {
+                    current = value;
+                    continue;
+                }
+            } catch (e) {
+                // Fall through to direct access
+            }
+        }
+
+        // Check direct access or _doc access
+        if (current[key] !== undefined) {
+            current = current[key];
+        } else if (current._doc?.[key] !== undefined) {
+            current = current._doc[key];
+        } else {
             return false;
         }
-        current = current[keys[i]];
     }
 
-    return current && current.hasOwnProperty(keys[keys.length - 1]);
+    return true;
 }
 
 // Optionally, define custom resolvers here

package/package.json

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