bulltrackers-module 1.0.540 → 1.0.542

package/functions/computation-system/executors/StandardExecutor.js

@@ -274,7 +274,8 @@ class StandardExecutor {
         const targetUserType = metadata.userType; 
         // [NEW] Always load Global Helpers
         const mappings = await loader.loadMappings();
-        const piMasterList = await loader.loadPopularInvestorMasterList(config, deps); // [NEW] Loaded globally
+        // [FIX] Correct method name: loadPIMasterList (not loadPopularInvestorMasterList)
+        const piMasterList = await loader.loadPIMasterList(); 
         const SCHEMAS = mathLayer.SCHEMAS;
 
         // 1. Load Root Data

package/functions/generic-api/user-api/helpers/search/pi_search_helpers.js

@@ -4,6 +4,7 @@
  */
 
 const { getPIMasterList } = require('../core/user_status_helpers');
+const { tryDecompress } = require('../core/compression_helpers');
 
 /**
  * GET /user/search/pis
@@ -29,16 +30,111 @@ async function searchPopularInvestors(req, res, dependencies, config) {
         // Search by username (case-insensitive, partial match)
         const searchQuery = query.toLowerCase().trim();
         const matches = [];
+        const rankingsCollection = config.popularInvestorRankingsCollection || process.env.FIRESTORE_COLLECTION_PI_RANKINGS || 'popular_investor_rankings';
+        
+        // Cache rankings data by date to avoid fetching the same date multiple times
+        const rankingsCache = new Map();
+        
+        /**
+         * Helper to get rankings data for a specific date
+         */
+        const getRankingsForDate = async (dateStr) => {
+            if (rankingsCache.has(dateStr)) {
+                return rankingsCache.get(dateStr);
+            }
+            
+            try {
+                const rankingsRef = db.collection(rankingsCollection).doc(dateStr);
+                const rankingsDoc = await rankingsRef.get();
+                
+                if (!rankingsDoc.exists) {
+                    rankingsCache.set(dateStr, null);
+                    return null;
+                }
+                
+                const rawRankingsData = rankingsDoc.data();
+                const rankingsData = tryDecompress(rawRankingsData);
+                const rankingsItems = rankingsData.Items || [];
+                
+                // Create a map for quick lookup by CID
+                const rankingsMap = new Map();
+                for (const item of rankingsItems) {
+                    if (item.CustomerId) {
+                        rankingsMap.set(String(item.CustomerId), item);
+                    }
+                }
+                
+                rankingsCache.set(dateStr, rankingsMap);
+                return rankingsMap;
+            } catch (error) {
+                if (logger) {
+                    logger.log('WARN', `[searchPopularInvestors] Failed to fetch rankings for date ${dateStr}: ${error.message}`);
+                }
+                rankingsCache.set(dateStr, null);
+                return null;
+            }
+        };
+        
+        /**
+         * Convert timestamp to date string (YYYY-MM-DD)
+         */
+        const timestampToDateStr = (timestamp) => {
+            if (!timestamp) return null;
+            
+            // Handle Firestore Timestamp
+            if (timestamp.toDate && typeof timestamp.toDate === 'function') {
+                return timestamp.toDate().toISOString().split('T')[0];
+            }
+            
+            // Handle Date object
+            if (timestamp instanceof Date) {
+                return timestamp.toISOString().split('T')[0];
+            }
+            
+            // Handle number (milliseconds since epoch)
+            if (typeof timestamp === 'number') {
+                return new Date(timestamp).toISOString().split('T')[0];
+            }
+            
+            return null;
+        };
         
         for (const [cid, investor] of Object.entries(investors)) {
             if (investor.username) {
                 const username = investor.username.toLowerCase();
                 if (username.includes(searchQuery)) {
+                    // Get ranking metrics from rankings collection using lastSeenAt
+                    let aum = null;
+                    let riskScore = null;
+                    let gain = null;
+                    let copiers = null;
+                    
+                    if (investor.lastSeenAt) {
+                        const rankingsDate = timestampToDateStr(investor.lastSeenAt);
+                        
+                        if (rankingsDate) {
+                            const rankingsMap = await getRankingsForDate(rankingsDate);
+                            
+                            if (rankingsMap) {
+                                const rankingEntry = rankingsMap.get(cid);
+                                
+                                if (rankingEntry) {
+                                    aum = rankingEntry.AUMValue || null;
+                                    riskScore = rankingEntry.RiskScore || null;
+                                    gain = rankingEntry.Gain || null;
+                                    copiers = rankingEntry.Copiers || null;
+                                }
+                            }
+                        }
+                    }
+                    
                     matches.push({
                         cid: Number(cid),
-                        username: investor.username
-                        // Note: AUM, riskScore, gain, copiers are not in master list
-                        // If needed, they should be fetched from rankings collection separately
+                        username: investor.username,
+                        aum: aum,
+                        riskScore: riskScore,
+                        gain: gain,
+                        copiers: copiers
                     });
                     
                     if (matches.length >= parseInt(limit)) {

package/package.json

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