#306

backend/app/controllers/materials_controller.rb

@@ -14,10 +14,15 @@ class MaterialsController < ApplicationController
 
     tag_id = params[:tag_id].presence
     parent_id = params[:parent_id].presence
+    unclassified = bool?(:unclassified)
 
     q = Material.includes(:tag, :created_by_user, :material_export_items).with_attached_file
-    q = q.where(tag_id:) if tag_id
-    q = q.where(parent_id:) if parent_id
+    if unclassified
+      q = q.where(tag_id: nil)
+    else
+      q = q.where(tag_id:) if tag_id
+      q = q.where(parent_id:) if parent_id
+    end
 
     count = q.count
     materials = q.order(created_at: :desc, id: :desc).limit(limit).offset(offset)

backend/app/controllers/tags_controller.rb

@@ -82,8 +82,9 @@ class TagsController < ApplicationController
   def with_depth
     parent_tag_id = params[:parent].to_i
     parent_tag_id = nil if parent_tag_id <= 0
+    material_filter = material_filter_param(default: 'any')
 
-    graph = build_with_depth_graph
+    graph = build_with_depth_graph(material_filter)
 
     tag_ids =
         if parent_tag_id
@@ -92,19 +93,9 @@ class TagsController < ApplicationController
           visible_root_tag_ids(graph)
         end
 
-    tags =
-        Tag
-        .joins(:tag_name)
-        .includes(:tag_name, :materials, tag_name: :wiki_page)
-        .where(id: tag_ids)
-        .order('tag_names.name')
-        .distinct
-        .to_a
-
-    render json: tags.map { |tag|
-      TagRepr.base(tag).merge(has_children: visible_child_tag_ids(tag.id, graph).present?,
-                              children: [])
-    }
+    render json: tag_ids
+                 .sort_by { |tag_id| graph[:tags_by_id][tag_id][:name] }
+                 .map { |tag_id| with_depth_lightweight_repr(tag_id, graph) }
   end
 
   def autocomplete
@@ -229,13 +220,16 @@ class TagsController < ApplicationController
   def materials_by_name
     name = params[:name].to_s.strip
     return render_bad_request('name は必須です．') if name.blank?
+    material_filter = material_filter_param(default: 'any')
 
     tag = Tag.joins(:tag_name)
              .includes(:tag_name, :materials, tag_name: :wiki_page)
              .find_by(tag_names: { name: })
     return head :not_found unless tag
 
-    render json: build_tag_children(tag)
+    graph = build_with_depth_graph(material_filter)
+
+    render json: build_tag_children(tag, graph:)
   end
 
   def update_all
@@ -348,7 +342,14 @@ class TagsController < ApplicationController
 
   private
 
-  def build_with_depth_graph
+  def material_filter_param default:
+    value = params[:material_filter].to_s.presence
+    return default unless ['present', 'missing', 'any'].include?(value)
+
+    value
+  end
+
+  def build_with_depth_graph material_filter
     children_by_parent_id = Hash.new { |h, k| h[k] = [] }
     parent_ids_by_child_id = Hash.new { |h, k| h[k] = [] }
 
@@ -361,20 +362,26 @@ class TagsController < ApplicationController
                parent_ids_by_child_id.keys +
                Tag.where(category: ['meme', 'character', 'material']).pluck(:id)).uniq
 
-    tags_by_id = Tag.where(id: tag_ids)
-                    .pluck(:id, :category, :deprecated_at)
-                    .each_with_object({ }) do |(id, category, deprecated_at), h|
-      h[id] = { category:, deprecated: deprecated_at.present? }
+    material_tag_ids = Material.unscoped.kept.where.not(tag_id: nil).distinct.pluck(:tag_id).to_set
+
+    tags_by_id = Tag.joins(:tag_name)
+                    .where(id: tag_ids)
+                    .pluck('tags.id', 'tag_names.name', 'tags.category', 'tags.deprecated_at')
+                    .each_with_object({ }) do |(id, name, category, deprecated_at), h|
+      h[id] = { name:, category:, deprecated: deprecated_at.present?,
+                has_material: material_tag_ids.include?(id) }
     end
 
     { children_by_parent_id:, parent_ids_by_child_id:, tags_by_id:,
-      visible_child_tag_ids_by_parent_id: { } }
+      visible_child_tag_ids_by_parent_id: { },
+      visible_subtree_by_tag_id: { },
+      material_filter: }
   end
 
   def visible_root_tag_ids graph
-    graph[:tags_by_id].filter_map do |tag_id, attrs|
-      next unless with_depth_visible_tag?(attrs)
+    graph[:tags_by_id].filter_map do |tag_id, _attrs|
       next unless visible_root_tag?(tag_id, graph)
+      next unless visible_subtree?(tag_id, graph)
 
       tag_id
     end
@@ -428,18 +435,76 @@ class TagsController < ApplicationController
       return
     end
 
-    visible_ids << tag_id if with_depth_visible_tag?(tag)
+    if with_depth_visible_tag?(tag, graph[:material_filter])
+      visible_ids << tag_id
+      return
+    end
+
+    visible_ids << tag_id if graph[:children_by_parent_id][tag_id].any? { |child_tag_id|
+      visible_subtree?(child_tag_id, graph)
+    }
   end
 
-  def with_depth_visible_tag? tag
-    tag[:category].in?(['meme', 'character', 'material']) && !tag[:deprecated]
+  def with_depth_visible_tag? tag, material_filter
+    return false unless tag[:category].in?(['meme', 'character', 'material']) && !tag[:deprecated]
+
+    case material_filter
+    when 'present'
+      tag[:has_material]
+    when 'missing'
+      !tag[:has_material]
+    else
+      true
+    end
   end
 
-  def build_tag_children tag
+  def visible_subtree? tag_id, graph
+    cache = graph[:visible_subtree_by_tag_id]
+    return cache[tag_id] if cache.key?(tag_id)
+
+    tag = graph[:tags_by_id][tag_id]
+    return cache[tag_id] = false unless tag
+
+    if tag[:deprecated]
+      return cache[tag_id] =
+                 graph[:children_by_parent_id][tag_id].any? { |child_tag_id|
+                   visible_subtree?(child_tag_id, graph)
+                 }
+    end
+
+    cache[tag_id] =
+        with_depth_visible_tag?(tag, graph[:material_filter]) ||
+        graph[:children_by_parent_id][tag_id].any? { |child_tag_id|
+          visible_subtree?(child_tag_id, graph)
+        }
+  end
+
+  def with_depth_lightweight_repr tag_id, graph
+    tag = graph[:tags_by_id][tag_id]
+
+    { id: tag_id,
+      name: tag[:name],
+      category: tag[:category],
+      deprecated: tag[:deprecated],
+      has_material: tag[:has_material],
+      has_children: visible_child_tag_ids(tag_id, graph).present?,
+      children: [] }
+  end
+
+  def build_tag_children tag, graph: nil
     material = tag.materials.first
+    tag_graph = graph && graph[:tags_by_id][tag.id]
+    material =
+        nil if tag_graph && !with_depth_visible_tag?(tag_graph, graph[:material_filter])
+
+    children = tag.children.sort_by(&:name)
+    if graph
+      children = children.filter { |child_tag| visible_subtree?(child_tag.id, graph) }
+    end
 
     TagRepr.base(tag).merge(
-        children: tag.children.sort_by { _1.name }.map { build_tag_children(_1) },
+        children: children.map { build_tag_children(_1, graph:) },
+        has_material: tag_graph ? tag_graph[:has_material] : material.present?,
         material: material && MaterialRepr.base(material, host: request.base_url))
   end