Regional leaderboards persist to database (#494)

Author: maxwofford

app/jobs/leaderboard_update_job.rb

@@ -10,51 +10,78 @@ class LeaderboardUpdateJob < ApplicationJob
     drop: true
   )
 
-  def perform(period = :daily, date = Date.current)
+  def perform(period = :daily, date = Date.current, force_update: false)
     date = LeaderboardDateRange.normalize_date(date, period)
 
-    Rails.logger.info "Starting leaderboard generation for #{period} on #{date}"
+    # global
+    build_leaderboard(date, period, nil, nil, force_update)
 
-    board = build_global(date, period)
-    build_timezones(date, period)
+    # Build timezone leaderboards
+    range = LeaderboardDateRange.calculate(date, period)
+    timezones_for_users_in(range).each do |timezone|
+      offset = User.timezone_to_utc_offset(timezone)
+      build_leaderboard(date, period, offset, timezone, force_update)
+    end
+  end
 
-    Rails.logger.info "Completed leaderboard generation for #{period} on #{date}"
+  private
 
-    board
-  rescue => e
-    Rails.logger.error "Failed to update leaderboard: #{e.message}"
-    Honeybadger.notify(e, context: { period: period, date: date })
-    raise
+  def timezones_for_users_in(range)
+    # Expand range by 1 day in both directions to catch users in all timezones
+    expanded_range = (range.begin - 1.day)...(range.end + 1.day)
+
+    User.joins(:heartbeats)
+        .where(heartbeats: { time: expanded_range })
+        .where.not(timezone: nil)
+        .distinct
+        .pluck(:timezone)
+        .compact
   end
 
-  private
 
-  def build_global(date, period)
-    range = LeaderboardDateRange.calculate(date, period)
+  def build_leaderboard(date, period, timezone_offset = nil, timezone = nil, force_update = false)
     board = ::Leaderboard.find_or_create_by!(
       start_date: date,
       period_type: period,
-      timezone_utc_offset: nil
-    ) do |lb|
-      lb.finished_generating_at = nil
+      timezone_utc_offset: timezone_offset
+    )
+
+    return board if board.finished_generating_at.present? && !force_update
+
+    if timezone_offset
+      Rails.logger.info "Building timezone leaderboard for #{timezone} (UTC#{timezone_offset >= 0 ? '+' : ''}#{timezone_offset})"
+    else
+      Rails.logger.info "Building global leaderboard"
     end
 
-    return board if board.finished_generating_at.present?
+    # Calculate timezone-aware range
+    range = if timezone
+      Time.use_zone(timezone) { LeaderboardDateRange.calculate(date, period) }
+    else
+      LeaderboardDateRange.calculate(date, period)
+    end
 
     ActiveRecord::Base.transaction do
       board.entries.delete_all
-      data = Heartbeat.where(time: range)
-                     .with_valid_timestamps
-                     .joins(:user)
-                     .coding_only
-                     .where.not(users: { github_uid: nil })
-                     .group(:user_id)
-                     .duration_seconds
 
-      data = data.filter { |_, seconds| seconds > 60 }
+      # Build the base heartbeat query
+      heartbeat_query = Heartbeat.where(time: range)
+                                .with_valid_timestamps
+                                .joins(:user)
+                                .coding_only
+                                .where.not(users: { github_uid: nil })
+                                .where.not(users: { trust_level: User.trust_levels[:red] })
+
+      # Filter by timezone if specified
+      if timezone_offset
+        users_in_tz = User.users_in_timezone_offset(timezone_offset).not_convicted
+        user_ids = users_in_tz.pluck(:id)
+        return board if user_ids.empty?
+        heartbeat_query = heartbeat_query.where(user_id: user_ids)
+      end
 
-      convicted = User.where(trust_level: User.trust_levels[:red]).pluck(:id)
-      data = data.reject { |user_id, _| convicted.include?(user_id) }
+      data = heartbeat_query.group(:user_id).duration_seconds
+                            .filter { |_, seconds| seconds > 60 }
 
       streaks = Heartbeat.daily_streaks_for_users(data.keys)
 
@@ -73,41 +100,15 @@ def build_global(date, period)
       board.update!(finished_generating_at: Time.current)
     end
 
-    key = LeaderboardCache.global_key(period, date)
-    LeaderboardCache.write(key, board)
-
-    board
-  end
-
-  def build_timezones(date, period)
-    range = LeaderboardDateRange.calculate(date, period)
-
-    user_timezones = User.joins(:heartbeats)
-                      .where(heartbeats: { time: range })
-                      .where.not(timezone: nil)
-                      .distinct
-                      .pluck(:timezone)
-                      .compact
-
-    offsets = user_timezones.map { |tz| User.timezone_to_utc_offset(tz) }.compact.uniq
-
-    Rails.logger.info "Generating timezone leaderboards for #{offsets.size} active UTC offsets"
-
-    offsets.each do |offset|
-      build_timezone(date, period, offset)
-    end
-  end
-
-  def build_timezone(date, period, offset)
-    key = LeaderboardCache.timezone_key(offset, date, period)
+    # Cache the board
+    cache_key = timezone_offset ?
+      LeaderboardCache.timezone_key(timezone_offset, date, period) :
+      LeaderboardCache.global_key(period, date)
 
