feat: improve N+1 queries resolution

Author: Bulletdev

Gemfile

@@ -103,6 +103,7 @@ group :development do
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
   gem 'annotate'
+  gem 'bullet'
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'rubocop-rspec'

Gemfile.lock

@@ -87,6 +87,9 @@ GEM
     bootsnap (1.18.6)
       msgpack (~> 1.2)
     builder (3.3.0)
+    bullet (8.1.0)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
     crack (1.0.0)
@@ -409,6 +412,7 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.1.0)
+    uniform_notifier (1.18.0)
     uri (1.1.1)
     useragent (0.16.11)
     vcr (6.3.1)
@@ -431,6 +435,7 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   blueprinter
   bootsnap
+  bullet
   database_cleaner-active_record
   debug
   dotenv-rails

app/controllers/api/v1/rosters_controller.rb

@@ -93,11 +93,14 @@ def free_agents
 
         result = paginate(players)
 
+        # Preload organizations in a single query to avoid N+1 on previous_organization_id
+        org_ids = result[:data].map(&:previous_organization_id).compact.uniq
+        orgs_by_id = org_ids.any? ? Organization.where(id: org_ids).index_by(&:id) : {}
+
         free_agents_data = result[:data].map do |player|
           {
             player: PlayerSerializer.render_as_hash(player),
-            previous_organization: player.previous_organization_id ?
-              Organization.find(player.previous_organization_id).name : nil,
+            previous_organization: orgs_by_id[player.previous_organization_id]&.name,
             removed_at: player.deleted_at,
             removed_reason: player.removed_reason
           }

app/modules/dashboard/controllers/dashboard_controller.rb

@@ -156,8 +156,10 @@ def roster_status_data
       end
 
       def fetch_recent_activities
-        # Fetch recent audit logs and format them
+        # Fetch recent audit logs and format them.
+        # includes(:user) preloads the user in one query — avoids N+1 on log.user&.email
         activities = AuditLog
+                     .includes(:user)
                      .where(organization: current_organization)
                      .order(created_at: :desc)
                      .limit(20)

app/serializers/vod_review_serializer.rb

@@ -27,7 +27,9 @@ class VodReviewSerializer < Blueprinter::Base
   end
 
   field :timestamps_count do |vod_review, options|
-    options[:include_timestamps_count] ? vod_review.vod_timestamps.count : nil
+    # Use .size (not .count) so that when vod_timestamps is eager-loaded (via includes)
+    # the count comes from the in-memory collection — avoids 1 COUNT query per review.
+    options[:include_timestamps_count] ? vod_review.vod_timestamps.size : nil
   end
 
   association :organization, blueprint: OrganizationSerializer

config/environments/development.rb

@@ -12,9 +12,8 @@
 
   config.eager_load = false
 
-  # nosemgrep: ruby.rails.security.audit.detailed-exceptions.detailed-exceptions
-  # We want detailed exceptions in development environment
-  config.consider_all_requests_local = true
+  # Intentional: development needs full error reports for debugging
+  config.consider_all_requests_local = true # nosemgrep: ruby.rails.security.audit.detailed-exceptions.detailed-exceptions
 
   config.server_timing = true
 
@@ -80,13 +79,15 @@
   # ActiveJob configuration - use Sidekiq in development
   config.active_job.queue_adapter = :sidekiq
 
-  # Bullet for N+1 query detection
-  # Uncomment if using Bullet gem
-  # config.after_initialize do
-  #   Bullet.enable = true
-  #   Bullet.alert = true
-  #   Bullet.bullet_logger = true
-  #   Bullet.console = true
-  #   Bullet.rails_logger = true
-  # end
+  # Bullet — N+1 query detection
+  config.after_initialize do
+    Bullet.enable        = true
+    Bullet.bullet_logger = true                    # log/bullet.log
+    Bullet.rails_logger  = true                    # log/development.log
+    Bullet.add_footer    = false                   # API-only, sem HTML footer
+    Bullet.raise         = false                   # não levantar exceção em dev
+
+    # Ignore associations que são consultadas via SQL puro (não associação AR)
+    # Bullet.add_safelist type: :n_plus_one_query, class_name: 'Foo', association: :bar
+  end
 end