Merge pull request #3632 from shibaaaa/turning_question_index

質問一覧画面で発生していたN+1を解消
fjordllc · Nov 29, 2021 · bd0f2a5 · bd0f2a5
2 parents 4352d91 + 4c503ec
commit bd0f2a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
@@ -18,12 +18,14 @@ def index
       else
         Question.not_solved
       end
-    @tag = params[:tag]
     @tags = questions.all_tags
     questions = params[:practice_id].present? ? questions.where(practice_id: params[:practice_id]) : questions
     questions = questions.tagged_with(params[:tag]) if params[:tag]
-    questions = questions.includes(:practice, :answers).order(updated_at: :desc, id: :desc)
-    @questions = questions.with_avatar.page(params[:page])
+    @questions = questions
+                 .with_avatar
+                 .includes(:practice, :answers, :tags, :correct_answer, user: :company)
+                 .order(updated_at: :desc, id: :desc)
+                 .page(params[:page])
     @questions_property = questions_property
   end
 

diff --git a/app/views/questions/index.html.slim b/app/views/questions/index.html.slim
@@ -19,13 +19,13 @@ header.page-header
           #js-practice-select data-solved=params[:solved] data-current-user-id=current_user.id
   = render 'questions/tabs'
 
-- if @tag.present?
+- if params[:tag].present?
   header.page-main-header
     .container
       .page-main-header__inner
         .page-main-header__start
           h1.page-main-header__title
-            | タグ「#{@tag}」のQ&A（#{@questions.total_count}）
+            | タグ「#{params[:tag]}」のQ&A（#{@questions.total_count}）
 .page-body
   .container.is-lg
     = paginate @questions