Merge remote-tracking branch 'origin/main' into feature/351

backend/app/controllers/posts_controller.rb

@@ -44,7 +44,8 @@ class PostsController < ApplicationController
         filtered_posts
         .joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
         .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
-        .preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
+        .preload(:uploaded_user, :parents, :children,
+                 tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
         .with_attached_thumbnail
 
     q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -95,22 +96,36 @@ class PostsController < ApplicationController
   end
 
   def random
-    post = filtered_posts
-           .preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
-           .order('RAND()')
-           .first
+    post = filtered_posts.preload(:uploaded_user, :parents, :children,
+                                  tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
+                         .with_attached_thumbnail
+                         .order('RAND()')
+                         .first
     return head :not_found unless post
 
     render json: PostRepr.base(post, current_user)
   end
 
   def show
-    post = Post.includes(tags: [:deerjikists, :materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
+    post =
+        Post
+        .includes(:uploaded_user, :parents, :children,
+                  tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
+        .with_attached_thumbnail
+        .find_by(id: params[:id])
     return head :not_found unless post
 
-    render json: PostRepr.base(post, current_user)
-                         .merge(tags: build_tag_tree_for(post),
-                                related: PostRepr.many(post.related(limit: 20)))
+    parent_posts = post.parents.with_attached_thumbnail.order(:id).to_a
+    child_posts = post.children.with_attached_thumbnail.order(:id).to_a
+    sibling_posts = sibling_posts_by_parent(parent_posts.map(&:id))
+    related = post.related(limit: 20).to_a
+
+    render json: PostRepr.detail(post, current_user,
+                                 parent_posts:,
+                                 child_posts:,
+                                 sibling_posts:,
+                                 related:)
+                         .merge(tags: build_tag_tree_for(post))
   end
 
   def create
@@ -133,10 +148,11 @@ class PostsController < ApplicationController
     ApplicationRecord.transaction do
       post.save!
 
-      Tag.normalise_tags!(tag_names, with_sections: true) => { tags:, sections: }
+      Tag.normalise_tags!(tag_names, deny_deprecated: true, with_sections: true) =>
+          { tags:, sections: }
       TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
 
-      tags = Tag.expand_parent_tags(tags)
+      tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
       sync_post_tags!(post, tags, sections)
 
       sync_parent_posts!(post, parent_post_ids)
@@ -149,11 +165,13 @@ class PostsController < ApplicationController
     post.reload
     render json: PostRepr.base(post), status: :created
   rescue Tag::NicoTagNormalisationError
-    head :bad_request
+    render_validation_error fields: { tags: 'ニコニコ・タグは直接指定できません．' }
+  rescue Tag::DeprecatedTagNormalisationError
+    render_unprocessable_entity '廃止済みタグは付与できません．', field: :tags
   rescue ArgumentError => e
-    render json: { errors: [e.message] }, status: :unprocessable_entity
+    render_validation_error fields: { parent_post_ids: [e.message] }
   rescue ActiveRecord::RecordInvalid => e
-    render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
+    render_post_form_record_invalid e.record
   end
 
   def viewed
@@ -176,10 +194,10 @@ class PostsController < ApplicationController
 
     force = bool?(:force)
     merge = bool?(:merge)
-    return head :bad_request if force && merge
+    return render_bad_request('force と merge は同時に指定できません．') if force && merge
 
     base_version_no = parse_base_version_no
-    return head :bad_request if !(force) && !(base_version_no)
+    return render_bad_request('base_version_no は必須です．') if !(force) && !(base_version_no)
 
     title = params[:title].presence
     tag_names = params[:tags].to_s.split
@@ -239,11 +257,13 @@ class PostsController < ApplicationController
     json['tags'] = build_tag_tree_for(post)
     render json:, status: :ok
   rescue Tag::NicoTagNormalisationError
-    head :bad_request
+    render_validation_error fields: { tags: ['ニコニコ・タグは直接指定できません．'] }
+  rescue Tag::DeprecatedTagNormalisationError
+    render_unprocessable_entity '廃止済みタグは付与できません．', field: :tags
   rescue ArgumentError => e
-    render json: { errors: [e.message] }, status: :unprocessable_entity
+    render_validation_error fields: { parent_post_ids: [e.message] }
   rescue ActiveRecord::RecordInvalid => e
-    render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
+    render_post_form_record_invalid e.record
   end
 
   def changes
@@ -370,7 +390,7 @@ class PostsController < ApplicationController
   end
 
   def build_tag_tree_for post
-    tags = post.tags.to_a
+    tags = post.tags.reject(&:deprecated?).to_a
     tag_ids = tags.map(&:id)
 
     implications = TagImplication.where(parent_tag_id: tag_ids, tag_id: tag_ids)
@@ -385,6 +405,11 @@ class PostsController < ApplicationController
     root_ids = tag_ids - child_ids
 
     tags_by_id = tags.index_by(&:id)
+    sections_by_tag_id =
+        PostTagSection
+        .where(post_id: post.id, tag_id: tag_ids)
+        .order(:begin_ms)
+        .group_by(&:tag_id)
 
     memo = { }
 
@@ -392,11 +417,11 @@ class PostsController < ApplicationController
       tag = tags_by_id[tag_id]
       return nil unless tag
 
-      sections = PostTagSection.where(post_id: post.id, tag_id:)
-                 .as_json(only: [:begin_ms, :end_ms])
+      sections = sections_by_tag_id.fetch(tag_id, [])
+                                   .as_json(only: [:begin_ms, :end_ms])
 
       if path.include?(tag_id)
-        return TagRepr.base(tag).merge(children: [], sections:)
+        return TagRepr.inline(tag).merge(children: [], sections:)
       end
 
       if memo.key?(tag_id)
@@ -408,12 +433,26 @@ class PostsController < ApplicationController
 
       children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
 
-      memo[tag_id] = TagRepr.base(tag).merge(children:, sections:)
+      memo[tag_id] = TagRepr.inline(tag).merge(children:, sections:)
     end
 
     root_ids.filter_map { |id| build_node.call(id, []) }
   end
 
+  def sibling_posts_by_parent parent_post_ids
+    return { } if parent_post_ids.blank?
+
+    implications =
+        PostImplication
+        .where(parent_post_id: parent_post_ids)
+        .includes(post: { thumbnail_attachment: :blob })
+        .order(:parent_post_id, :post_id)
+
+    implications.group_by(&:parent_post_id).transform_values { |items|
+      items.map(&:post)
+    }
+  end
+
   def parse_parent_post_ids
     raise ArgumentError, 'parent_post_ids は必須です．' unless params.key?(:parent_post_ids)
 
@@ -427,7 +466,7 @@ class PostsController < ApplicationController
 
   def sync_parent_posts! post, parent_post_ids
     if parent_post_ids.include?(post.id)
-      post.errors.add(:base, '自分自身を親投稿にはできません．')
+      post.errors.add :parent_post_ids, '自分自身を親投稿にはできません．'
       raise ActiveRecord::RecordInvalid, post
     end
 
@@ -435,7 +474,8 @@ class PostsController < ApplicationController
     missing_ids = parent_post_ids - existing_ids
 
     if missing_ids.present?
-      post.errors.add(:base, "存在しない親投稿 ID があります: #{ missing_ids.join(' ') }")
+      post.errors.add :parent_post_ids,
+                      "存在しない親投稿 Id. があります: #{ missing_ids.join(' ') }"
       raise ActiveRecord::RecordInvalid, post
     end
 
@@ -486,6 +526,7 @@ class PostsController < ApplicationController
         .kept
         .joins(tag: :tag_name)
         .merge(Tag.not_nico)
+        .merge(Tag.where(deprecated_at: nil))
         .includes(:sections, tag: :tag_name)
         .order('tag_names.name')
         .map do |post_tag|
@@ -527,10 +568,11 @@ class PostsController < ApplicationController
   end
 
   def incoming_tag_names_for_snapshot raw_tag_names
-    Tag.normalise_tags!(raw_tag_names, with_tagme: false, with_sections: true) =>
+    Tag.normalise_tags!(raw_tag_names, with_tagme: false, deny_deprecated: true,
+                                        with_sections: true) =>
         { tags:, sections: }
 
-    Tag.expand_parent_tags(tags).uniq(&:id).map { |tag|
+    Tag.expand_parent_tags(tags).reject(&:deprecated?).uniq(&:id).map { |tag|
       "#{ tag.name }#{ sections[tag.id].to_a.map { section_literal(_1) }.join }"
     }.sort
   end
@@ -623,14 +665,16 @@ class PostsController < ApplicationController
                  original_created_from: snapshot[:original_created_from],
                  original_created_before: snapshot[:original_created_before])
 
-    Tag.normalise_tags!(snapshot[:tag_names], with_tagme: false, with_sections: true) =>
+    Tag.normalise_tags!(snapshot[:tag_names], with_tagme: false,
+                                               deny_deprecated: true,
+                                               with_sections: true) =>
         { tags: editable_tags, sections: }
     TagVersioning.record_tag_snapshots!(editable_tags, created_by_user: current_user)
 
     readonly_tags = post.tags.nico.to_a
 
     tags = readonly_tags + editable_tags
-    tags = Tag.expand_parent_tags(tags)
+    tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
 
     sync_post_tags!(post, tags, sections)
     sync_parent_posts!(post, snapshot[:parent_post_ids])
@@ -673,4 +717,14 @@ class PostsController < ApplicationController
 
     merged.uniq.sort
   end
+
+  def render_post_form_record_invalid record
+    if record.is_a?(TagName) || record.is_a?(Tag)
+      render_validation_error fields: { tags: record.errors.full_messages.map { |message|
+        "タグ名 “#{ record.name }”: #{ message }"
+      } }
+    else
+      render_validation_error record
+    end
+  end
 end