A platform for community discussion. Free, open, simple.
PERF: resolve N+1 query in admin active-users list (#43027)
Haseeb Annadambana6e2abe34a9f
diff --git a/app/models/concerns/second_factor_manager.rb b/app/models/concerns/second_factor_manager.rbindex 7edd962584b..ecbfc0c0d8c 100644--- a/app/models/concerns/second_factor_manager.rb+++ b/app/models/concerns/second_factor_manager.rb@@ -61,8 +61,7 @@ module SecondFactorManagerenddef totp_enabled?- !SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins &&- user_second_factors&.totps&.exists?+ !SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins && totps.any?enddef backup_codes_enabled?@@ -72,19 +71,13 @@ module SecondFactorManagerdef security_keys_enabled?!SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins &&- security_keys&.where(- factor_type: UserSecurityKey.factor_types[:second_factor],- enabled: true,- )&.exists?+ security_key_factor_enabled?(UserSecurityKey.factor_types[:second_factor])enddef passkeys_available_as_second_factor?SiteSetting.allow_passkeys_for_2fa && SiteSetting.enable_passkeys &&!SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins &&- security_keys&.where(- factor_type: UserSecurityKey.factor_types[:first_factor],- enabled: true,- )&.exists?+ security_key_factor_enabled?(UserSecurityKey.factor_types[:first_factor])endalias_method :passkeys_for_2fa_enabled?, :passkeys_available_as_second_factor?@@ -304,4 +297,14 @@ module SecondFactorManagerdef require_rotprequire "rotp" if !defined?(ROTP)end++ private++ def security_key_factor_enabled?(factor_type)+ if security_keys.loaded?+ security_keys.any? { |security_key| security_key.factor_type == factor_type }+ else+ security_keys.where(factor_type: factor_type).exists?+ end+ endenddiff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rbindex d1a1b82191a..75021be004c 100644--- a/lib/admin_user_index_query.rb+++ b/lib/admin_user_index_query.rb@@ -66,7 +66,7 @@ class AdminUserIndexQueryorder << "users.username"end- query = klass.includes(:totps).order(order.reject(&:blank?).join(","))+ query = klass.includes(:security_keys, :totps).order(order.reject(&:blank?).join(","))query = query.includes(:user_stat) unless params[:stats].present? && params[:stats] == falsediff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rbindex 608b0321455..2935171ca64 100644--- a/spec/requests/admin/users_controller_spec.rb+++ b/spec/requests/admin/users_controller_spec.rb@@ -20,6 +20,21 @@ RSpec.describe Admin::UsersController doexpect(response.parsed_body).to be_presentend+ it "loads second-factor status in batches" do+ Fabricate(:user_second_factor_totp, user: user)+ Fabricate(:user_security_key, user: coding_horror)+ Fabricate(:passkey_with_random_credential, user: moderator)++ queries = track_sql_queries { get "/admin/users/list/active.json" }++ users_by_id = response.parsed_body.index_by { |serialized_user| serialized_user["id"] }+ expect(users_by_id[user.id]["second_factor_enabled"]).to eq(true)+ expect(users_by_id[coding_horror.id]["second_factor_enabled"]).to eq(true)+ expect(users_by_id[moderator.id]).not_to have_key("second_factor_enabled")+ expect(queries.count { |query| query.include?('FROM "user_second_factors"') }).to eq(1)+ expect(queries.count { |query| query.include?('FROM "user_security_keys"') }).to eq(1)+ end+it "returns silence reason when user is silenced" dosilencer =UserSilencer.new(