bulltrackers-module 1.0.512 → 1.0.514

package/functions/computation-system/helpers/computation_worker.js

@@ -232,10 +232,10 @@ async function handleComputationTask(message, config, dependencies) {
         await db.doc(ledgerPath).update({ status: 'COMPLETED', completedAt: new Date() });
         await recordRunAttempt(db, { date, computation, pass }, 'SUCCESS', null, metrics, triggerReason, resourceTier);
         
+        const { notifyComputationComplete, getComputationDisplayName } = require('../../generic-api/user-api/helpers/notifications/notification_helpers');
         // Send notification if this was an on-demand computation
         if (metadata?.onDemand && metadata?.requestId && metadata?.requestingUserCid) {
             try {
-                const { notifyComputationComplete, getComputationDisplayName } = require('../../generic-api/user-api/helpers/notification_helpers');
                 await notifyComputationComplete(
                     dependencies.db,
                     dependencies.logger,
@@ -283,7 +283,6 @@ async function handleComputationTask(message, config, dependencies) {
             // Send error notification if this was an on-demand computation
             if (metadata?.onDemand && metadata?.requestId && metadata?.requestingUserCid) {
                 try {
-                    const { notifyComputationComplete, getComputationDisplayName } = require('../../generic-api/user-api/helpers/notification_helpers');
                     await notifyComputationComplete(
                         db,
                         dependencies.logger,

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

@@ -74,25 +74,95 @@ async function requestUserSync(req, res, dependencies, config) {
         // 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');
-        const isPI = await checkIfUserIsPI(db, targetCidNum, config, logger);
+        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
         let username = null;
         if (isPI) {
-            // Get PI username from rankings
-            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;
+            // 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;
+                        }
                     }
                 }
             }
@@ -172,7 +242,8 @@ async function requestUserSync(req, res, dependencies, config) {
                 targetCid: targetCidNum, // Target specific user for optimization
                 requestedAt: now.toISOString(),
                 isImpersonating: isImpersonating || false,
-                requestingUserCid: Number(requestingUserCid) // Store for notifications
+                requestingUserCid: Number(requestingUserCid), // Store for notifications
+                userType: isPI ? 'POPULAR_INVESTOR' : 'SIGNED_IN_USER' // Explicitly set userType in metadata
             }
         };
         

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

@@ -40,9 +40,9 @@ async function storeSignedInUserPortfolio({ db, logger, collectionRegistry, cid,
     if (!getCollectionPath) {
         throw new Error('collectionRegistry.getCollectionPath is required');
     }
-    const userLatestRef = db.collection(
-        getCollectionPath('signedInUsers', 'portfolio', { cid })
-    ).doc('latest');
+    // Path is already a document path: SignedInUsers/{cid}/portfolio/latest (4 segments)
+    const userLatestPath = getCollectionPath('signedInUsers', 'portfolio', { cid });
+    const userLatestRef = db.doc(userLatestPath);
     
     await userLatestRef.set({
         ...portfolioData,
@@ -84,9 +84,9 @@ async function storeSignedInUserTradeHistory({ db, logger, collectionRegistry, c
     if (!getCollectionPath) {
         throw new Error('collectionRegistry.getCollectionPath is required');
     }
-    const userLatestRef = db.collection(
-        getCollectionPath('signedInUsers', 'tradeHistory', { cid })
-    ).doc('latest');
+    // Path is already a document path: SignedInUsers/{cid}/tradeHistory/latest (4 segments)
+    const userLatestPath = getCollectionPath('signedInUsers', 'tradeHistory', { cid });
+    const userLatestRef = db.doc(userLatestPath);
     
     await userLatestRef.set({
         ...historyData,

package/package.json

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