fix: solve analytics dashboard issues

Author: Bulletdev

app/modules/analytics/controllers/competitive_controller.rb

@@ -153,18 +153,32 @@ def build_ban_performance(rows, total_games)
         end.sort_by { |s| -s[:ban_count] }
       end
 
+      # Builds blue/red side win-rate stats from in-memory rows.
+      #
+      # Side values in the DB are validated as lowercase ('blue', 'red'), but records
+      # ingested from external sources may have nil or differently-cased values (e.g.
+      # 'Blue', 'RED'). Those records are normalised via downcase before matching.
+      # Records with nil or unrecognised side values are excluded from both side
+      # buckets and reported in the `unaccounted` key. The sum
+      # blue.games + red.games may therefore be less than total_matches — this is
+      # intentional and expected when incomplete data exists.
       def build_side_performance(rows)
-        %w[blue red].each_with_object({}) do |side, result|
-          side_rows = rows.select { |m| m.side == side }
+        valid_sides = %w[blue red]
+        result = valid_sides.each_with_object({}) do |side, hash|
+          side_rows = rows.select { |m| m.side&.downcase == side }
           games     = side_rows.size
           wins      = side_rows.count(&:victory)
-          result[side] = {
+          hash[side] = {
             games: games,
             wins: wins,
             losses: games - wins,
             win_rate: games.positive? ? (wins.to_f / games * 100).round(1) : 0
           }
         end
+
+        accounted   = result['blue'][:games] + result['red'][:games]
+        result['unaccounted'] = rows.size - accounted
+        result
       end
 
       def build_role_performance(rows)
@@ -303,7 +317,7 @@ def empty_draft_performance
         {
           pick_performance: [],
           ban_performance: [],
-          side_performance: { blue: side_zeros, red: side_zeros },
+          side_performance: { 'blue' => side_zeros, 'red' => side_zeros, 'unaccounted' => 0 },
           role_performance: [],
           meta_champions: [],
           total_matches: 0

app/modules/analytics/controllers/performance_controller.rb

@@ -44,15 +44,12 @@ class PerformanceController < Api::V1::BaseController
       # @param player_id [Integer] Player ID for individual stats (optional)
       # @return [JSON] Performance analytics data
       def index
-        matches = apply_date_filters(organization_scoped(Match))
-
         # Use active players for team-wide stats (best performers, role breakdown, etc.)
         # but validate player_id against ALL org players so that bench/trial/inactive
         # players can still have their individual stats viewed.
-        active_players = organization_scoped(Player).includes(:organization).active
         all_org_players = organization_scoped(Player).includes(:organization)
-
         player_id = params[:player_id].presence
+
         if player_id.present? && !all_org_players.exists?(id: player_id)
           return render_error(
             message: 'Player not found',
@@ -61,11 +58,12 @@ def index
           )
         end
 
-        service = PerformanceAnalyticsService.new(matches, active_players)
-        performance_data = service.calculate_performance_data(player_id: player_id, all_players: all_org_players)
-
-        data = cache_response('analytics/performance', expires_in: 15.minutes) do
-          performance_data
+        cache_key = performance_cache_key(player_id)
+        data = cache_response(cache_key, expires_in: 15.minutes) do
+          matches = apply_date_filters(organization_scoped(Match))
+          active_players = organization_scoped(Player).includes(:organization).active
+          service = PerformanceAnalyticsService.new(matches, active_players)
+          service.calculate_performance_data(player_id: player_id, all_players: all_org_players)
         end
 
         render_success(data)
@@ -96,6 +94,24 @@ def apply_date_filters(matches)
         end
       end
 
+      # Builds a cache key segment that distinguishes team vs player requests
+      # and incorporates active date-filter params so that different filter
+      # combinations never share a cached result.
+      #
+      # The key is intentionally short and URL-safe; the org-scoping prefix
+      # is added by the Cacheable concern's +build_cache_key+ method.
+      #
+      # @param player_id [String, nil] player_id param value (nil for team view)
+      # @return [String] cache key segment, e.g.
+      #   "analytics/performance/team",
+      #   "analytics/performance/team/month",
+      #   "analytics/performance/player/42/2025-01-01-2025-01-31"
+      def performance_cache_key(player_id)
+        base = player_id ? "analytics/performance/player/#{player_id}" : 'analytics/performance/team'
+        suffix = [params[:time_period], params[:start_date], params[:end_date]].compact.join('-')
+        suffix.present? ? "#{base}/#{suffix}" : base
+      end
+
       # Converts time period string to number of days
       #
       # @param period [String] Time period (week, month, season)