A platform for community discussion. Free, open, simple.
DEV: Avoid N+1 in reviewables with localizations (#40495)
Penar Musarajb76707d02b40
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rbindex 2a2b8f4117f..617ea52a1b1 100644--- a/app/models/reviewable.rb+++ b/app/models/reviewable.rb@@ -427,20 +427,21 @@ class Reviewable < ActiveRecord::Baseresult = self.order(order || "reviewables.score desc, reviewables.created_at desc")if preload+ target_associations = [+ :user_stat,+ :primary_email,+ { topic: :category },+ :user_histories,+ :user_custom_fields,+ ]+ target_associations << :localizations if SiteSetting.content_localization_enabled+result =result.includes({ created_by: :user_stat },:topic,- {- target: [- :user_stat,- :primary_email,- { topic: :category },- :user_histories,- :user_custom_fields,- ],- },+ { target: target_associations },{ target_created_by: [:user_custom_fields] },:reviewable_histories,)diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rbindex 569b9266d75..c0e2a327509 100644--- a/spec/requests/reviewables_controller_spec.rb+++ b/spec/requests/reviewables_controller_spec.rb@@ -384,6 +384,49 @@ RSpec.describe ReviewablesController doexpect(json["reviewables"].size).to eq(1)end+ it "doesn't cause N+1 queries when flagged posts have localizations" do+ SiteSetting.content_localization_enabled = true+ admin.update!(locale: "ja")+ reviewables =+ 2.times.map do+ post = Fabricate(:post, raw: "Original post", locale: "en")+ Fabricate(+ :post_localization,+ post: post,+ cooked: "<p>Translated post</p>",+ locale: "ja",+ )++ Fabricate(+ :reviewable_flagged_post,+ target: post,+ target_created_by: post.user,+ topic: post.topic,+ )+ end++ I18n.with_locale(:ja) do+ queries =+ track_sql_queries do+ get "/review.json"+ expect(response.status).to eq(200)+ end++ post_localization_queries =+ queries.select { |query| query.match?(/FROM "?post_localizations"?/) }++ expect(post_localization_queries.size).to eq(1)+ expect(+ response.parsed_body["reviewables"].map { |reviewable| reviewable["id"] },+ ).to include(*reviewables.map(&:id))+ expect(+ response.parsed_body["reviewables"]+ .select { |reviewable| reviewables.map(&:id).include?(reviewable["id"]) }+ .map { |reviewable| reviewable["cooked"] },+ ).to all(eq("<p>Translated post</p>"))+ end+ end+context "with reviewable notes" dofab!(:moderator)fab!(:reviewable)