-    data = LeaderboardCache.fetch(key) do
-      users = User.users_in_timezone_offset(offset).not_convicted
-      LeaderboardBuilder.build_for_users(users, date, "UTC#{offset >= 0 ? '+' : ''}#{offset}", period)
-    end
+    LeaderboardCache.write(cache_key, board)
 
-    Rails.logger.debug "Cached timezone leaderboard for UTC#{offset >= 0 ? '+' : ''}#{offset} with #{data&.entries&.size || 0} entries"
+    Rails.logger.debug "Persisted #{timezone_offset ? 'timezone' : 'global'} leaderboard with #{board.entries.count} entries"
 
-    data
+    board
   end
 end

app/jobs/timezone_leaderboard_job.rb

@@ -18,26 +18,31 @@ def get(period: :daily, date: Date.current, offset: nil)
   private
 
   def get_timezone(date, period, offset)
+    date = LeaderboardDateRange.normalize_date(date, period)
     key = LeaderboardCache.timezone_key(offset, date, period)
     board = LeaderboardCache.read(key)
 
+    return board if board.present?
+
+    board = ::Leaderboard.where.not(finished_generating_at: nil)
+                         .find_by(start_date: date, period_type: period, timezone_utc_offset: offset, deleted_at: nil)
+
     if board.present?
-      Rails.logger.debug "Cache HIT for timezone leaderboard UTC#{offset >= 0 ? '+' : ''}#{offset}"
+      LeaderboardCache.write(key, board)
       return board
     end
 
-    Rails.logger.debug "Cache MISS for timezone leaderboard UTC#{offset >= 0 ? '+' : ''}#{offset}"
-
-    TimezoneLeaderboardJob.perform_later(period, date, offset)
-    Rails.logger.info "Falling back to global leaderboard for UTC#{offset >= 0 ? '+' : ''}#{offset}"
+    ::LeaderboardUpdateJob.perform_later(period, date)
     get_global(date, period)
   end
 
   def get_global(date, period)
     date = LeaderboardDateRange.normalize_date(date, period)
     key = LeaderboardCache.global_key(period, date)
     board = LeaderboardCache.read(key)
+
     return board if board.present?
+
     board = ::Leaderboard.where.not(finished_generating_at: nil)
                          .find_by(start_date: date, period_type: period, timezone_utc_offset: nil, deleted_at: nil)
 
@@ -46,8 +51,7 @@ def get_global(date, period)
       return board
     end
 
-    Rails.logger.info "No leaderboard found for #{period} #{date}, triggering background generation"
-    LeaderboardUpdateJob.perform_later(period, date)
+    ::LeaderboardUpdateJob.perform_later(period, date)
     nil
   end
 end

app/jobs/timezone_leaderboard_update_job.rb

@@ -23,11 +23,11 @@
 
     <div class="inline-flex rounded-full p-1 mb-4 ml-4">
       <%= link_to "Timezone", leaderboards_path(period_type: @period_type, scope: 'timezone'),
-        class: "px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 #{@scope == 'timezone' ? ' text-white' : 'text-muted hover:text-white'}", style: "background:none; border:none;" %>
+        class: "px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 #{@scope == 'timezone' ? ' bg-primary text-white' : 'text-muted hover:text-white'}", style: "background:none; border:none;" %>
       <%= link_to "Regional", leaderboards_path(period_type: @period_type, scope: 'regional'),
-        class: "px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 #{@scope == 'regional' ? ' text-white' : 'text-muted hover:text-white'}", style: "background:none; border:none;" %>
+        class: "px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 #{@scope == 'regional' ? ' bg-primary text-white' : 'text-muted hover:text-white'}", style: "background:none; border:none;" %>
       <%= link_to "Global", leaderboards_path(period_type: @period_type, scope: 'global'),
-        class: "px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 #{@scope == 'global' ? ' text-white' : 'text-muted hover:text-white'}", style: "background:none; border:none;" %>
+        class: "px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 #{@scope == 'global' ? ' bg-primary text-white' : 'text-muted hover:text-white'}", style: "background:none; border:none;" %>
     </div>
 
     <% if current_user && current_user.github_uid.blank? %>

app/services/leaderboard_service.rb

@@ -30,17 +30,20 @@
     daily_leaderboard_update: {
       cron: "* * * * *",
       class: "LeaderboardUpdateJob",
-      args: [ :daily ]
+      args: [ :daily ],
+      kwargs: { force_update: true }
     },
     weekly_leaderboard_update: {
       cron: "*/2 * * * *",
       class: "LeaderboardUpdateJob",
-      args: [ :weekly ]
+      args: [ :weekly ],
+      kwargs: { force_update: true }
     },
     last_7_days_leaderboard_update: {
       cron: "*/7 * * * *",
       class: "LeaderboardUpdateJob",
-      args: [ :last_7_days ]
+      args: [ :last_7_days ],
+      kwargs: { force_update: true }
     },
     # sailors_log_poll: {
     #   cron: "*/2 * * * *",