Fix dateBounds update: remove early pagination stop and add periodic dateBounds refresh

src/lib/dataService.js

@@ -191,52 +191,73 @@ class DataService {
         console.log(`[DataService] Page ${pageCount}: ${pageData.length} rows, date range: ${pageDates[0]} to ${lastFetchedDate}`)
       }
       
-      // If we got less than pageSize, we're done
+      // If we got less than pageSize, we're done (no more data)
       if (pageData.length < pageSize) {
         console.log(`[DataService] Last page reached (got ${pageData.length} rows, expected ${pageSize})`)
         break
       }
 
-      // If we've reached or passed the max date, we're done
-      if (dbMaxDate && lastFetchedDate) {
-        const lastFetchedDateStr = typeof lastFetchedDate === 'string' ? lastFetchedDate.split('T')[0] : lastFetchedDate
-        const dbMaxDateStr = typeof dbMaxDate === 'string' ? dbMaxDate.split('T')[0] : dbMaxDate
-        if (lastFetchedDateStr >= dbMaxDateStr) {
-          console.log(`[DataService] Reached target max date ${dbMaxDateStr}, stopping`)
-          break
-        }
-      }
-
+      // Continue to next page - don't stop early based on date comparison
+      // because pagination with order('date', ascending: true) might have
+      // multiple pages with the same date, and we need to fetch all pages
       from += pageSize
     }
 
     // Log the final date range
     if (all.length > 0) {
       const dates = all.map(r => r && r.date).filter(Boolean).sort()
-      console.log(`[DataService] Total fetched: ${all.length} rows across ${pageCount} pages, date range: ${dates[0]} to ${dates[dates.length - 1]}`)
+      const fetchedMinDate = dates[0]
+      const fetchedMaxDate = dates[dates.length - 1]
+      console.log(`[DataService] Total fetched: ${all.length} rows across ${pageCount} pages, date range: ${fetchedMinDate} to ${fetchedMaxDate}`)
       console.log(`[DataService] Last 10 dates:`, dates.slice(-10))
       
-      // Verify we got the max date
-      const fetchedMaxDate = dates[dates.length - 1]
+      // Verify we got the max date - if not, fetch missing data by date range
       if (dbMaxDate) {
         const fetchedMaxDateStr = typeof fetchedMaxDate === 'string' ? fetchedMaxDate.split('T')[0] : fetchedMaxDate
         const dbMaxDateStr = typeof dbMaxDate === 'string' ? dbMaxDate.split('T')[0] : dbMaxDate
         console.log(`[DataService] Verification: DB max date = ${dbMaxDateStr}, Fetched max date = ${fetchedMaxDateStr}`)
-        if (fetchedMaxDateStr !== dbMaxDateStr) {
-          console.error(`[DataService] ERROR: Still missing data! DB has ${dbMaxDateStr} but we only fetched up to ${fetchedMaxDateStr}`)
-          // Try one more page to see if we can get the missing data
-          console.log(`[DataService] Attempting to fetch one more page starting from ${from}...`)
-          const { data: extraData, error: extraError } = await supabase
+        
+        if (fetchedMaxDateStr !== dbMaxDateStr && fetchedMaxDateStr < dbMaxDateStr) {
+          console.warn(`[DataService] Missing data detected! DB has ${dbMaxDateStr} but we only fetched up to ${fetchedMaxDateStr}`)
+          console.log(`[DataService] Fetching missing data from ${fetchedMaxDateStr} to ${dbMaxDateStr}...`)
+          
+          // Fetch all data from the day after fetchedMaxDate to dbMaxDate
+          // Use gte (greater than or equal) to include the next day
+          const nextDay = new Date(fetchedMaxDateStr)
+          nextDay.setUTCDate(nextDay.getUTCDate() + 1)
+          const nextDayStr = nextDay.toISOString().split('T')[0]
+          
+          const { data: missingData, error: missingError } = await supabase
             .from('trading_decisions')
             .select('id, agent_name, asset, model, date, price, recommended_action, news_count, sentiment, created_at, updated_at')
+            .gte('date', nextDayStr)
+            .lte('date', dbMaxDateStr)
             .order('date', { ascending: true })
-            .range(from, from + pageSize - 1)
-          if (!extraError && extraData && extraData.length > 0) {
-            console.log(`[DataService] Extra page fetched: ${extraData.length} rows`)
-            all.push(...extraData)
-            const newDates = all.map(r => r && r.date).filter(Boolean).sort()
-            console.log(`[DataService] After extra page: date range: ${newDates[0]} to ${newDates[newDates.length - 1]}`)
+          
+          if (!missingError && missingData && missingData.length > 0) {
+            console.log(`[DataService] Fetched ${missingData.length} missing rows`)
+            // Merge missing data, avoiding duplicates by id
+            const existingIds = new Set(all.map(r => r.id))
+            const newRows = missingData.filter(r => !existingIds.has(r.id))
+            all.push(...newRows)
+            console.log(`[DataService] Added ${newRows.length} new rows (${missingData.length - newRows.length} duplicates skipped)`)
+            
+            // Re-sort all data by date
+            all.sort((a, b) => {
+              const dateA = typeof a.date === 'string' ? a.date.split('T')[0] : a.date
+              const dateB = typeof b.date === 'string' ? b.date.split('T')[0] : b.date
+              return dateA > dateB ? 1 : (dateA < dateB ? -1 : 0)
+            })
+            
+            const finalDates = all.map(r => r && r.date).filter(Boolean).sort()
+            console.log(`[DataService] After fetching missing data: ${all.length} total rows, date range: ${finalDates[0]} to ${finalDates[finalDates.length - 1]}`)
+          } else if (missingError) {
+            console.error(`[DataService] Failed to fetch missing data:`, missingError)
+          } else {
+            console.warn(`[DataService] No missing data found (this might indicate a data inconsistency)`)
           }
+        } else if (fetchedMaxDateStr === dbMaxDateStr) {
+          console.log(`[DataService] ✓ Successfully fetched all data up to ${dbMaxDateStr}`)
         }
       }
     } else {
@@ -593,6 +614,59 @@ class DataService {
     return this.load(true)
   }
 
+  /**
+   * 更新 dateBounds，直接查询数据库的最新日期
+   * 这个方法可以独立调用，不需要重新加载所有数据
+   */
+  async updateDateBounds() {
+    try {
+      // 查询数据库的最小和最大日期
+      const [minDateResult, maxDateResult] = await Promise.all([
+        supabase
+          .from('trading_decisions')
+          .select('date')
+          .order('date', { ascending: true })
+          .limit(1),
+        supabase
+          .from('trading_decisions')
+          .select('date')
+          .order('date', { ascending: false })
+          .limit(1)
+      ])
+
+      let dbMinDate = null
+      let dbMaxDate = null
+
+      if (!minDateResult.error && minDateResult.data && minDateResult.data.length > 0) {
+        dbMinDate = minDateResult.data[0].date
+      }
+      if (!maxDateResult.error && maxDateResult.data && maxDateResult.data.length > 0) {
+        dbMaxDate = maxDateResult.data[0].date
+      }
+
+      // 如果查询到了新的日期，更新 dateBounds
+      if (dbMinDate || dbMaxDate) {
+        const oldMax = this.dateBounds.max ? this.dateBounds.max.toISOString().split('T')[0] : null
+        const newMax = dbMaxDate ? (typeof dbMaxDate === 'string' ? dbMaxDate.split('T')[0] : dbMaxDate) : null
+        
+        // 只有当新日期确实更新时才更新
+        if (newMax && (!oldMax || newMax > oldMax)) {
+          this.dateBounds = {
+            min: dbMinDate ? new Date(dbMinDate) : this.dateBounds.min,
+            max: dbMaxDate ? new Date(dbMaxDate) : this.dateBounds.max
+          }
+          console.log(`[DataService] updateDateBounds: Updated dateBounds to min = ${this.dateBounds.min?.toISOString().split('T')[0]}, max = ${this.dateBounds.max?.toISOString().split('T')[0]}`)
+          // 通知所有订阅者
+          this._notify()
+        } else if (newMax && oldMax && newMax === oldMax) {
+          console.log(`[DataService] updateDateBounds: Date bounds already up to date (max = ${newMax})`)
+        }
+      }
+    } catch (e) {
+      console.error('[DataService] Error updating dateBounds:', e)
+    }
+  }
+
   /**
    * 获取当前状态
    */

src/views/LeaderboardView.vue

@@ -118,7 +118,8 @@ export default {
       updatedClickCount: 0,
       asset: '',
       drawerVisible: false,
-      unsubscribe: null
+      unsubscribe: null,
+      dateBoundsUpdateTimer: null
     }
   },
   watch: {
@@ -320,6 +321,18 @@ export default {
     if (!dataService.loaded && !dataService.loading) {
       dataService.load()
     }
+    
+    // 定期更新 dateBounds（每30秒检查一次数据库的最新日期）
+    this.dateBoundsUpdateTimer = setInterval(() => {
+      dataService.updateDateBounds().catch(e => {
+        console.error('[LeaderboardView] Error updating dateBounds:', e)
+      })
+    }, 30000) // 30秒
+    
+    // 组件挂载后立即更新一次
+    dataService.updateDateBounds().catch(e => {
+      console.error('[LeaderboardView] Error updating dateBounds on mount:', e)
+    })
   },
   beforeUnmount() {
     // 取消订阅
@@ -327,6 +340,11 @@ export default {
       this.unsubscribe()
       this.unsubscribe = null
     }
+    // 清除定时器
+    if (this.dateBoundsUpdateTimer) {
+      clearInterval(this.dateBoundsUpdateTimer)
+      this.dateBoundsUpdateTimer = null
+    }
   }
 }
 </script>