bulltrackers-module 1.0.518 → 1.0.519

package/functions/generic-api/user-api/helpers/profile/profile_view_helpers.js

@@ -41,6 +41,7 @@ async function trackProfileView(req, res, dependencies, config) {
         // Add unique viewers if viewer CID is provided
         if (effectiveViewerCid) {
             // Read existing to merge unique viewers
+            // Note: date is already in path params, so don't provide documentId
             const existingResult = await readWithMigration(
                 db,
                 'popularInvestors',
@@ -50,7 +51,7 @@ async function trackProfileView(req, res, dependencies, config) {
                     isCollection: false,
                     dataType: 'piProfileViews',
                     config,
-                    documentId: today,
+                    // documentId not needed - date is already in path params
                     collectionRegistry: dependencies.collectionRegistry
                 }
             );
@@ -66,6 +67,7 @@ async function trackProfileView(req, res, dependencies, config) {
         }
         
         // Write to new path (with dual write to legacy during migration)
+        // Note: date is already in path params, so don't provide documentId
         await writeWithMigration(
             db,
             'popularInvestors',
@@ -77,7 +79,7 @@ async function trackProfileView(req, res, dependencies, config) {
                 merge: true,
                 dataType: 'piProfileViews',
                 config,
-                documentId: today,
+                // documentId not needed - date is already in path params
                 dualWrite: true,
                 collectionRegistry: dependencies.collectionRegistry
             }
@@ -95,6 +97,7 @@ async function trackProfileView(req, res, dependencies, config) {
             };
             
             // Write individual view (new path)
+            // Note: viewId is already in path params, so don't provide documentId
             await writeWithMigration(
                 db,
                 'popularInvestors',
@@ -106,7 +109,7 @@ async function trackProfileView(req, res, dependencies, config) {
                     merge: true,
                     dataType: 'piIndividualViews',
                     config,
-                    documentId: viewId,
+                    // documentId not needed - viewId is already in path params
                     dualWrite: true,
                     collectionRegistry: dependencies.collectionRegistry
                 }

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

@@ -87,10 +87,11 @@ async function requestPiAddition(req, res, dependencies, config) {
 
 /**
  * GET /user/me/watchlists/:id/rankings-check
- * Check which PIs in a watchlist are in the latest available rankings
+ * Check which PIs in a watchlist are in the master list (single source of truth)
+ * UPDATED: Now checks against the master list instead of latest rankings date
  */
 async function checkPisInRankings(req, res, dependencies, config) {
-    const { db, logger } = dependencies;
+    const { db, logger, collectionRegistry } = dependencies;
     const { userCid } = req.query;
     const { id } = req.params;
     
@@ -137,17 +138,94 @@ async function checkPisInRankings(req, res, dependencies, config) {
             items = watchlistData.items || [];
         }
         
+        // Get the master list path from collection registry
+        let masterListPath = 'system_state/popular_investor_master_list';
+        
+        if (collectionRegistry && collectionRegistry.getCollectionPath) {
+            try {
+                masterListPath = collectionRegistry.getCollectionPath('system', 'popularInvestorMasterList', {});
+            } catch (err) {
+                logger.log('WARN', `[checkPisInRankings] Failed to get master list path from registry, using default: ${err.message}`);
+            }
+        }
+        
+        // Fetch master list document
+        const masterListRef = db.doc(masterListPath);
+        const masterListDoc = await masterListRef.get();
+        
+        if (!masterListDoc.exists) {
+            // Master list doesn't exist yet - fallback to legacy rankings check
+            logger.log('WARN', `[checkPisInRankings] Master list not found, falling back to legacy rankings check`);
+            const legacyResult = await checkPisInRankingsLegacy(db, items, config, logger);
+            return res.status(200).json(legacyResult);
+        }
+        
+        const masterListData = masterListDoc.data();
+        const investors = masterListData.investors || {};
+        
+        // Create sets for quick lookup: by CID and by username (case-insensitive)
+        const investorsByCid = new Set();
+        const investorsByUsername = new Set();
+        
+        for (const [cid, piData] of Object.entries(investors)) {
+            if (cid) {
+                investorsByCid.add(String(cid));
+            }
+            if (piData.username) {
+                investorsByUsername.add(piData.username.toLowerCase().trim());
+            }
+        }
+        
+        // Check which watchlist PIs are NOT in the master list
+        // Check by both CID and username to be thorough
+        const notInRankings = [];
+        for (const item of items) {
+            const cidStr = String(item.cid);
+            const username = item.username ? item.username.toLowerCase().trim() : null;
+            
+            // Check if PI exists in master list by CID or username
+            const existsByCid = investorsByCid.has(cidStr);
+            const existsByUsername = username && investorsByUsername.has(username);
+            
+            if (!existsByCid && !existsByUsername) {
+                notInRankings.push(item.cid);
+            }
+        }
+        
+        return res.status(200).json({
+            notInRankings,
+            rankingsDate: null, // No longer using rankings date
+            totalChecked: items.length,
+            inRankings: items.length - notInRankings.length,
+            usingMasterList: true
+        });
+        
+    } catch (error) {
+        logger.log('ERROR', `[checkPisInRankings] Error checking PIs in master list`, error);
+        return res.status(500).json({ error: error.message });
+    }
+}
+
+/**
+ * Legacy method: Check against latest rankings date
+ * Used as fallback when master list is not available
+ */
+async function checkPisInRankingsLegacy(db, items, config, logger) {
+    try {
         // Find latest available rankings date
         const rankingsCollection = config.popularInvestorRankingsCollection || process.env.FIRESTORE_COLLECTION_PI_RANKINGS || 'popular_investor_rankings';
         const rankingsDate = await findLatestRankingsDate(db, rankingsCollection, 30);
         
         if (!rankingsDate) {
             const notInRankings = items.map(item => item.cid);
-            return res.status(200).json({
+            return {
                 notInRankings,
                 rankingsDate: null,
+                totalChecked: items.length,
+                inRankings: 0,
+                usingMasterList: false,
                 message: "No rankings data available"
-            });
+            };
         }
         
         // Fetch rankings data
@@ -156,11 +234,14 @@ async function checkPisInRankings(req, res, dependencies, config) {
         
         if (!rankingsDoc.exists) {
             const notInRankings = items.map(item => item.cid);
-            return res.status(200).json({
+            return {
                 notInRankings,
                 rankingsDate: null,
+                totalChecked: items.length,
+                inRankings: 0,
+                usingMasterList: false,
                 message: "Rankings document not found"
-            });
+            };
         }
         
         const rankingsData = rankingsDoc.data();
@@ -183,16 +264,24 @@ async function checkPisInRankings(req, res, dependencies, config) {
             }
         }
         
-        return res.status(200).json({
+        return {
             notInRankings,
             rankingsDate: rankingsDate,
             totalChecked: items.length,
-            inRankings: items.length - notInRankings.length
-        });
-        
+            inRankings: items.length - notInRankings.length,
+            usingMasterList: false
+        };
     } catch (error) {
-        logger.log('ERROR', `[checkPisInRankings] Error checking PIs in rankings`, error);
-        return res.status(500).json({ error: error.message });
+        logger.log('ERROR', `[checkPisInRankingsLegacy] Error in legacy rankings check`, error);
+        // Return all as not in rankings on error
+        return {
+            notInRankings: items.map(item => item.cid),
+            rankingsDate: null,
+            totalChecked: items.length,
+            inRankings: 0,
+            usingMasterList: false,
+            message: error.message
+        };
     }
 }
 

package/package.json

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