fix: solve N+1 queries issues

Author: Bulletdev

app/controllers/api/v1/base_controller.rb

@@ -162,8 +162,18 @@ def render_forbidden_policy(exception)
       end
 
       def render_internal_error(exception)
-        Rails.logger.error("Internal error: #{exception.class} - #{exception.message}")
-        Rails.logger.error(exception.backtrace.join("\n")) if exception.backtrace
+        # Log detailed error information
+        Rails.logger.error("=" * 80)
+        Rails.logger.error("INTERNAL ERROR: #{exception.class}")
+        Rails.logger.error("Message: #{exception.message}")
+        Rails.logger.error("Controller: #{controller_name}##{action_name}")
+        Rails.logger.error("User: #{current_user&.email || 'anonymous'}")
+        Rails.logger.error("Organization: #{current_organization&.name || 'N/A'}")
+        Rails.logger.error("Request: #{request.method} #{request.path}")
+        Rails.logger.error("Params: #{params.except(:controller, :action).inspect}")
+        Rails.logger.error("Backtrace:")
+        Rails.logger.error(exception.backtrace&.first(10)&.join("\n"))
+        Rails.logger.error("=" * 80)
 
         # In development, show detailed error; in production, be vague for security
         if Rails.env.development?

app/serializers/organization_serializer.rb

@@ -56,37 +56,75 @@ class OrganizationSerializer < Blueprinter::Base
   end
 
   field :statistics do |org|
-    {
-      total_players: org.cached_players_count,
-      active_players: org.players.where(deleted_at: nil, status: 'active').count,
-      total_matches: org.matches.count,
-      recent_matches: org.cached_monthly_matches_count,
-      total_users: org.users.count
-    }
+    begin
+      {
+        total_players: org.cached_players_count,
+        active_players: org.players.where(deleted_at: nil, status: 'active').count,
+        total_matches: org.matches.count,
+        recent_matches: org.cached_monthly_matches_count,
+        total_users: org.users.count
+      }
+    rescue => e
+      Rails.logger.error("OrganizationSerializer statistics error: #{e.class} - #{e.message}")
+      Rails.logger.error(e.backtrace&.first(5)&.join("\n"))
+      {
+        total_players: 0,
+        active_players: 0,
+        total_matches: 0,
+        recent_matches: 0,
+        total_users: 0
+      }
+    end
   end
 
   # Tier features and capabilities
   field :features do |org|
-    {
-      can_access_scrims: org.can_access_scrims?,
-      can_access_competitive_data: org.can_access_competitive_data?,
-      can_access_predictive_analytics: org.can_access_predictive_analytics?,
-      available_features: org.available_features,
-      available_data_sources: org.available_data_sources,
-      available_analytics: org.available_analytics
-    }
+    begin
+      {
+        can_access_scrims: org.can_access_scrims?,
+        can_access_competitive_data: org.can_access_competitive_data?,
+        can_access_predictive_analytics: org.can_access_predictive_analytics?,
+        available_features: org.available_features,
+        available_data_sources: org.available_data_sources,
+        available_analytics: org.available_analytics
+      }
+    rescue => e
+      Rails.logger.error("OrganizationSerializer features error: #{e.class} - #{e.message}")
+      Rails.logger.error(e.backtrace&.first(5)&.join("\n"))
+      {
+        can_access_scrims: false,
+        can_access_competitive_data: false,
+        can_access_predictive_analytics: false,
+        available_features: [],
+        available_data_sources: [],
+        available_analytics: []
+      }
+    end
   end
 
   field :limits do |org|
-    # Chamar tier_limits uma única vez e retornar apenas os campos necessários
-    limits = org.tier_limits
-    {
-      max_players: limits[:max_players],
-      max_matches_per_month: limits[:max_matches_per_month],
-      current_players: limits[:current_players],
-      current_monthly_matches: limits[:current_monthly_matches],
-      players_remaining: limits[:players_remaining],
-      matches_remaining: limits[:matches_remaining]
-    }
+    begin
+      # Chamar tier_limits uma única vez e retornar apenas os campos necessários
+      limits = org.tier_limits
+      {
+        max_players: limits[:max_players],
+        max_matches_per_month: limits[:max_matches_per_month],
+        current_players: limits[:current_players],
+        current_monthly_matches: limits[:current_monthly_matches],
+        players_remaining: limits[:players_remaining],
+        matches_remaining: limits[:matches_remaining]
+      }
+    rescue => e
+      Rails.logger.error("OrganizationSerializer limits error: #{e.class} - #{e.message}")
+      Rails.logger.error(e.backtrace&.first(5)&.join("\n"))
+      {
+        max_players: 0,
+        max_matches_per_month: 0,
+        current_players: 0,
+        current_monthly_matches: 0,
+        players_remaining: 0,
+        matches_remaining: 0
+      }
+    end
   end
 end

config/database.yml

@@ -20,6 +20,12 @@ default: &default
   # For details on connection pooling, see Rails configuration guide
   # https://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  # Connection timeout settings
+  connect_timeout: 5
+  checkout_timeout: 5
+  # Statement timeout (prevents long-running queries)
+  variables:
+    statement_timeout: 10000  # 10 seconds
 
 development:
   <<: *default