bulltrackers-module 1.0.562 → 1.0.563

package/functions/generic-api/user-api/helpers/core/data_lookup_helpers.js

@@ -6,6 +6,7 @@
 /**
  * Find the latest available date for signed-in user portfolio data
  * Searches backwards from today up to maxDaysBack days
+ * Checks both new root data path and legacy path for compatibility
  * @param {Firestore} db - Firestore instance
  * @param {string} signedInUsersCollection - Collection name (legacy)
  * @param {string|number} userCid - User CID
@@ -13,9 +14,51 @@
  * @returns {Promise<string|null>} - Date string (YYYY-MM-DD) or null if not found
  */
 async function findLatestPortfolioDate(db, signedInUsersCollection, userCid, maxDaysBack = 30) {
-    const CANARY_BLOCK_ID = '19M';
     const today = new Date();
+    const userCidStr = String(userCid);
+    
+    // First, check the user-centric latest snapshot (fastest check)
+    try {
+        const latestRef = db.collection('SignedInUsers')
+            .doc(userCidStr)
+            .collection('portfolio')
+            .doc('latest');
+        
+        const latestDoc = await latestRef.get();
+        if (latestDoc.exists) {
+            const data = latestDoc.data();
+            if (data && data.date) {
+                return data.date; // Found in latest snapshot
+            }
+        }
+    } catch (error) {
+        // Continue to other checks if this fails
+    }
+    
+    // Second, check the new root data path: SignedInUserPortfolioData/{date}/{cid}/{cid}
+    for (let i = 0; i < maxDaysBack; i++) {
+        const checkDate = new Date(today);
+        checkDate.setDate(checkDate.getDate() - i);
+        const dateStr = checkDate.toISOString().split('T')[0];
+        
+        try {
+            const rootDataRef = db.collection('SignedInUserPortfolioData')
+                .doc(dateStr)
+                .collection(userCidStr)
+                .doc(userCidStr);
+            
+            const rootDataDoc = await rootDataRef.get();
+            if (rootDataDoc.exists) {
+                return dateStr; // Found data in root data collection
+            }
+        } catch (error) {
+            // Continue to next date if error
+            continue;
+        }
+    }
     
+    // Third, check legacy path for backward compatibility: {signedInUsersCollection}/19M/snapshots/{date}/parts
+    const CANARY_BLOCK_ID = '19M';
     for (let i = 0; i < maxDaysBack; i++) {
         const checkDate = new Date(today);
         checkDate.setDate(checkDate.getDate() - i);
@@ -33,8 +76,8 @@ async function findLatestPortfolioDate(db, signedInUsersCollection, userCid, max
             // Check if user's CID exists in any part document
             for (const partDoc of partsSnapshot.docs) {
                 const partData = partDoc.data();
-                if (partData && partData[String(userCid)]) {
-                    return dateStr; // Found data for this date
+                if (partData && partData[userCidStr]) {
+                    return dateStr; // Found data for this date in legacy path
                 }
             }
         } catch (error) {

package/functions/generic-api/user-api/helpers/data/portfolio_helpers.js

@@ -147,64 +147,115 @@ async function getUserDataStatus(req, res, dependencies, config) {
         }
         
         // Check history data with fallback
+        // Check new root data path first: SignedInUsers/{cid}/tradeHistory/latest
         let historyExists = false;
         let historyDate = null;
         let isHistoryFallback = false;
         
-        const historyCollection = signedInHistoryCollection || 'signed_in_user_history';
-        
-        // Check today first
-        const todayHistoryRef = db.collection(historyCollection)
-            .doc(CANARY_BLOCK_ID)
-            .collection('snapshots')
-            .doc(today)
-            .collection('parts');
-        
-        const todayHistorySnapshot = await todayHistoryRef.get();
-        
-        if (!todayHistorySnapshot.empty) {
-            for (const partDoc of todayHistorySnapshot.docs) {
-                const partData = partDoc.data();
-                if (partData && partData[String(userCid)]) {
+        try {
+            const latestHistoryRef = db.collection('SignedInUsers')
+                .doc(String(userCid))
+                .collection('tradeHistory')
+                .doc('latest');
+            
+            const latestHistoryDoc = await latestHistoryRef.get();
+            if (latestHistoryDoc.exists) {
+                const data = latestHistoryDoc.data();
+                if (data && data.date) {
                     historyExists = true;
-                    historyDate = today;
-                    break;
+                    historyDate = data.date;
+                    isHistoryFallback = data.date !== today;
+                    logger.log('INFO', `[getUserDataStatus] Found history data in latest snapshot: ${historyDate}`);
                 }
             }
+        } catch (error) {
+            // Continue to other checks if this fails
         }
         
-        // If not found today, search backwards
+        // If not found in latest snapshot, check new root data path: SignedInUserTradeHistoryData/{date}/{cid}/{cid}
         if (!historyExists) {
-            for (let i = 1; i <= 30; i++) {
+            for (let i = 0; i <= 30; i++) {
                 const checkDate = new Date();
                 checkDate.setDate(checkDate.getDate() - i);
                 const dateStr = checkDate.toISOString().split('T')[0];
                 
                 try {
-                    const historyPartsRef = db.collection(historyCollection)
-                        .doc(CANARY_BLOCK_ID)
-                        .collection('snapshots')
+                    const rootHistoryRef = db.collection('SignedInUserTradeHistoryData')
                         .doc(dateStr)
-                        .collection('parts');
+                        .collection(String(userCid))
+                        .doc(String(userCid));
                     
-                    const historyPartsSnapshot = await historyPartsRef.get();
+                    const rootHistoryDoc = await rootHistoryRef.get();
+                    if (rootHistoryDoc.exists) {
+                        historyExists = true;
+                        historyDate = dateStr;
+                        isHistoryFallback = dateStr !== today;
+                        logger.log('INFO', `[getUserDataStatus] Found history data in root data collection: ${historyDate}`);
+                        break;
+                    }
+                } catch (error) {
+                    continue;
+                }
+            }
+        }
+        
+        // If still not found, check legacy path for backward compatibility
+        if (!historyExists) {
+            const historyCollection = signedInHistoryCollection || 'signed_in_user_history';
+            
+            // Check today first
+            const todayHistoryRef = db.collection(historyCollection)
+                .doc(CANARY_BLOCK_ID)
+                .collection('snapshots')
+                .doc(today)
+                .collection('parts');
+            
+            const todayHistorySnapshot = await todayHistoryRef.get();
+            
+            if (!todayHistorySnapshot.empty) {
+                for (const partDoc of todayHistorySnapshot.docs) {
+                    const partData = partDoc.data();
+                    if (partData && partData[String(userCid)]) {
+                        historyExists = true;
+                        historyDate = today;
+                        break;
+                    }
+                }
+            }
+            
+            // If not found today, search backwards
+            if (!historyExists) {
+                for (let i = 1; i <= 30; i++) {
+                    const checkDate = new Date();
+                    checkDate.setDate(checkDate.getDate() - i);
+                    const dateStr = checkDate.toISOString().split('T')[0];
                     
-                    if (!historyPartsSnapshot.empty) {
-                        for (const partDoc of historyPartsSnapshot.docs) {
-                            const partData = partDoc.data();
-                            if (partData && partData[String(userCid)]) {
-                                historyExists = true;
-                                historyDate = dateStr;
-                                isHistoryFallback = true;
-                                logger.log('INFO', `[getUserDataStatus] Found history data in fallback date ${dateStr}`);
-                                break;
+                    try {
+                        const historyPartsRef = db.collection(historyCollection)
+                            .doc(CANARY_BLOCK_ID)
+                            .collection('snapshots')
+                            .doc(dateStr)
+                            .collection('parts');
+                        
+                        const historyPartsSnapshot = await historyPartsRef.get();
+                        
+                        if (!historyPartsSnapshot.empty) {
+                            for (const partDoc of historyPartsSnapshot.docs) {
+                                const partData = partDoc.data();
+                                if (partData && partData[String(userCid)]) {
+                                    historyExists = true;
+                                    historyDate = dateStr;
+                                    isHistoryFallback = true;
+                                    logger.log('INFO', `[getUserDataStatus] Found history data in legacy fallback date ${dateStr}`);
+                                    break;
+                                }
                             }
                         }
+                        
+                        if (historyExists) break;
+                    } catch (error) {
+                        continue;
                     }
-                    
-                    if (historyExists) break;
-                } catch (error) {
-                    continue;
                 }
             }
         }

package/package.json

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