bulltrackers-module 1.0.515 → 1.0.516

package/functions/generic-api/user-api/helpers/sync/user_sync_helpers.js

@@ -30,6 +30,15 @@ async function requestUserSync(req, res, dependencies, config) {
         });
     }
     
+    // Check the referrer or source header to determine if this is from PI page or profile page
+    const referrer = req.headers.referer || req.headers.referrer || '';
+    const sourcePage = req.query?.sourcePage || req.body?.sourcePage || '';
+    
+    // Determine user type based on where the request came from
+    // If from /popular-investors/{cid}, it's a PI
+    // If from /profile, it's a signed-in user
+    const isPI = referrer.includes('/popular-investors/') || sourcePage === 'popular-investor';
+    
     // Check for dev override impersonation
     const { getEffectiveCid, getDevOverride } = require('../dev/dev_helpers');
     const effectiveCid = await getEffectiveCid(db, requestingUserCid, config, logger);
@@ -71,103 +80,17 @@ async function requestUserSync(req, res, dependencies, config) {
             logger.log('INFO', `[requestUserSync] Developer account ${requestingUserCid} bypassing rate limits${isImpersonating ? ` (impersonating ${effectiveCid})` : ''}`);
         }
         
-        // Determine user type (PI or signed-in user)
-        // Check if user is in rankings (PI) or has signed-in user data
-        const { checkIfUserIsPI } = require('../data_helpers');
-        let isPI = await checkIfUserIsPI(db, targetCidNum, config, logger);
-        
-        // Fallback: If not found in rankings, check if they have PI data (portfolio, history, or social)
-        // This handles cases where a PI might not be in the latest rankings but has historical data
-        if (!isPI) {
-            try {
-                const today = new Date().toISOString().split('T')[0];
-                let hasPiData = false;
-                
-                // Check if they have PI portfolio data (any date in last 7 days)
-                for (let i = 0; i <= 7; i++) {
-                    const checkDate = new Date();
-                    checkDate.setDate(checkDate.getDate() - i);
-                    const dateStr = checkDate.toISOString().split('T')[0];
-                    
-                    // Check portfolio data
-                    const portfolioRef = db.collection('PopularInvestorPortfolioData')
-                        .doc(dateStr)
-                        .collection(String(targetCidNum))
-                        .doc(String(targetCidNum));
-                    const portfolioDoc = await portfolioRef.get();
-                    
-                    if (portfolioDoc.exists) {
-                        logger.log('INFO', `[requestUserSync] User ${targetCidNum} has PI portfolio data from ${dateStr}, treating as PI`);
-                        hasPiData = true;
-                        break;
-                    }
-                    
-                    // Check trade history data
-                    const historyRef = db.collection('PopularInvestorTradeHistoryData')
-                        .doc(dateStr)
-                        .collection(String(targetCidNum))
-                        .doc(String(targetCidNum));
-                    const historyDoc = await historyRef.get();
-                    
-                    if (historyDoc.exists) {
-                        logger.log('INFO', `[requestUserSync] User ${targetCidNum} has PI trade history data from ${dateStr}, treating as PI`);
-                        hasPiData = true;
-                        break;
-                    }
-                    
-                    // Check social posts data
-                    const socialRef = db.collection('PopularInvestorSocialPostData')
-                        .doc(dateStr)
-                        .collection(String(targetCidNum))
-                        .doc(String(targetCidNum));
-                    const socialDoc = await socialRef.get();
-                    
-                    if (socialDoc.exists) {
-                        logger.log('INFO', `[requestUserSync] User ${targetCidNum} has PI social posts data from ${dateStr}, treating as PI`);
-                        hasPiData = true;
-                        break;
-                    }
-                }
-                
-                if (hasPiData) {
-                    isPI = { CustomerId: targetCidNum, UserName: null }; // Fake ranking entry
-                } else {
-                    logger.log('INFO', `[requestUserSync] User ${targetCidNum} not found in rankings and no PI data found, treating as signed-in user`);
-                }
-            } catch (fallbackErr) {
-                logger.log('WARN', `[requestUserSync] Error checking PI data fallback for ${targetCidNum}:`, fallbackErr.message);
-            }
-        } else {
-            logger.log('INFO', `[requestUserSync] User ${targetCidNum} found in rankings as PI`);
-        }
-        
-        // Get username - for PIs, get from rankings; for signed-in users, we'll need to fetch from their profile
+        // Get username based on user type
         let username = null;
         if (isPI) {
-            // Get PI username from rankings (if available)
-            if (isPI.UserName || isPI.username) {
-                username = isPI.UserName || isPI.username;
-            } else {
-                // Try to get from rankings if we have a fake entry
-                const { findLatestRankingsDate } = require('../data_helpers');
-                const rankingsCollection = config.popularInvestorRankingsCollection || 'popular_investor_rankings';
-                const rankingsDate = await findLatestRankingsDate(db, rankingsCollection, 30);
-                
-                if (rankingsDate) {
-                    const rankingsRef = db.collection(rankingsCollection).doc(rankingsDate);
-                    const rankingsDoc = await rankingsRef.get();
-                    if (rankingsDoc.exists) {
-                        const rankingsData = rankingsDoc.data();
-                        const rankingsItems = rankingsData.Items || [];
-                        const rankingEntry = rankingsItems.find(item => Number(item.CustomerId) === targetCidNum);
-                        if (rankingEntry) {
-                            username = rankingEntry.UserName || rankingEntry.username || null;
-                        }
-                    }
-                }
+            // For PIs, get username from rankings
+            const { checkIfUserIsPI } = require('../core/user_status_helpers');
+            const rankEntry = await checkIfUserIsPI(db, targetCidNum, config, logger);
+            if (rankEntry && (rankEntry.UserName || rankEntry.username)) {
+                username = rankEntry.UserName || rankEntry.username;
             }
         } else {
-            // For signed-in users, try to get username from verification data
+            // For signed-in users, try verification data
             const signedInUsersCollection = config.signedInUsersCollection || 'signed_in_users';
             const userDoc = await db.collection(signedInUsersCollection).doc(String(targetCidNum)).get();
             if (userDoc.exists) {
@@ -177,8 +100,7 @@ async function requestUserSync(req, res, dependencies, config) {
         }
         
         if (!username) {
-            logger.log('WARN', `[requestUserSync] Could not find username for user ${targetCidNum}, will use CID as fallback`);
-            username = String(targetCidNum);
+            username = String(targetCidNum); // Fallback to CID
         }
         
         // Create request document

package/functions/task-engine/helpers/popular_investor_helpers.js

@@ -832,9 +832,9 @@ async function handleOnDemandUserUpdate(taskData, config, dependencies) {
         logger.log('INFO', `[On-Demand Update] Skipping history fetch (portfolioOnly=false) for ${username}`);
     }
 
-        // Fetch social data if requested (for user signup or explicit request)
+        // Fetch social data - always for on-demand syncs
         let socialFetched = false;
-        if (includeSocial && username) {
+        if (username) {
             try {
                 logger.log('INFO', `[On-Demand Update] Fetching social data for ${username} (${cid})...`);
                 

package/package.json

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