From 133547781cafb894044886dd010b8c3568a2a8f7 Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 10 Jan 2020 19:30:47 -0600 Subject: [PATCH] /pool_versions: fix N+1 query problems. --- app/controllers/pool_versions_controller.rb | 2 +- app/models/pool_archive.rb | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/controllers/pool_versions_controller.rb b/app/controllers/pool_versions_controller.rb index 392556196..1a3fad07d 100644 --- a/app/controllers/pool_versions_controller.rb +++ b/app/controllers/pool_versions_controller.rb @@ -8,7 +8,7 @@ class PoolVersionsController < ApplicationController @pool = Pool.find(params[:search][:pool_id]) end - @pool_versions = PoolArchive.paginated_search(params) + @pool_versions = PoolArchive.paginated_search(params).includes(:updater, :pool) respond_with(@pool_versions) end diff --git a/app/models/pool_archive.rb b/app/models/pool_archive.rb index 96a397b53..8bb69f611 100644 --- a/app/models/pool_archive.rb +++ b/app/models/pool_archive.rb @@ -1,5 +1,6 @@ class PoolArchive < ApplicationRecord belongs_to :updater, :class_name => "User" + belongs_to :pool def self.enabled? Danbooru.config.aws_sqs_archives_url.present? @@ -110,14 +111,6 @@ class PoolArchive < ApplicationRecord PoolArchive.where("pool_id = ? and version < ?", pool_id, version).order("version desc").first end - def pool - Pool.find(pool_id) - end - - def updater - User.find(updater_id) - end - def pretty_name name.tr("_", " ") end