fixed N+1 query in category tags

Author: Oaphi

app/controllers/tags_controller.rb

@@ -17,7 +17,7 @@ def index
               (@tag_set&.tags || Tag.all).order(:name)
             end
 
-    @tags = @tags.includes(:tag_synonyms)
+    @tags = @tags.list_includes
                  .paginate(page: params[:page], per_page: 50)
 
     respond_to do |format|
@@ -43,7 +43,7 @@ def category
               @tag_set.tags.where(excerpt: ['', nil])
             else
               @tag_set.tags
-            end
+            end.list_includes
 
     table = params[:hierarchical].present? ? 'tags_paths' : 'tags'
 

app/models/tag.rb

@@ -18,6 +18,9 @@ class Tag < ApplicationRecord
   validate :synonym_unique
   validates :name, uniqueness: { scope: [:tag_set_id], case_sensitive: false }
 
+  # scopes
+  scope :list_includes, -> { includes(:tag_synonyms) }
+
   # Fuzzy-searches tags by name, excerpt, and synonym name
   # @param term [String] search term
   # @return [ActiveRecord::Relation<Tag>]