bulltrackers-module 1.0.520 → 1.0.521

package/functions/generic-api/user-api/helpers/data/computation_helpers.js

@@ -10,7 +10,7 @@ const { getEffectiveCid, getDevOverride } = require('../dev/dev_helpers');
 /**
  * Check if a PI exists in a computation date
  * Returns { found: boolean, profileData: object | null, computationData: object | null }
- * @param {Firestore} db - Firestore instance
+ * @param {object} db - Firestore instance
  * @param {string} insightsCollection - Insights collection name
  * @param {string} resultsSub - Results subcollection name
  * @param {string} compsSub - Computations subcollection name
@@ -97,6 +97,26 @@ async function checkPiInComputationDate(db, insightsCollection, resultsSub, comp
     }
 }
 
+/**
+ * Helper: Get computation metadata from schema collection
+ * @param {object} db - Firestore instance
+ * @param {string} computationName - Computation name
+ * @param {object} config - Config object
+ * @returns {Promise<object|null>} Metadata object or null if not found
+ */
+async function getComputationMetadata(db, computationName, config) {
+    try {
+        const schemaCollection = config.schemaCollection || 'computation_schemas';
+        const schemaDoc = await db.collection(schemaCollection).doc(computationName).get();
+        if (schemaDoc.exists) {
+            return schemaDoc.data().metadata || null;
+        }
+    } catch (err) {
+        // Non-critical, return null
+    }
+    return null;
+}
+
 /**
  * GET /user/me/computations
  * Fetches computation results for a specific signed-in user
@@ -128,6 +148,15 @@ async function getUserComputations(req, res, dependencies, config) {
             return res.status(400).json({ error: "Please specify at least one computation name" });
         }
         
+        // [NEW] Pre-fetch metadata for all computations to determine which are meta vs standard
+        const computationMetadata = {};
+        for (const compName of computationNames) {
+            const metadata = await getComputationMetadata(db, compName, config);
+            if (metadata) {
+                computationMetadata[compName] = metadata;
+            }
+        }
+        
         const isDevOverrideActive = devOverride && devOverride.enabled && devOverride.fakeCopiedPIs.length > 0;
         
         let datesToCheck = [today];
@@ -219,7 +248,22 @@ async function getUserComputations(req, res, dependencies, config) {
                             }
                         }
                         
-                        let userResult = data && typeof data === 'object' ? data[String(effectiveCid)] : null;
+                        // [FIX] Handle meta computations (global results) vs standard computations (user-specific)
+                        // Use metadata from schema collection to determine computation type
+                        let userResult = null;
+                        if (data && typeof data === 'object') {
+                            const metadata = computationMetadata[compName];
+                            const isMetaComputation = metadata && metadata.type === 'meta';
+                            
+                            if (isMetaComputation) {
+                                // Meta computation: return entire data object (global results)
+                                userResult = data;
+                            } else {
+                                // Standard computation: extract user-specific result
+                                const userCidKey = String(effectiveCid);
+                                userResult = data.hasOwnProperty(userCidKey) ? data[userCidKey] : null;
+                            }
+                        }
                         
                         if (isDevOverrideActive && (compName === 'SignedInUserProfileMetrics' || compName === 'SignedInUserCopiedPIs')) {
                             if (compName === 'SignedInUserCopiedPIs') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.520",
+  "version": "1.0.521",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [