From de1f3aab868f8d18198438c405d0852c58f34e10 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 16 Oct 2016 18:57:54 +0200 Subject: Fix #16 - Optimize n+1 queries when checking reblogged/favourited values for status lists in API --- app/models/status.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/models/status.rb') diff --git a/app/models/status.rb b/app/models/status.rb index 3f150c5de..58b2cb1f3 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -2,7 +2,7 @@ class Status < ApplicationRecord include Paginable include Streamable - belongs_to :account, inverse_of: :statuses + belongs_to :account, -> { with_counters }, inverse_of: :statuses belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs @@ -90,11 +90,11 @@ class Status < ApplicationRecord end def self.favourites_map(status_ids, account_id) - Favourite.where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h + Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h end def self.reblogs_map(status_ids, account_id) - where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h + select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h end before_validation do -- cgit