fix: solve lobby serializer issue

Author: Bulletdev

app/modules/matchmaking/serializers/scrim_request_serializer.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Serializes ScrimRequest records for API responses, including org summaries.
 class ScrimRequestSerializer < Blueprinter::Base
   identifier :id
 
@@ -24,9 +27,9 @@ class ScrimRequestSerializer < Blueprinter::Base
 
   class << self
     TIER_SCORE = {
-      'CHALLENGER'  => 9, 'GRANDMASTER' => 8, 'MASTER'    => 7,
-      'DIAMOND'     => 6, 'EMERALD'     => 5, 'PLATINUM'  => 4,
-      'GOLD'        => 3, 'SILVER'      => 2, 'BRONZE'    => 1
+      'CHALLENGER' => 9, 'GRANDMASTER' => 8, 'MASTER' => 7,
+      'DIAMOND' => 6, 'EMERALD' => 5, 'PLATINUM' => 4,
+      'GOLD' => 3, 'SILVER' => 2, 'BRONZE' => 1
     }.freeze
 
     TIER_LABEL = {
@@ -35,33 +38,36 @@ class << self
       3 => 'Gold',       2 => 'Silver',      1 => 'Bronze', 0 => 'Iron'
     }.freeze
 
-    def serialize_org(org)
+    def serialize_org(org) # rubocop:disable Metrics/MethodLength
       players = org.players.active.select(:summoner_name, :role, :solo_queue_tier)
-
-      scores = players.map { |p| TIER_SCORE[p.solo_queue_tier.to_s.upcase] || 0 }
-      avg_score = scores.empty? ? 0 : (scores.sum.to_f / scores.size).round
-      avg_tier  = TIER_LABEL[avg_score] || 'Iron'
+      avg_tier = compute_avg_tier(players)
 
       {
-        id:            org.id,
-        name:          org.name,
-        slug:          org.slug,
-        region:        org.region,
-        tier:          org.tier,
+        id: org.id,
+        name: org.name,
+        slug: org.slug,
+        region: org.region,
+        tier: org.tier,
         public_tagline: org.public_tagline,
         discord_server: org.discord_invite_url,
-        scrims_won:    org.scrims_won   || 0,
-        scrims_lost:   org.scrims_lost  || 0,
-        total_scrims:  org.total_scrims || 0,
-        avg_tier:      avg_tier,
-        roster: players.map do |p|
-          {
-            summoner_name: p.summoner_name,
-            role:          p.role,
-            tier:          p.solo_queue_tier
-          }
-        end
+        scrims_won: 0,
+        scrims_lost: 0,
+        total_scrims: 0,
+        avg_tier: avg_tier,
+        roster: serialize_roster(players)
       }
     end
+
+    private
+
+    def compute_avg_tier(players)
+      scores = players.map { |p| TIER_SCORE[p.solo_queue_tier.to_s.upcase] || 0 }
+      avg_score = scores.empty? ? 0 : (scores.sum.to_f / scores.size).round
+      TIER_LABEL[avg_score] || 'Iron'
+    end
+
+    def serialize_roster(players)
+      players.map { |p| { summoner_name: p.summoner_name, role: p.role, tier: p.solo_queue_tier } }
+    end
   end
 end

app/modules/scrims/controllers/lobby_controller.rb

@@ -16,12 +16,12 @@ class LobbyController < Api::V1::BaseController
       # Public feed of open scrims — no auth required
       def index
         scrims = Scrim.unscoped
-                      .joins(:organization)
-                      .where(visibility: 'public')
-                      .where('organizations.is_public = ?', true)
+                      .eager_load(:organization)
+                      .includes(:opponent_team)
+                      .where(scrims: { visibility: 'public' })
+                      .where(organizations: { is_public: true })
                       .where('scrims.scheduled_at >= ?', Time.current)
-                      .includes(:organization, :opponent_team)
-                      .order(scheduled_at: :asc)
+                      .order('scrims.scheduled_at ASC')
 
         scrims = scrims.where(game: params[:game]) if params[:game].present? && ALLOWED_GAMES.include?(params[:game])
 
@@ -49,7 +49,7 @@ def filter_by_tier(scrims, tier)
                      when 'semi_pro'     then %w[semi_pro]
                      else                     %w[free amateur]
                      end
-        scrims.joins(:organization).where(organizations: { subscription_plan: tier_plans })
+        scrims.where(organizations: { subscription_plan: tier_plans })
       end
 
       def serialize_lobby_scrim(scrim)