#424

backend/app/controllers/materials_controller.rb

@@ -70,7 +70,10 @@ class MaterialsController < ApplicationController
         .find_by(id: params[:id])
     return head :not_found unless material
 
-    wiki_page_body = material.tag&.tag_name('ja')&.wiki_page&.current_revision&.body
+    wiki_page_body =
+        TagDescription
+        .find_by(tag_id: material.tag_id, language_code: locale.language_code)
+        &.body
 
     render json: MaterialRepr.base(material, host: request.base_url,
                                    language_code: locale.language_code).merge(wiki_page_body:)

backend/app/controllers/nico_tags_controller.rb

@@ -26,7 +26,7 @@ class NicoTagsController < ApplicationController
         ExternalTag
         .joins("LEFT JOIN (#{ post_tag_max_sql }) post_tag_max " \
                'ON post_tag_max.external_tag_id = external_tags.id')
-        .includes(linked_tags: { tag_names: :wiki_page })
+        .includes(linked_tags: [:tag_names, :tag_descriptions])
     if name
       q = q.where(('external_tags.name LIKE ? ' +
                    "OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"),

backend/app/controllers/posts_controller.rb

@@ -53,7 +53,7 @@ class PostsController < ApplicationController
         .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
         .preload(:external_tags, :uploaded_user, :parents, :children,
                  post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                { tag_names: :wiki_page }] }])
+                                                :tag_names, :tag_descriptions] }])
         .with_attached_thumbnail
 
     q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -111,7 +111,7 @@ class PostsController < ApplicationController
         filtered_posts(locale)
         .preload(:uploaded_user, :parents, :children,
                  post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                { tag_names: :wiki_page }] }])
+                                                :tag_names, :tag_descriptions] }])
         .with_attached_thumbnail
         .order('RAND()')
         .first
@@ -198,7 +198,7 @@ class PostsController < ApplicationController
         Post
         .includes(:uploaded_user, :parents, :children,
                   post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                 { tag_names: :wiki_page }] }])
+                                                 :tag_names, :tag_descriptions] }])
         .with_attached_thumbnail
         .find_by(id: params[:id])
     return head :not_found unless post

backend/app/controllers/tag_versions_controller.rb

@@ -51,7 +51,7 @@ class TagVersionsController < ApplicationController
 
       tags_by_id =
           Tag
-          .includes(:tag_names, :materials, tag_names: :wiki_page)
+          .includes(:tag_names, :materials, :tag_descriptions, parents: :tag_descriptions)
           .where(id: all_parent_tag_ids)
           .index_by(&:id)
 

backend/app/controllers/tags_controller.rb

@@ -175,7 +175,7 @@ class TagsController < ApplicationController
     tags_by_id =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, :materials, tag_names: :wiki_page)
+        .includes(:tag_names, :materials, :tag_descriptions, parents: :tag_descriptions)
         .where(tag_names: { language_code: locale.language_code, primary_flg: true },
                id: tag_ids)
         .index_by(&:id)
@@ -238,7 +238,7 @@ class TagsController < ApplicationController
     base =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, :materials, tag_names: :wiki_page)
+        .includes(:tag_names, :materials, :tag_descriptions, parents: :tag_descriptions)
         .where(tag_names: { language_code: locale.language_code, primary_flg: true },
                deprecated_at: nil)
     base = base.where('tags.post_count > 0') if present_only
@@ -282,7 +282,7 @@ class TagsController < ApplicationController
     tag =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, :materials, tag_names: :wiki_page)
+        .includes(:tag_names, :materials, :tag_descriptions, parents: :tag_descriptions)
         .find_by(id: params[:id],
                  tag_names: { language_code: locale.language_code, primary_flg: true })
     return render json: TagRepr.base(tag, language_code: locale.language_code) if tag
@@ -302,7 +302,7 @@ class TagsController < ApplicationController
     tag =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, :materials, tag_names: :wiki_page)
