bulltrackers-module 1.0.672 → 1.0.673

package/functions/api-v2/helpers/data-fetchers/firestore.js

@@ -2049,53 +2049,27 @@ const fetchUserRecommendations = async (db, userId) => {
 
 const fetchTrendingPopularInvestors = async (db) => {
     // Path: /unified_insights/{DATE}/results/popular-investor/computations/TrendingPopularInvestors
+    // Simple fetch - data exists in pointer document (small size, not compressed/sharded)
     const today = new Date().toISOString().split('T')[0];
-    
-    // Try today first, then look back up to 7 days
-    for (let i = 0; i < 7; i++) {
-        const checkDate = new Date(today);
-        checkDate.setDate(checkDate.getDate() - i);
-        const dateKey = checkDate.toISOString().split('T')[0];
-        
-        try {
-            const result = await getComputationResults(db, 'TrendingPopularInvestors', dateKey);
-            if (result && result.trending && Array.isArray(result.trending) && result.trending.length > 0) {
-                return result.trending;
-            }
-        } catch (e) {
-            // Continue to next date
-            if (i === 6) {
-                console.warn(`[Trending] Failed to fetch after 7 day lookback: ${e.message}`);
-            }
-        }
+    try {
+        const result = await getComputationResults(db, 'TrendingPopularInvestors', today);
+        return result.trending || [];
+    } catch (e) {
+        console.warn(`[Trending] Failed to fetch: ${e.message}`);
+        return [];
     }
-    
-    return [];
 };
 
 const fetchPopularInvestorCategories = async (db) => {
+    // Data exists compressed in pointer document at /unified_insights/{DATE}/results/popular-investor/computations/PopularInvestorCategories
     const today = new Date().toISOString().split('T')[0];
-    
-    // Try today first, then look back up to 7 days
-    for (let i = 0; i < 7; i++) {
-        const checkDate = new Date(today);
-        checkDate.setDate(checkDate.getDate() - i);
-        const dateKey = checkDate.toISOString().split('T')[0];
-        
-        try {
-            const result = await getComputationResults(db, 'PopularInvestorCategories', dateKey);
-            if (result && result.categories && typeof result.categories === 'object' && Object.keys(result.categories).length > 0) {
-                return result.categories;
-            }
-        } catch (e) {
-            // Continue to next date
-            if (i === 6) {
-                console.warn(`[Categories] Failed to fetch after 7 day lookback: ${e.message}`);
-            }
-        }
+    try {
+        const result = await getComputationResults(db, 'PopularInvestorCategories', today);
+        return result.categories || {};
+    } catch (e) {
+        console.warn(`[Categories] Failed to fetch: ${e.message}`);
+        return {};
     }
-    
-    return {};
 };
 
 

package/functions/api-v2/routes/profile.js

@@ -209,11 +209,77 @@ router.get('/computations', async (req, res) => {
         const results = {};
         for (const compName of computationNames) {
             try {
-                const data = await getComputationResults(db, compName, targetDate, userId);
+                let data = await getComputationResults(db, compName, targetDate, userId);
+                
+                // For RecommendedPopularInvestors: Ensure data contains the signed-in user's CID
+                // If not found, look back up to 7 days to find this specific user's data
+                if (compName === 'RecommendedPopularInvestors' && mode === 'latest') {
+                    const userCidStr = String(userId);
+                    let foundUserData = false;
+                    
+                    // Check if current result contains this user's data
+                    if (data && typeof data === 'object') {
+                        // For standard mode: data is { [userId]: recommendations[] }
+                        if (data[userCidStr] && Array.isArray(data[userCidStr])) {
+                            foundUserData = true;
+                        }
+                        // For page mode: data is array of { date, data: {...} }
+                        else if (Array.isArray(data) && data.length > 0) {
+                            // Check if any entry has this user's data
+                            for (const entry of data) {
+                                if (entry.data && entry.data[userCidStr]) {
+                                    foundUserData = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    
+                    // If user's data not found, look back up to 7 days
+                    if (!foundUserData) {
+                        for (let i = 1; i <= 7; i++) {
+                            const checkDate = new Date(targetDate);
+                            checkDate.setDate(checkDate.getDate() - i);
+                            const dateKey = checkDate.toISOString().split('T')[0];
+                            
+                            try {
+                                const backData = await getComputationResults(db, compName, dateKey, userId);
+                                if (backData && typeof backData === 'object') {
+                                    // Check if this date has the user's data
+                                    if (backData[userCidStr] && Array.isArray(backData[userCidStr])) {
+                                        data = backData;
+                                        foundUserData = true;
+                                        break;
+                                    }
+                                    // For page mode
+                                    else if (Array.isArray(backData) && backData.length > 0) {
+                                        for (const entry of backData) {
+                                            if (entry.data && entry.data[userCidStr]) {
+                                                data = backData;
+                                                foundUserData = true;
+                                                break;
+                                            }
+                                        }
+                                        if (foundUserData) break;
+                                    }
+                                }
+                            } catch (e) {
+                                // Continue to next date
+                            }
+                        }
+                    }
+                    
+                    // Only return data if it contains this user's recommendations
+                    if (!foundUserData) {
+                        results[compName] = null;
+                        continue;
+                    }
+                }
+                
                 results[compName] = data;
             } catch (error) {
-                // If latest mode and today fails, try yesterday
-                if (mode === 'latest') {
+                // If latest mode and today fails, try yesterday (for non-RecommendedPopularInvestors)
+                if (mode === 'latest' && compName !== 'RecommendedPopularInvestors') {
                     try {
                         const yesterday = new Date();
                         yesterday.setDate(yesterday.getDate() - 1);

package/package.json

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