bulltrackers-module 1.0.456 → 1.0.459

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

@@ -233,6 +233,86 @@ async function getUserSyncStatus(req, res, dependencies, config) {
         if (!requestsSnapshot.empty) {
             const latestRequest = requestsSnapshot.docs[0].data();
             let status = latestRequest.status || 'queued';
+            const userType = latestRequest.userType || 'SIGNED_IN_USER'; // Default to signed-in user
+            
+            // If status is 'indexing' or 'computing', check if computation results are now available
+            if (status === 'indexing' || status === 'computing') {
+                const insightsCollection = config.unifiedInsightsCollection || 'unified_insights';
+                const resultsSub = config.resultsSubcollection || 'results';
+                const compsSub = config.computationsSubcollection || 'computations';
+                
+                // Determine category and computation name based on user type
+                let category, computationName;
+                if (userType === 'POPULAR_INVESTOR') {
+                    category = 'popular-investor';
+                    computationName = 'PopularInvestorProfileMetrics';
+                } else {
+                    category = 'signed_in_user';
+                    computationName = 'SignedInUserProfileMetrics';
+                }
+                
+                // Check today and yesterday for computation results
+                const checkDate = new Date();
+                for (let i = 0; i < 2; i++) {
+                    const dateStr = new Date(checkDate);
+                    dateStr.setDate(checkDate.getDate() - i);
+                    const dateStrFormatted = dateStr.toISOString().split('T')[0];
+                    
+                    const docRef = db.collection(insightsCollection)
+                        .doc(dateStrFormatted)
+                        .collection(resultsSub)
+                        .doc(category)
+                        .collection(compsSub)
+                        .doc(computationName);
+                    
+                    const doc = await docRef.get();
+                    if (doc.exists) {
+                        const docData = doc.data();
+                        let mergedData = null;
+                        
+                        // Check if data is sharded
+                        if (docData._sharded === true && docData._shardCount) {
+                            // Data is stored in shards - read all shards and merge
+                            const shardsCol = docRef.collection('_shards');
+                            const shardsSnapshot = await shardsCol.get();
+                            
+                            if (!shardsSnapshot.empty) {
+                                mergedData = {};
+                                for (const shardDoc of shardsSnapshot.docs) {
+                                    const shardData = shardDoc.data();
+                                    Object.assign(mergedData, shardData);
+                                }
+                            }
+                        } else {
+                            // Data is in the main document (compressed or not)
+                            const { tryDecompress } = require('./data_helpers');
+                            mergedData = tryDecompress(docData);
+                            
+                            // Handle string decompression result
+                            if (typeof mergedData === 'string') {
+                                try {
+                                    mergedData = JSON.parse(mergedData);
+                                } catch (e) {
+                                    logger.log('WARN', `[getUserSyncStatus] Failed to parse decompressed string for date ${dateStrFormatted}:`, e.message);
+                                    mergedData = null;
+                                }
+                            }
+                        }
+                        
+                        if (mergedData && typeof mergedData === 'object' && mergedData[String(targetCidNum)]) {
+                            // Computation completed! Update status
+                            status = 'completed';
+                            await requestsSnapshot.docs[0].ref.update({
+                                status: 'completed',
+                                completedAt: FieldValue.serverTimestamp(),
+                                updatedAt: FieldValue.serverTimestamp()
+                            });
+                            logger.log('INFO', `[getUserSyncStatus] Computation completed for user ${targetCidNum} (${userType}). Found results in date ${dateStrFormatted}`);
+                            break;
+                        }
+                    }
+                }
+            }
             
             // Check if request is stale (stuck in processing state for too long)
             const STALE_THRESHOLD_MS = 5 * 60 * 1000; // 5 minutes
@@ -275,6 +355,17 @@ async function getUserSyncStatus(req, res, dependencies, config) {
                 }
             }
             
+            // Re-fetch request if we updated it to get the latest completedAt
+            let completedAt = latestRequest.completedAt?.toDate?.()?.toISOString() || null;
+            if (status === 'completed' && !completedAt) {
+                // If we just updated to completed, re-fetch to get the server timestamp
+                const updatedDoc = await requestsSnapshot.docs[0].ref.get();
+                if (updatedDoc.exists) {
+                    const updatedData = updatedDoc.data();
+                    completedAt = updatedData.completedAt?.toDate?.()?.toISOString() || null;
+                }
+            }
+            
             const response = {
                 success: true,
                 status,
@@ -282,7 +373,7 @@ async function getUserSyncStatus(req, res, dependencies, config) {
                 startedAt: latestRequest.startedAt?.toDate?.()?.toISOString() || null,
                 createdAt: latestRequest.createdAt?.toDate?.()?.toISOString() || null,
                 dispatchedAt: latestRequest.dispatchedAt?.toDate?.()?.toISOString() || null,
-                completedAt: latestRequest.completedAt?.toDate?.()?.toISOString() || null,
+                completedAt: completedAt,
                 estimatedCompletion: latestRequest.dispatchedAt 
                     ? new Date(new Date(latestRequest.dispatchedAt.toDate()).getTime() + 5 * 60 * 1000).toISOString() // 5 min estimate
                     : null

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

@@ -38,11 +38,16 @@ async function handlePopularInvestorUpdate(taskData, config, dependencies) {
     // If we have a requestId but no cid, try to extract from requestId or use username
     const effectiveCid = cid || (requestId ? null : null); // Will need to be handled
     
-    const { 
-        ETORO_API_PORTFOLIO_URL, 
-        ETORO_API_POSITIONS_URL, 
-        ETORO_API_HISTORY_URL
-    } = config;
+    // Validate and set API URLs with defaults and fallbacks
+    const ETORO_API_PORTFOLIO_URL = config.ETORO_API_PORTFOLIO_URL || process.env.ETORO_API_PORTFOLIO_URL || 'https://www.etoro.com/sapi/trade-data-real/live/public/portfolios';
+    const ETORO_API_POSITIONS_URL = config.ETORO_API_POSITIONS_URL || process.env.ETORO_API_POSITIONS_URL || 'https://www.etoro.com/sapi/trade-data-real/live/public/positions';
+    const ETORO_API_HISTORY_URL = config.ETORO_API_HISTORY_URL || process.env.ETORO_API_HISTORY_URL || 'https://www.etoro.com/sapi/trade-data-real/history/public/credit/flat';
+    
+    if (!ETORO_API_PORTFOLIO_URL || ETORO_API_PORTFOLIO_URL === 'undefined') {
+        const errorMsg = 'ETORO_API_PORTFOLIO_URL is not configured. Check taskEngine config.';
+        logger.log('ERROR', `[PI Update] ${errorMsg}`);
+        throw new Error(errorMsg);
+    }
 
     logger.log('INFO', `[PI Update] Starting update for User: ${username || 'unknown'} (${cid || 'unknown'})${requestId ? ` [Request: ${requestId}]` : ''}`);
     

package/package.json

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