+        .includes(:tag_names, :materials, :tag_descriptions, parents: :tag_descriptions)
         .find_by(tag_names: { name:, language_code: locale.language_code, primary_flg: true })
     return render json: TagRepr.base(tag, language_code: locale.language_code) if tag
 
@@ -320,7 +320,7 @@ class TagsController < ApplicationController
 
     tag = 
         Tag.joins(:tag_names)
-        .includes(:tag_names, tag_names: :wiki_page)
+        .includes(:tag_names, :tag_descriptions, parents: :tag_descriptions)
         .find_by(id: params[:id],
                  tag_names: { language_code: locale.language_code, primary_flg: true })
     return head :not_found unless tag
@@ -340,7 +340,7 @@ class TagsController < ApplicationController
     tag =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, tag_names: :wiki_page)
+        .includes(:tag_names, :tag_descriptions, parents: :tag_descriptions)
         .find_by(tag_names: { name:, language_code: locale.language_code, primary_flg: true })
     return head :not_found unless tag
 
@@ -359,7 +359,7 @@ class TagsController < ApplicationController
     tag =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, tag_names: :wiki_page)
+        .includes(:tag_names, :tag_descriptions, parents: :tag_descriptions)
         .find_by(id: params[:id],
                  tag_names: { language_code: locale.language_code, primary_flg: true })
     return head :not_found unless tag
@@ -424,7 +424,7 @@ class TagsController < ApplicationController
     tag =
         Tag
         .joins(:tag_names)
-        .includes(:tag_names, :materials, tag_names: :wiki_page)
+        .includes(:tag_names, :materials, :tag_descriptions, parents: :tag_descriptions)
         .find_by(tag_names: { name:, language_code: locale.language_code, primary_flg: true })
     return head :not_found unless tag
 

backend/app/models/tag.rb

@@ -53,6 +53,7 @@ class Tag < ApplicationRecord
   has_many :tag_versions
 
   has_many :tag_names
+  has_many :tag_descriptions
 
   attribute :version_no, :integer, default: 1
 
@@ -98,7 +99,13 @@ class Tag < ApplicationRecord
 
   def deprecated? = deprecated_at?
 
-  def has_wiki = wiki_page.present?
+  def has_description? language_code:
+    if tag_descriptions.loaded?
+      tag_descriptions.any? { _1.language_code == language_code }
+    else
+      tag_descriptions.exists?(language_code:)
+    end
+  end
 
   def material_id = materials.first&.id
 

backend/app/representations/tag_repr.rb

@@ -3,21 +3,28 @@
 
 module TagRepr
   BASE = { only: [:id, :category, :post_count, :created_at, :updated_at, :deprecated_at],
-           methods: [:has_wiki, :material_id, :has_deerjikists] }.freeze
+           methods: [:material_id, :has_deerjikists] }.freeze
 
   module_function
 
   def base tag, language_code: 'ja'
-    tag.as_json(BASE).merge(name: name_for(tag, language_code),
+    tag.as_json(BASE).merge('has_wiki' => tag.has_description?(language_code:),
+                            name: name_for(tag, language_code),
                             aliases: tag.snapshot_aliases(language_code),
                             parents: tag.parents.map { inline(_1, language_code:) })
   end
 
   def inline tag, language_code: 'ja'
-    tag.as_json(BASE).merge(name: name_for(tag, language_code), aliases: [], parents: [])
+    tag.as_json(BASE).merge('has_wiki' => tag.has_description?(language_code:),
+                            name: name_for(tag, language_code), aliases: [], parents: [])
   end
 
-  def many(tags, language_code: 'ja') = tags.map { |tag| base(tag, language_code:) }
+  def many tags, language_code: 'ja'
+    records = tags.to_a
+    ActiveRecord::Associations::Preloader.new(
+        records:, associations: [:tag_descriptions, { parents: :tag_descriptions }]).call
+    records.map { |tag| base(tag, language_code:) }
+  end
 
   def name_for tag, language_code
     tag.name(language_code) || (tag.system? ? tag.name('ja') : nil)