Merge pull request mastodon#946 from pixiv/revert-945-remove_direct_q…

…uery

Revert "Remove direct query from sitemap"

app/controllers/pawoo/sitemap/status_indexes_controller.rb

@@ -9,7 +9,7 @@ def index
 
   def show
     read_from_slave do
-      @status_pages = Pawoo::Sitemap::Status.new(params[:page]).query.load
+      @status_pages = Pawoo::Sitemap::Status.new(params[:page]).direct_query.load
     end
   end
 end

app/controllers/pawoo/sitemap/user_indexes_controller.rb

@@ -9,7 +9,7 @@ def index
 
   def show
     read_from_slave do
-      @accounts = Pawoo::Sitemap::User.new(params[:page]).query.load
+      @accounts = Pawoo::Sitemap::User.new(params[:page]).direct_query.load
     end
   end
 end

app/models/pawoo/sitemap/status.rb

@@ -20,6 +20,19 @@ def query
             .merge(status_scope).merge(account_scope)
   end
 
+  # TODO: あとで消す
+  def direct_query
+    StreamEntry.joins(:status).joins(status: :account)
+               .select('statuses.id')
+               .select('statuses.updated_at')
+               .select('accounts.username')
+               .select('statuses.reblogs_count')
+               .where('stream_entries.id > ?', min_id)
+               .where('stream_entries.id <= ?', max_id)
+               .where(hidden: false)
+               .merge(status_scope).merge(account_scope)
+  end
+
   def prepare
     status_ids = StreamEntry.joins(:status).joins(status: :account)
                             .where('stream_entries.id > ?', min_id)

app/models/pawoo/sitemap/user.rb

@@ -15,6 +15,14 @@ def query
     Account.where(id: account_ids).merge(account_scope)
   end
 
+  # TODO: あとで消す
+  def direct_query
+    Account.joins(:user)
+          .where('users.id > ?', min_id)
+          .where('users.id <= ?', max_id)
+          .merge(account_scope)
+  end
+
   def prepare
     account_ids = ::User.joins(:account)
                         .where('users.id > ?', min_id)