#399

backend/app/controllers/application_controller.rb

@@ -85,11 +85,4 @@ class ApplicationController < ActionController::API
                    base_errors: },
            status:
   end
-
-  def normalise_json value
-    return nil if value.nil?
-    return JSON.parse(value) if value.is_a?(String)
-
-    value
-  end
 end

backend/app/controllers/post_versions_controller.rb

@@ -1,7 +1,7 @@
 class PostVersionsController < ApplicationController
   def index
     post_id = params[:post].presence
-    tag_id = params[:tag].presence&.to_i
+    tag_id = params[:tag].presence
     page = (params[:page].presence || 1).to_i
     limit = (params[:limit].presence || 20).to_i
 
@@ -10,6 +10,12 @@ class PostVersionsController < ApplicationController
 
     offset = (page - 1) * limit
 
+    tag_name =
+        if tag_id
+          TagName.joins(:tag).find_by(tag: { id: tag_id })
+        end
+    return render json: { versions: [], count: 0 } if tag_id && tag_name.blank?
+
     q = PostVersion.joins(<<~SQL.squish)
           LEFT JOIN
             post_versions prev
@@ -17,18 +23,17 @@ class PostVersionsController < ApplicationController
               prev.post_id = post_versions.post_id
               AND prev.version_no = post_versions.version_no - 1
         SQL
-        .select('post_versions.*',
+        .select('post_versions.*', 'prev.title AS prev_title', 'prev.url AS prev_url',
-                'prev.title AS prev_title',
+                'prev.thumbnail_base AS prev_thumbnail_base', 'prev.tags AS prev_tags',
-                'prev.url AS prev_url',
-                'prev.thumbnail_base AS prev_thumbnail_base',
-                'prev.tags_json AS prev_tags_json',
                 'prev.video_ms AS prev_video_ms',
                 'prev.original_created_from AS prev_original_created_from',
                 'prev.original_created_before AS prev_original_created_before')
     q = q.where('post_versions.post_id = ?', post_id) if post_id
-    if tag_id
+    if tag_name
-      q = q.where("JSON_CONTAINS(post_versions.tags_json, JSON_OBJECT('id', #{ tag_id })) " +
+      escaped = ActiveRecord::Base.sanitize_sql_like(tag_name.name)
-                  "OR JSON_CONTAINS(prev.tags_json, JSON_OBJECT('id', #{ tag_id }))")
+      q = q.where(("CONCAT(' ', post_versions.tags, ' ') LIKE :kw " +
+                   "OR CONCAT(' ', prev.tags, ' ') LIKE :kw"),
+                  kw: "% #{ escaped } %")
     end
 
     count = q.except(:select, :order, :limit, :offset).count
@@ -47,69 +52,51 @@ class PostVersionsController < ApplicationController
     users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
 
     rows.map do |row|
-      cur_tags =
+      cur_tags = split_tags(row.tags)
-          normalise_json(row.tags_json)
+      prev_tags = split_tags(row.attributes['prev_tags'])
-          .sort_by { [(case _1.fetch('category')
-                       when 'deerjikist'
-                         0
-                       when 'meme'
-                         1
-                       when 'character'
-                         2
-                       when 'general'
-                         3
-                       when 'material'
-                         4
-                       when 'meta'
-                         5
-                       else
-                         6
-                       end),
-                      _1.fetch('name').downcase] }
-          .map { Post.tag_snapshot_literal(_1) }
-      prev_tags =
-          (normalise_json(row.attributes['prev_tags_json']) || [])
-          .sort_by { [(case _1.fetch('category')
-                       when 'deerjikist'
-                         0
-                       when 'meme'
-                         1
-                       when 'character'
-                         2
-                       when 'general'
-                         3
-                       when 'material'
-                         4
-                       when 'meta'
-                         5
-                       else
-                         6
-                       end),
-                      _1.fetch('name').downcase] }
-          .map { Post.tag_snapshot_literal(_1) }
 
-      { post_id: row.post_id,
+      {
+        post_id: row.post_id,
         version_no: row.version_no,
         event_type: row.event_type,
-        title: { current: row.title, prev: row.attributes['prev_title'] },
+        title: {
-        url: { current: row.url, prev: row.attributes['prev_url'] },
+          current: row.title,
-        thumbnail: { current: nil, prev: nil },
+          prev: row.attributes['prev_title']
-        thumbnail_base: { current: row.thumbnail_base,
+        },
-                          prev: row.attributes['prev_thumbnail_base'] },
+        url: {
-        video_ms: { current: row.video_ms, prev: row.attributes['prev_video_ms'] },
+          current: row.url,
+          prev: row.attributes['prev_url']
+        },
+        thumbnail: {
+          current: nil,
+          prev: nil
+        },
+        thumbnail_base: {
+          current: row.thumbnail_base,
+          prev: row.attributes['prev_thumbnail_base']
+        },
+        video_ms: {
+          current: row.video_ms,
+          prev: row.attributes['prev_video_ms']
+        },
         tags: build_version_tags(cur_tags, prev_tags),
         original_created_from: {
-            current: row.original_created_from&.iso8601,
+          current: row.original_created_from&.iso8601,
-            prev: row.attributes['prev_original_created_from']&.iso8601 },
+          prev: row.attributes['prev_original_created_from']&.iso8601
+        },
         original_created_before: {
-            current: row.original_created_before&.iso8601,
+          current: row.original_created_before&.iso8601,
-            prev: row.attributes['prev_original_created_before']&.iso8601 },
+          prev: row.attributes['prev_original_created_before']&.iso8601
+        },
         created_at: row.created_at.iso8601,
         created_by_user:
-            if row.created_by_user_id
+          if row.created_by_user_id
-              { id: row.created_by_user_id,
+            {
-                name: users_by_id[row.created_by_user_id] }
+              id: row.created_by_user_id,
-            end }
+              name: users_by_id[row.created_by_user_id]
+            }
+          end
+      }
     end
   end
 
@@ -130,4 +117,8 @@ class PostVersionsController < ApplicationController
       }
     end
   end
+
+  def split_tags(tags)
+    tags.to_s.split(/\s+/).reject(&:blank?)
+  end
 end

backend/app/controllers/posts_controller.rb

@@ -36,8 +36,8 @@ class PostsController < ApplicationController
     offset = (page - 1) * limit
 
     pt_max_sql =
-        PostVersion
+        PostTag
-        .select('post_id, MAX(created_at) AS max_updated_at')
+        .select('post_id, MAX(updated_at) AS max_updated_at')
         .group('post_id')
         .to_sql
 
@@ -50,8 +50,9 @@ class PostsController < ApplicationController
         .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(:uploaded_user, :parents, :children,
-                 post_tags: [:sections, { tag: [:deerjikists, :materials,
+                 active_post_tags: [:sections,
-                                                { tag_name: :wiki_page }] }])
+                                    { tag: [:deerjikists, :materials,
+                                            { tag_name: :wiki_page }] }])
         .with_attached_thumbnail
 
     q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -103,8 +104,9 @@ class PostsController < ApplicationController
 
   def random
     post = filtered_posts.preload(:uploaded_user, :parents, :children,
-                                  post_tags: [:sections, { tag: [:deerjikists, :materials,
+                                  active_post_tags: [:sections,
-                                                                 { tag_name: :wiki_page }] }])
+                                                     { tag: [:deerjikists, :materials,
+                                                             { tag_name: :wiki_page }] }])
                          .with_attached_thumbnail
                          .order('RAND()')
                          .first
@@ -188,8 +190,9 @@ class PostsController < ApplicationController
     post =
         Post
         .includes(:uploaded_user, :parents, :children,
-                  post_tags: [:sections, { tag: [:deerjikists, :materials,
+                  active_post_tags: [:sections,
-                                                 { tag_name: :wiki_page }] }])
+                                     { tag: [:deerjikists, :materials,
+                                             { tag_name: :wiki_page }] }])
         .with_attached_thumbnail
         .find_by(id: params[:id])
     return head :not_found unless post
@@ -381,6 +384,50 @@ class PostsController < ApplicationController
     render_post_form_record_invalid e.record
   end
 
+  def changes
+    id = params[:id].presence
+    tag_id = params[:tag].presence
+    page = (params[:page].presence || 1).to_i
+    limit = (params[:limit].presence || 20).to_i
+
+    page = 1 if page < 1
+    limit = 1 if limit < 1
+
+    offset = (page - 1) * limit
+
+    pts = PostTag.with_discarded
+    pts = pts.where(post_id: id) if id.present?
+    pts = pts.where(tag_id:) if tag_id.present?
+    pts = pts.includes(:post, :created_user, :deleted_user,
+                       tag: [:deerjikists, :materials, { tag_name: :wiki_page }])
+
+    events = []
+    pts.each do |pt|
+      tag = TagRepr.base(pt.tag)
+      post = pt.post
+
+      events << Event.new(
+          post:,
+          tag:,
+          user: pt.created_user && { id: pt.created_user.id, name: pt.created_user.name },
+          change_type: 'add',
+          timestamp: pt.created_at)
+
+      if pt.discarded_at
+        events << Event.new(
+            post:,
+            tag:,
+            user: pt.deleted_user && { id: pt.deleted_user.id, name: pt.deleted_user.name },
+            change_type: 'remove',
+            timestamp: pt.discarded_at)
+      end
+    end
+    events.sort_by!(&:timestamp)
+    events.reverse!
+
+    render json: { changes: (events.slice(offset, limit) || []).as_json, count: events.size }
+  end
+
   private
 
   def filtered_posts
@@ -455,13 +502,13 @@ class PostsController < ApplicationController
       end
     end
 
-    PostTag.where(post_id: post.id, tag_id: to_remove.to_a).find_each do |pt|
+    PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
-      pt.destroy!
+      pt.discard_by!(current_user)
     end
   end
 
   def build_tag_tree_for post
-    post_tags = post.post_tags.reject { |post_tag| post_tag.tag.deprecated? }
+    post_tags = post.active_post_tags.reject { |post_tag| post_tag.tag.deprecated? }
     tags = post_tags.map(&:tag)
     tag_ids = tags.map(&:id)
 
@@ -652,10 +699,7 @@ class PostsController < ApplicationController
   end
 
   def editable_tag_names_from_version version
-    version.tags_json
+    version.tags.to_s.split.reject { |name| name.downcase.start_with?('nico:') }.sort
-        .reject { _1.fetch('category') == 'nico' }
-        .map { Post.tag_snapshot_literal(_1) }
-        .sort
   end
 
   def post_snapshot_from_record post
@@ -670,6 +714,7 @@ class PostsController < ApplicationController
   def editable_tag_names_from_post post
     post
         .post_tags
+        .kept
         .joins(tag: :tag_name)
         .merge(Tag.not_nico)
         .merge(Tag.where(deprecated_at: nil))

backend/app/controllers/tags_controller.rb

@@ -200,45 +200,14 @@ class TagsController < ApplicationController
              .find_by(id: params[:id])
     return head :not_found unless tag
 
-    rows = normalise_deerjikist_rows(tag)
-    return if performed?
-
     ApplicationRecord.transaction do
-      tag.lock!
+      tag.deerjikists = []
-
+      params[:_json].each.with_index do |item, i|
-      requested_keys = rows.map { |row| [row[:platform], row[:code]] }.uniq
+        platform = item[:platform]
-      row_indexes_by_key = rows_by_key(rows)
+        code = normalise_deerjikist_code(platform, item[:code])
-      locked_deerjikists = lock_deerjikists_for_tag_update(tag.id, requested_keys)
+        deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
-      current_deerjikists = locked_deerjikists.filter { |deerjikist|
+        deerjikist.tag = tag
-        deerjikist.tag_id == tag.id
+        render_deerjikist_form_record_invalid(deerjikist, i) unless deerjikist.save
-      }
-      requested_deerjikists = locked_deerjikists.filter { |deerjikist|
-        row_indexes_by_key.key?([deerjikist.platform, deerjikist.code])
-      }
-
-      render_deerjikist_conflicts(requested_deerjikists, row_indexes_by_key, tag)
-      raise ActiveRecord::Rollback if performed?
-
-      requested_keys_set = requested_keys.to_set
-      current_deerjikists.each do |deerjikist|
-        key = [deerjikist.platform, deerjikist.code]
-        deerjikist.destroy! unless requested_keys_set.include?(key)
-      end
-
-      existing_keys = requested_deerjikists.to_h { |deerjikist|
-        [[deerjikist.platform, deerjikist.code], true]
-      }
-      requested_keys.each do |platform, code|
-        next if existing_keys[[platform, code]]
-
-        deerjikist = Deerjikist.new(platform:, code:, tag:)
-        row_index = row_indexes_by_key[[platform, code]].first
-        begin
-          render_deerjikist_form_record_invalid(deerjikist, row_index) unless deerjikist.save
-        rescue ActiveRecord::RecordNotUnique
-          conflicts = lock_deerjikists_for_tag_update(tag.id, [[platform, code]])
-          render_deerjikist_conflicts(conflicts, row_indexes_by_key, tag)
-        end
         raise ActiveRecord::Rollback if performed?
       end
     end
@@ -684,7 +653,6 @@ class TagsController < ApplicationController
   end
 
   def normalise_deerjikist_code platform, code
-    code = code.to_s
     return code if platform != 'youtube' || code[0] != '@'
 
     url = "https://www.youtube.com/#{ code }"
@@ -701,82 +669,6 @@ class TagsController < ApplicationController
     nil
   end
 
-  def normalise_deerjikist_rows tag
-    rows = []
-
-    params[:_json].each.with_index do |item, index|
-      platform = item[:platform]
-      unless Deerjikist.platforms.key?(platform)
-        render_deerjikist_platform_invalid(index)
-        return rows
-      end
-
-      code = normalise_deerjikist_code(platform, item[:code])
-      deerjikist = Deerjikist.new(platform:, code:, tag:)
-      unless deerjikist.valid?
-        render_deerjikist_form_record_invalid(deerjikist, index)
-        return rows
-      end
-
-      rows << { index:, platform:, code: }
-    end
-
-    rows
-  end
-
-  def lock_deerjikists_for_tag_update tag_id, keys
-    clauses = ['tag_id = ?']
-    values = [tag_id]
-
-    keys.each do |platform, code|
-      clauses << '(platform = ? AND code = ?)'
-      values << platform << code
-    end
-
-    Deerjikist
-      .where(clauses.join(' OR '), *values)
-      .order(:platform, :code)
-      .lock
-      .to_a
-  end
-
-  def render_deerjikist_conflicts deerjikists, row_indexes_by_key, tag
-    conflicts = deerjikists.filter { |deerjikist| deerjikist.tag_id != tag.id }
-    return if conflicts.empty?
-
-    tag_names_by_id = Tag
-                      .joins(:tag_name)
-                      .where(id: conflicts.map(&:tag_id).uniq)
-                      .pluck('tags.id', 'tag_names.name')
-                      .to_h
-    fields = { }
-
-    conflicts.each do |deerjikist|
-      message = "この情報は既に「#{ tag_names_by_id[deerjikist.tag_id] }」に紐づいてゐます．"
-      row_indexes_by_key[[deerjikist.platform, deerjikist.code]].each do |index|
-        field = :"deerjikists.#{ index }.code"
-        fields[field] ||= []
-        fields[field] << message
-      end
-    end
-
-    render_validation_error fields:
-  end
-
-  def render_deerjikist_platform_invalid index
-    render_validation_error fields: {
-      :"deerjikists.#{ index }.platform" => ['値が不正です．'],
-    }
-  end
-
-  def rows_by_key rows
-    rows.each_with_object({ }) do |row, result|
-      key = [row[:platform], row[:code]]
-      result[key] ||= []
-      result[key] << row[:index]
-    end
-  end
-
   def render_deerjikist_form_record_invalid deerjikist, index
     fields = { }
 

backend/app/models/post.rb

@@ -55,10 +55,11 @@ class Post < ApplicationRecord
   belongs_to :uploaded_user, class_name: 'User', optional: true
 
   has_many :post_tags, dependent: :destroy, inverse_of: :post
-  has_many :tags, through: :post_tags
+  has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :post
+  has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
+  has_many :tags, through: :active_post_tags
   has_many :active_tags, -> { where(tags: { deprecated_at: nil }) },
-           through: :post_tags,
+           through: :active_post_tags, source: :tag
-           source: :tag
 
   has_many :user_post_views, dependent: :delete_all
   has_many :post_similarities, dependent: :delete_all
@@ -122,6 +123,7 @@ class Post < ApplicationRecord
 
   def snapshot_tag_names
     post_tags
+        .kept
         .joins(tag: :tag_name)
         .includes(:sections, tag: :tag_name)
         .order('tag_names.name')
@@ -135,33 +137,6 @@ class Post < ApplicationRecord
     end
   end
 
-  def self.tag_snapshot_literal tag
-    sections = tag.fetch('sections', []).map do |sec|
-      begin_ms = sec.fetch('begin_ms')
-      end_ms = sec['end_ms']
-
-      "[#{ Post.ms_to_time(begin_ms) }-#{ end_ms ? Post.ms_to_time(end_ms) : '' }]"
-    end
-
-    "#{ tag.fetch('name') }#{ sections.join }"
-  end
-
-  def snapshot_tags_json
-    post_tags
-        .joins(tag: :tag_name)
-        .includes(:sections, tag: :tag_name)
-        .order('tags.id')
-        .map do |pt|
-      { 'id' => pt.tag.id,
-        'version_no' => pt.tag.version_no,
-        'name' => pt.tag.name,
-        'category' => pt.tag.category,
-        'sections' => pt.sections.sort_by(&:begin_ms).map {
-          { 'begin_ms' => _1.begin_ms, 'end_ms' => _1.end_ms }
-        } }
-    end
-  end
-
   def self.section_literal section
     end_ms =
         section.end_ms ? Post.ms_to_time(section.end_ms) : ''

backend/app/models/post_tag.rb

@@ -1,7 +1,14 @@
 class PostTag < ApplicationRecord
+  include Discard::Model
+
+  before_destroy do
+    raise ActiveRecord::ReadOnlyRecord, '消さないでください．'
+  end
+
   belongs_to :post
   belongs_to :tag, counter_cache: :post_count
   belongs_to :created_user, class_name: 'User', optional: true
+  belongs_to :deleted_user, class_name: 'User', optional: true
 
   has_many :sections, -> { order(:begin_ms) }, class_name: 'PostTagSection',
                                                foreign_key: [:post_id, :tag_id],
@@ -11,5 +18,18 @@ class PostTag < ApplicationRecord
 
   validates :post_id, presence: true
   validates :tag_id, presence: true
-  validates :post_id, uniqueness: { scope: :tag_id }
+  validates :post_id, uniqueness: {
+      scope: :tag_id,
+      conditions: -> { where(discarded_at: nil) } }
+
+  def discard_by! deleted_user
+    return self if discarded?
+
+    transaction do
+      update!(discarded_at: Time.current, deleted_user:)
+      Tag.where(id: tag_id).update_all('post_count = GREATEST(post_count - 1, 0)')
+    end
+
+    self
+  end
 end

backend/app/models/post_tag_section.rb

@@ -4,10 +4,10 @@ class PostTagSection < ApplicationRecord
   belongs_to :post
   belongs_to :tag
 
-  belongs_to :post_tag, foreign_key: [:post_id, :tag_id],
+  belongs_to :post_tag, -> { kept }, foreign_key: [:post_id, :tag_id],
-                        primary_key: [:post_id, :tag_id],
+                                     primary_key: [:post_id, :tag_id],
-                        inverse_of: :sections,
+                                     inverse_of: :sections,
-                        optional: true
+                                     optional: true
 
   validates :post_id, presence: true
   validates :tag_id, presence: true

backend/app/models/tag.rb

@@ -28,7 +28,9 @@ class Tag < ApplicationRecord
   end
 
   has_many :post_tags, inverse_of: :tag
-  has_many :posts, through: :post_tags
+  has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
+  has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
+  has_many :posts, through: :active_post_tags
 
   has_many :nico_tag_relations, foreign_key: :nico_tag_id, dependent: :destroy
   has_many :linked_tags, through: :nico_tag_relations, source: :tag
@@ -257,11 +259,11 @@ class Tag < ApplicationRecord
 
         TagVersioning.ensure_snapshot!(source_tag, created_by_user:)
 
-        source_tag.post_tags.find_each do |source_pt|
+        source_tag.post_tags.kept.find_each do |source_pt|
           post_id = source_pt.post_id
           affected_post_ids << post_id
-          source_pt.destroy!
+          source_pt.discard_by!(created_by_user)
-          unless PostTag.exists?(post_id:, tag: target_tag)
+          unless PostTag.kept.exists?(post_id:, tag: target_tag)
             PostTag.create!(post_id:, tag: target_tag)
           end
         end
@@ -291,7 +293,7 @@ class Tag < ApplicationRecord
       end
 
       # 投稿件数を再集計
-      target_tag.update_columns(post_count: PostTag.where(tag: target_tag).count)
+      target_tag.update_columns(post_count: PostTag.kept.where(tag: target_tag).count)
     end
 
     target_tag.reload

backend/app/representations/post_repr.rb

@@ -88,14 +88,14 @@ module PostRepr
 
   def tag_json post
     post
-        .post_tags
+        .active_post_tags
         .reject { _1.tag.deprecated? }
         .sort_by { _1.tag.name }
-        .map do |post_tag|
+        .map { |post_tag|
       TagRepr.inline(post_tag.tag).merge(
           'children' => [],
           'sections' => post_tag.sections.as_json(only: [:begin_ms, :end_ms]))
-    end
+    }
   end
 
   def thumbnail_url post, host: nil

backend/app/services/post_creator.rb

@@ -121,11 +121,9 @@ class PostCreator
   def sync_post_tags! post, desired_tags, sections
     desired_ids = desired_tags.map(&:id).to_set
     current_ids = post.tags.pluck(:id).to_set
-
     Tag.where(id: desired_ids - current_ids).find_each do |tag|
       PostTag.create_or_find_by!(post:, tag:, created_user: @actor)
     end
-
     PostTagSection.where(post_id: post.id).destroy_all
     sections.each do |tag_id, ranges|
       ranges.each do |begin_ms, end_ms|
@@ -135,9 +133,10 @@ class PostCreator
                                end_ms:)
       end
     end
-
     PostTag.where(post_id: post.id,
-                  tag_id: (current_ids - desired_ids).to_a).destroy_all
+                  tag_id: (current_ids - desired_ids).to_a).kept.find_each do |post_tag|
+      post_tag.discard_by!(@actor)
+    end
   end
 
   def sync_parent_posts! post, ids

backend/app/services/post_version_recorder.rb

@@ -25,7 +25,6 @@ class PostVersionRecorder < VersionRecorder
       thumbnail_base: @record.thumbnail_base,
       video_ms: @record.video_ms,
       tags: @record.snapshot_tag_names.join(' '),
-      tags_json: @record.snapshot_tags_json,
       parent_post_ids: @record.snapshot_parent_post_ids.join(' '),
       original_created_from: @record.original_created_from,
       original_created_before: @record.original_created_before }

backend/app/services/youtube/sync.rb

@@ -103,7 +103,7 @@ module Youtube
     end
 
     def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
-      current_tag_ids ||= PostTag.where(post_id: post.id).pluck(:tag_id).to_set
+      current_tag_ids ||= PostTag.kept.where(post_id: post.id).pluck(:tag_id).to_set
       desired_tag_ids = desired_tag_ids.compact.to_set
 
       to_add = desired_tag_ids - current_tag_ids
@@ -117,8 +117,8 @@ module Youtube
         end
       end
 
-      PostTag.where(post_id: post.id, tag_id: to_remove.to_a).find_each do |pt|
+      PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
-        pt.destroy!
+        pt.discard_by!(nil)
       end
     end
 

backend/config/routes.rb

@@ -55,6 +55,7 @@ Rails.application.routes.draw do
       get :metadata
       post :bulk
       get :random
+      get :changes
       get :versions, to: 'post_versions#index'
     end
 

backend/db/migrate/20260727123600_add_tags_json_to_post_versions.rb

@@ -1,299 +0,0 @@
-class AddTagsJsonToPostVersions < ActiveRecord::Migration[8.0]
-  RESOLUTION_GRACE = 1.second
-  SECTION_LITERAL_PATTERN = /\[[^\[\]\s]*-[^\[\]\s]*\]\z/
-
-  class MigrationPostVersion < ActiveRecord::Base
-    self.table_name = 'post_versions'
-  end
-
-  class MigrationTag < ActiveRecord::Base
-    self.table_name = 'tags'
-  end
-
-  class MigrationTagName < ActiveRecord::Base
-    self.table_name = 'tag_names'
-  end
-
-  class MigrationTagVersion < ActiveRecord::Base
-    self.table_name = 'tag_versions'
-  end
-
-  class MigrationNicoTagVersion < ActiveRecord::Base
-    self.table_name = 'nico_tag_versions'
-  end
-
-  def up
-    add_column :post_versions, :tags_json, :json, after: :tags
-    MigrationPostVersion.reset_column_information
-
-    backfill_missing_initial_tag_versions!
-    intervals_by_name = build_intervals_by_name
-
-    say_with_time 'Backfilling post_versions.tags_json' do
-      MigrationPostVersion.where(tags_json: nil).find_each(batch_size: 500) do |version|
-        version.update_columns(tags_json: build_tags_json(version, intervals_by_name))
-      end
-    end
-
-    change_column_null :post_versions, :tags_json, false
-
-    schema = connection.quote(JSON.generate({
-        type: 'array',
-        items: { type: 'object',
-                 properties: { id: { type: 'integer', minimum: 1 },
-                               version_no: { type: 'integer', minimum: 1 },
-                               name: { type: 'string', minLength: 1 },
-                               category: { type: 'string', enum: ['deerjikist',
-                                                                  'meme',
-                                                                  'character',
-                                                                  'general',
-                                                                  'material',
-                                                                  'meta',
-                                                                  'nico'] },
-                               sections: { type: 'array',
-                                           items: { type: 'object',
-                                                    properties: { begin_ms: { type: 'integer',
-                                                                              minimum: 0 },
-                                                                  end_ms: { type: ['integer',
-                                                                                   'null'],
-                                                                            minimum: 0 } },
-                                                    required: ['begin_ms', 'end_ms'],
-                                                    additionalProperties: false } } },
-                 required: ['id', 'version_no', 'name', 'category', 'sections'],
-                 additionalProperties: false } }))
-
-    add_check_constraint :post_versions,
-                         "JSON_SCHEMA_VALID(#{ schema }, tags_json)",
-                         name: 'chk_post_versions_tags_json_schema'
-  end
-
-  def down
-    remove_check_constraint :post_versions, name: 'chk_post_versions_tags_json_schema'
-
-    remove_column :post_versions, :tags_json
-  end
-
-  private
-
-  def backfill_missing_initial_tag_versions!
-    say_with_time 'Backfilling missing initial tag versions' do
-      tag_rows = missing_initial_version_rows(MigrationTagVersion, nico: false)
-      nico_rows = missing_initial_version_rows(MigrationNicoTagVersion, nico: true)
-
-      MigrationTagVersion.insert_all!(tag_rows) if tag_rows.any?
-      MigrationNicoTagVersion.insert_all!(nico_rows) if nico_rows.any?
-
-      tag_rows.length + nico_rows.length
-    end
-  end
-
-  def missing_initial_version_rows version_class, nico:
-    first_versions =
-        version_class
-        .order(:tag_id, :version_no)
-        .to_a
-        .group_by(&:tag_id)
-        .transform_values(&:first)
-    rows = []
-
-    MigrationTag.find_each do |tag|
-      next if (tag.category == 'nico') != nico
-
-      first_version = first_versions[tag.id]
-      next unless first_version
-      next if valid_initial_version?(first_version)
-
-      assert_inferable_initial_version!(tag, first_version)
-      rows << initial_version_row(tag, first_version, nico:)
-    end
-
-    rows
-  end
-
-  def valid_initial_version? version
-    version.version_no == 1 && version.event_type == 'create'
-  end
-
-  def assert_inferable_initial_version! tag, version
-    inferable =
-        version.version_no == 2 &&
-        version.event_type == 'discard' &&
-        tag.created_at < version.created_at
-    return if inferable
-
-    details = [
-        "tag_id=#{ tag.id }",
-        "version_no=#{ version.version_no }",
-        "event_type=#{ version.event_type.inspect }",
-        "tag_created_at=#{ tag.created_at.iso8601(6) }",
-        "version_created_at=#{ version.created_at.iso8601(6) }"]
-
-    raise "Cannot infer initial tag version: #{ details.join(', ') }"
-  end
-
-  def initial_version_row tag, discard_version, nico:
-    row = {
-        tag_id: tag.id,
-        version_no: 1,
-        event_type: 'create',
-        name: discard_version.name,
-        created_at: tag.created_at,
-        created_by_user_id: nil }
-
-    if nico
-      return row.merge(linked_tags: discard_version.linked_tags)
-    end
-
-    row.merge(
-        category: discard_version.category,
-        aliases: discard_version.aliases,
-        parent_tag_ids: discard_version.parent_tag_ids,
-        deprecated_at: discard_version.deprecated_at)
-  end
-
-  def build_intervals_by_name
-    intervals_by_name = Hash.new { |hash, name| hash[name] = [] }
-    versions_by_kind = {
-        tag: versions_by_tag_id(MigrationTagVersion),
-        nico: versions_by_tag_id(MigrationNicoTagVersion) }
-    current_names = current_names_by_tag_id
-
-    MigrationTag.find_each do |tag|
-      nico = tag.category == 'nico'
-      kind = nico ? :nico : :tag
-      versions = versions_by_kind.fetch(kind).fetch(tag.id, [])
-
-      intervals_for(
-          tag,
-          versions,
-          current_name: current_names.fetch(tag.id),
-          nico:).each do |interval|
-        name = interval.delete(:name)
-        intervals_by_name[name] << interval
-      end
-    end
-
-    intervals_by_name
-  end
-
-  def versions_by_tag_id version_class
-    version_class
-        .order(:tag_id, :version_no)
-        .to_a
-        .group_by(&:tag_id)
-  end
-
-  def current_names_by_tag_id
-    MigrationTagName
-        .joins('INNER JOIN tags ON tags.tag_name_id = tag_names.id')
-        .pluck('tags.id', 'tag_names.name')
-        .to_h
-  end
-
-  def intervals_for tag, versions, current_name:, nico:
-    if versions.empty?
-      return [{
-          name: current_name,
-          tag_id: tag.id,
-          version_no: tag.version_no,
-          category: nico ? 'nico' : tag.category,
-          from: tag.created_at,
-          to: tag.discarded_at }]
-    end
-
-    versions.each_with_index.filter_map do |version, index|
-      next if version.event_type == 'discard'
-
-      {
-          name: version.name,
-          tag_id: tag.id,
-          version_no: version.version_no,
-          category: nico ? 'nico' : version.category,
-          from: version.created_at,
-          to: versions[index + 1]&.created_at || tag.discarded_at }
-    end
-  end
-
-  def build_tags_json version, intervals_by_name
-    entries = version.tags.to_s.split.map do |literal|
-      name = tag_name_from_literal(literal)
-      interval = resolve_tag!(intervals_by_name.fetch(name, []), name:, version:)
-
-      { 'id' => interval.fetch(:tag_id),
-        'version_no' => interval.fetch(:version_no),
-        'name' => name,
-        'category' => interval.fetch(:category),
-        'sections' => [] }
-    end
-
-    assert_unique_tag_ids!(version, entries)
-
-    entries.sort_by { |entry| entry.fetch('id') }
-  end
-
-  def tag_name_from_literal literal
-    name = literal.dup
-    name.sub!(SECTION_LITERAL_PATTERN, '') while name.match?(
-        SECTION_LITERAL_PATTERN)
-
-    if name.empty? || name.include?('[') || name.include?(']')
-      raise "Invalid legacy tag literal: #{ literal.inspect }"
-    end
-
-    name
-  end
-
-  def resolve_tag! intervals, name:, version:
-    time = version.created_at
-    candidates = intervals.select do |interval|
-      interval.fetch(:from) <= time &&
-        (interval[:to].nil? || time < interval.fetch(:to))
-    end
-
-    candidates = future_candidates(intervals, time) if candidates.empty?
-
-    return candidates.first if candidates.one?
-
-    candidate_versions = candidates.map do |candidate|
-      [candidate.fetch(:tag_id), candidate.fetch(:version_no)]
-    end
-    details = [
-        "post_version_id=#{ version.id }",
-        "post_id=#{ version.post_id }",
-        "name=#{ name.inspect }",
-        "created_at=#{ time.iso8601(6) }",
-        "candidates=#{ candidate_versions.inspect }"].join(', ')
-
-    raise "Could not resolve tag snapshot: #{ details }"
-  end
-
-  def future_candidates intervals, time
-    candidates = intervals.select do |interval|
-      interval.fetch(:from) > time &&
-        interval.fetch(:from) <= time + RESOLUTION_GRACE
-    end
-    return [] if candidates.empty?
-
-    nearest_from = candidates.map { |interval| interval.fetch(:from) }.min
-
-    candidates.select do |interval|
-      interval.fetch(:from) == nearest_from
-    end
-  end
-
-  def assert_unique_tag_ids! version, entries
-    duplicate_tag_ids =
-        entries
-        .map { |entry| entry.fetch('id') }
-        .tally
-        .select { |_tag_id, count| count > 1 }
-        .keys
-    return if duplicate_tag_ids.empty?
-
-    details = [
-        "post_version_id=#{ version.id }",
-        "duplicate_tag_ids=#{ duplicate_tag_ids.inspect }"].join(', ')
-
-    raise "Duplicate tag IDs: #{ details }"
-  end
-end

backend/db/migrate/20260921000000_delete_inactive_records_from_post_tags.rb

@@ -1,53 +0,0 @@
-class DeleteInactiveRecordsFromPostTags < ActiveRecord::Migration[8.0]
-  def up
-    execute <<~SQL
-      DELETE
-      FROM
-        post_tags
-      WHERE
-        discarded_at IS NOT NULL
-    SQL
-
-    remove_index :post_tags, [:tag_id, :discarded_at]
-    remove_index :post_tags, [:post_id, :discarded_at]
-    remove_index :post_tags, name: 'idx_post_tags_active_unique'
-    remove_index :post_tags, :discarded_at
-
-    remove_foreign_key :post_tags, column: :deleted_user_id
-    remove_index :post_tags, :deleted_user_id
-
-    remove_column :post_tags, :active_unique_key
-    remove_column :post_tags, :is_active
-    remove_column :post_tags, :discarded_at
-    remove_column :post_tags, :deleted_user_id
-    remove_column :post_tags, :updated_at
-
-    execute <<~SQL
-      ALTER TABLE
-        post_tags
-      MODIFY COLUMN
-        id BIGINT NOT NULL
-    SQL
-
-    execute <<~SQL
-      ALTER TABLE
-        post_tags
-      DROP PRIMARY KEY
-    SQL
-
-    remove_column :post_tags, :id
-
-    execute <<~SQL
-      ALTER TABLE
-        post_tags
-      ADD PRIMARY KEY
-        (post_id, tag_id)
-    SQL
-
-    remove_index :post_tags, :post_id
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration, '戻せません．'
-  end
-end

backend/db/migrate/20260921010000_add_foreign_key_on_post_id_and_tag_id_in_post_tag_sections.rb

@@ -1,11 +0,0 @@
-class AddForeignKeyOnPostIdAndTagIdInPostTagSections < ActiveRecord::Migration[8.0]
-  def change
-    remove_foreign_key :post_tag_sections, :posts, column: :post_id
-    remove_foreign_key :post_tag_sections, :tags, column: :tag_id
-
-    add_foreign_key :post_tag_sections, :post_tags,
-                    column: [:post_id, :tag_id],
-                    primary_key: [:post_id, :tag_id],
-                    on_delete: :cascade
-  end
-end

backend/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
+ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
   create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
@@ -311,12 +311,23 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
     t.check_constraint "`begin_ms` >= 0", name: "chk_post_tag_sections_begin_ms_natural"
   end
 
-  create_table "post_tags", primary_key: ["post_id", "tag_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "post_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "post_id", null: false
     t.bigint "tag_id", null: false
     t.bigint "created_user_id"
+    t.bigint "deleted_user_id"
     t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "discarded_at"
+    t.virtual "is_active", type: :boolean, as: "(`discarded_at` is null)", stored: true
+    t.virtual "active_unique_key", type: :string, as: "(case when (`discarded_at` is null) then concat(`post_id`,_utf8mb4':',`tag_id`) else NULL end)", stored: true
+    t.index ["active_unique_key"], name: "idx_post_tags_active_unique", unique: true
     t.index ["created_user_id"], name: "index_post_tags_on_created_user_id"
+    t.index ["deleted_user_id"], name: "index_post_tags_on_deleted_user_id"
+    t.index ["discarded_at"], name: "index_post_tags_on_discarded_at"
+    t.index ["post_id", "discarded_at"], name: "index_post_tags_on_post_id_and_discarded_at"
+    t.index ["post_id"], name: "index_post_tags_on_post_id"
+    t.index ["tag_id", "discarded_at"], name: "index_post_tags_on_tag_id_and_discarded_at"
     t.index ["tag_id"], name: "index_post_tags_on_tag_id"
   end
 
@@ -338,7 +349,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
     t.string "url", limit: 768, null: false
     t.string "thumbnail_base", limit: 2000
     t.text "tags", null: false
-    t.json "tags_json", null: false
     t.text "parent_post_ids", null: false
     t.datetime "original_created_from"
     t.datetime "original_created_before"
@@ -352,7 +362,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
     t.check_constraint "(`video_ms` is null) or (`video_ms` > 0)", name: "chk_post_versions_video_ms_positive"
     t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
     t.check_constraint "`version_no` > 0", name: "post_versions_version_no_positive"
-    t.check_constraint "json_schema_valid(_utf8mb4'{\"type\":\"array\",\"items\":{\"type\":\"object\",\"properties\":{\"id\":{\"type\":\"integer\",\"minimum\":1},\"version_no\":{\"type\":\"integer\",\"minimum\":1},\"name\":{\"type\":\"string\",\"minLength\":1},\"category\":{\"type\":\"string\",\"enum\":[\"deerjikist\",\"meme\",\"character\",\"general\",\"material\",\"meta\",\"nico\"]},\"sections\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"properties\":{\"begin_ms\":{\"type\":\"integer\",\"minimum\":0},\"end_ms\":{\"type\":[\"integer\",\"null\"],\"minimum\":0}},\"required\":[\"begin_ms\",\"end_ms\"],\"additionalProperties\":false}}},\"required\":[\"id\",\"version_no\",\"name\",\"category\",\"sections\"],\"additionalProperties\":false}}',`tags_json`)", name: "chk_post_versions_tags_json_schema"
   end
 
   create_table "posts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -384,6 +393,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
     t.index ["user_id"], name: "index_settings_on_user_id", unique: true
   end
 
+  create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "wiki_page_id", null: false
+    t.integer "no", null: false
+    t.string "alt_text"
+    t.binary "sha256", limit: 32, null: false
+    t.bigint "created_by_user_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
+    t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
+    t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
+  end
+
   create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "tag_id", null: false
     t.bigint "parent_tag_id", null: false
@@ -592,19 +614,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
     t.index ["banned_at"], name: "index_users_on_banned_at"
   end
 
-  create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "wiki_page_id", null: false
-    t.integer "no", null: false
-    t.string "alt_text"
-    t.binary "sha256", limit: 32, null: false
-    t.bigint "created_by_user_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
-    t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
-    t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
-  end
-
   create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "sha256", limit: 64, null: false
     t.text "body", null: false
@@ -713,10 +722,12 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
   add_foreign_key "post_implications", "posts", column: "parent_post_id"
   add_foreign_key "post_similarities", "posts"
   add_foreign_key "post_similarities", "posts", column: "target_post_id"
-  add_foreign_key "post_tag_sections", "post_tags", column: ["post_id", "tag_id"], primary_key: ["post_id", "tag_id"], on_delete: :cascade
+  add_foreign_key "post_tag_sections", "posts"
+  add_foreign_key "post_tag_sections", "tags"
   add_foreign_key "post_tags", "posts"
   add_foreign_key "post_tags", "tags"
   add_foreign_key "post_tags", "users", column: "created_user_id"
+  add_foreign_key "post_tags", "users", column: "deleted_user_id"
   add_foreign_key "post_versions", "posts"
   add_foreign_key "post_versions", "users", column: "created_by_user_id"
   add_foreign_key "posts", "users", column: "uploaded_user_id"

backend/lib/tasks/sync_nico.rake

@@ -16,7 +16,7 @@ namespace :nico do
     end
 
     def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
-      current_tag_ids ||= PostTag.where(post_id: post.id).pluck(:tag_id).to_set
+      current_tag_ids ||= PostTag.kept.where(post_id: post.id).pluck(:tag_id).to_set
       desired_tag_ids = desired_tag_ids.compact.to_set
 
       to_add = desired_tag_ids - current_tag_ids
@@ -30,8 +30,8 @@ namespace :nico do
         end
       end
 
-      PostTag.where(post_id: post.id, tag_id: to_remove.to_a).find_each do |pt|
+      PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
-        pt.destroy!
+        pt.discard_by!(nil)
       end
     end
 

backend/spec/models/post_tag_spec.rb

@@ -1,73 +1,5 @@
-require 'rails_helper'
-
 RSpec.describe PostTag, type: :model do
-  describe 'uniqueness' do
-    it 'rejects duplicate post and tag pairs but allows either to be reused' do
-      post_tag = create(:post_tag)
-      duplicate = build(:post_tag, post: post_tag.post, tag: post_tag.tag)
-
-      expect(duplicate).not_to be_valid
-      expect(duplicate.errors.of_kind?(:post_id, :taken)).to be(true)
-      expect(build(:post_tag, post: post_tag.post, tag: create(:tag))).to be_valid
-      expect(build(:post_tag, post: create(:post), tag: post_tag.tag)).to be_valid
-    end
-
-    it 'enforces uniqueness in the database when validation is bypassed' do
-      post_tag = create(:post_tag)
-      duplicate = build(:post_tag, post: post_tag.post, tag: post_tag.tag)
-
-      expect { duplicate.save!(validate: false) }
-          .to raise_error(ActiveRecord::RecordNotUnique)
-    end
-  end
-
-  describe '#destroy!' do
-    it 'deletes only the selected pair and its sections and updates the counter' do
-      post_tag = create(:post_tag)
-      same_post = create(:post_tag, post: post_tag.post)
-      same_tag = create(:post_tag, tag: post_tag.tag)
-      sections = [post_tag, same_post, same_tag].map do |link|
-        create(:post_tag_section, post: link.post, tag: link.tag,
-                                  begin_ms: 1000, end_ms: 2000)
-      end
-
-      expect { post_tag.destroy! }.to change(described_class, :count).by(-1)
-          .and change(PostTagSection, :count).by(-1)
-          .and change { post_tag.tag.reload.post_count }.from(2).to(1)
-
-      expect(described_class.exists?(post: post_tag.post, tag: post_tag.tag)).to be(false)
-      expect(same_post.reload).to be_persisted
-      expect(same_tag.reload).to be_persisted
-      expect(PostTagSection.all).to contain_exactly(*sections.drop(1))
-      expect(post_tag.post.reload.tags).to contain_exactly(same_post.tag)
-      expect(post_tag.tag.reload.posts).to contain_exactly(same_tag.post)
-    end
-
-    it 'allows a removed tag to be added again without restoring old sections' do
-      post_tag = create(:post_tag)
-      create(:post_tag_section, post: post_tag.post, tag: post_tag.tag,
-                                begin_ms: 1000, end_ms: 2000)
-      post_tag.destroy!
-
-      replacement = create(:post_tag, post: post_tag.post, tag: post_tag.tag)
-
-      expect(replacement.reload.sections).to be_empty
-      expect(replacement.tag.reload.post_count).to eq(1)
-    end
-  end
-
   describe '#sections' do
-    it 'loads the owning post_tag from a section using both keys' do
-      post_tag = create(:post_tag)
-      create(:post_tag, post: post_tag.post)
-      create(:post_tag, tag: post_tag.tag)
-      section = create(:post_tag_section, post: post_tag.post,
-                                         tag: post_tag.tag,
-                                         begin_ms: 1000, end_ms: 2000)
-
-      expect(section.reload.post_tag).to eq(post_tag)
-    end
-
     it 'loads sections by post_id and tag_id' do
       post_tag = create(:post_tag)
       section = create(:post_tag_section,
@@ -80,25 +12,18 @@ RSpec.describe PostTag, type: :model do
     end
 
     it 'does not load sections for another tag on the same post' do
-      post_tag = create(:post_tag)
+      post = create(:post)
-      post = post_tag.post
+      tag = create(:tag)
       other_tag = create(:tag)
 
-      own_section = create(:post_tag_section,
+      post_tag = create(:post_tag, post:, tag:)
-                           post:,
-                           tag: post_tag.tag,
-                           begin_ms: 1000,
-                           end_ms: 2000)
-
-      create(:post_tag, post:, tag: other_tag)
-
       create(:post_tag_section,
              post:,
              tag: other_tag,
              begin_ms: 1000,
              end_ms: 2000)
 
-      expect(post_tag.reload.sections).to contain_exactly(own_section)
+      expect(post_tag.sections).to be_empty
     end
 
     it 'allows open-ended sections' do

backend/spec/models/post_version_spec.rb

@@ -19,7 +19,6 @@ RSpec.describe PostVersion, type: :model do
       url: post_record.url,
       thumbnail_base: post_record.thumbnail_base,
       tags: post_record.snapshot_tag_names.join(' '),
-      tags_json: post_record.snapshot_tags_json,
       parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
       original_created_from: post_record.original_created_from,
       original_created_before: post_record.original_created_before,

backend/spec/models/tag_spec.rb

@@ -185,14 +185,15 @@ RSpec.describe Tag, type: :model do
     context 'when merging a simple source tag' do
       let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
 
-      it 'deletes the source link, links the target, and aliases the discarded source tag' do
+      it 'discards the source post_tag, creates an active target post_tag, discards the source tag, and aliases the source tag_name' do
         described_class.merge_tags!(target_tag, [source_tag])
 
-        target_link = PostTag.find_by(post: post_record, tag: target_tag)
+        source_pt = PostTag.with_discarded.find(source_post_tag.id)
+        active_target = PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)
 
-        expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
+        expect(source_pt.discarded_at).to be_present
-        expect(target_link).to be_present
+        expect(source_pt.tag_id).to eq(source_tag.id)
-        expect(source_tag.reload.post_count).to eq(0)
+        expect(active_target).to be_present
 
         expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
         expect(TagName.with_discarded.find(source_tag_name.id)).not_to be_discarded
@@ -205,22 +206,16 @@ RSpec.describe Tag, type: :model do
       let!(:target_post_tag) { PostTag.create!(post: post_record, tag: target_tag) }
       let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
 
-      it 'deletes the source link and preserves the existing target link' do
+      it 'discards the source post_tag, keeps one active target post_tag, discards the source tag, and aliases the source tag_name' do
-        create(:post_tag_section, post: post_record, tag: source_tag,
-                                  begin_ms: 1000, end_ms: 2000)
-        target_section = create(:post_tag_section, post: post_record,
-                                                   tag: target_tag,
-                                                   begin_ms: 3000, end_ms: nil)
-
         described_class.merge_tags!(target_tag, [source_tag])
 
-        target_links = PostTag.where(post: post_record, tag: target_tag)
+        source_pt = PostTag.with_discarded.find(source_post_tag.id)
+        active = PostTag.kept.where(post_id: post_record.id, tag_id: target_tag.id)
 
-        expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
+        expect(source_pt.discarded_at).to be_present
-        expect(target_links).to contain_exactly(target_post_tag)
+        expect(source_pt.tag_id).to eq(source_tag.id)
-        expect(source_tag.reload.post_count).to eq(0)
+        expect(active.count).to eq(1)
-        expect(PostTagSection.where(post: post_record, tag: source_tag)).to be_empty
+        expect(active.first.id).to eq(target_post_tag.id)
-        expect(target_post_tag.reload.sections).to contain_exactly(target_section)
 
         expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
         expect(TagName.with_discarded.find(source_tag_name.id)).not_to be_discarded
@@ -235,12 +230,14 @@ RSpec.describe Tag, type: :model do
       it 'ignores the target in source_tags while still merging the source tag' do
         described_class.merge_tags!(target_tag, [source_tag, target_tag])
 
-        target_link = PostTag.find_by(post: post_record, tag: target_tag)
+        source_pt = PostTag.with_discarded.find(source_post_tag.id)
+        active_target = PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)
 
         expect(Tag.find(target_tag.id)).to be_present
         expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
-        expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
+        expect(source_pt.discarded_at).to be_present
-        expect(target_link).to be_present
+        expect(source_pt.tag_id).to eq(source_tag.id)
+        expect(active_target).to be_present
         expect(source_tag_name.reload.canonical_id).to eq(target_tag.tag_name_id)
         expect(target_tag.reload.post_count).to eq(1)
       end
@@ -266,10 +263,13 @@ RSpec.describe Tag, type: :model do
       it 'still merges, but discards the source tag_name instead of aliasing it' do
         described_class.merge_tags!(target_tag, [source_tag])
 
-        target_link = PostTag.find_by(post: post_record, tag: target_tag)
+        source_pt = PostTag.with_discarded.find(source_post_tag.id)
+        active_target = PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)
+        discarded_source_tag_name = TagName.with_discarded.find(source_tag_name.id)
 
-        expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
+        expect(source_pt.discarded_at).to be_present
-        expect(target_link).to be_present
+        expect(source_pt.tag_id).to eq(source_tag.id)
+        expect(active_target).to be_present
 
         expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
         expect(target_tag.reload.post_count).to eq(1)
@@ -289,20 +289,14 @@ RSpec.describe Tag, type: :model do
       end
 
       it 'rolls back the transaction' do
-        source_section = create(:post_tag_section, post: post_record,
-                                                   tag: source_tag,
-                                                   begin_ms: 1000, end_ms: 2000)
-
         expect {
           described_class.merge_tags!(target_tag, [source_tag])
         }.to raise_error(ActiveRecord::RecordInvalid)
 
         expect(Tag.with_discarded.find(source_tag.id)).not_to be_discarded
         expect(TagName.with_discarded.find(source_tag_name.id)).not_to be_discarded
-        expect(source_post_tag.reload.tag_id).to eq(source_tag.id)
+        expect(PostTag.kept.find(source_post_tag.id).tag_id).to eq(source_tag.id)
-        expect(source_post_tag.sections).to contain_exactly(source_section)
+        expect(PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)).to be_nil
-        expect(PostTag.find_by(post: post_record, tag: target_tag)).to be_nil
-        expect(source_tag.reload.post_count).to eq(1)
         expect(source_tag_name.reload.canonical_id).to be_nil
         expect(target_tag.reload.post_count).to eq(0)
       end
@@ -339,7 +333,6 @@ RSpec.describe Tag, type: :model do
         url: post.url,
         thumbnail_base: post.thumbnail_base,
         tags: snapshot_tags(post),
-        tags_json: post.snapshot_tags_json,
         parent_post_ids: post.snapshot_parent_post_ids.join(' '),
         original_created_from: post.original_created_from,
         original_created_before: post.original_created_before,
@@ -371,15 +364,12 @@ RSpec.describe Tag, type: :model do
         expect(latest.event_type).to eq('update')
         expect(latest.created_by_user).to be_nil
         expect(latest.tags).to eq(snapshot_tags(post_record.reload))
-        expect(latest.tags_json.map { |item| item.fetch('id') }).to eq([target_tag.id])
-        expect(affected_versions.first.tags_json.map { |item| item.fetch('id') })
-            .to eq([source_tag.id])
 
         expect(unaffected_post.reload.post_versions.count).to eq(1)
       end
     end
 
-    context 'when the source tag has no post_tags' do
+    context 'when the source tag has no active post_tags' do
       let!(:another_post) do
         Post.create!(url: 'https://example.com/posts/3', title: 'another post')
       end

backend/spec/requests/posts_spec.rb

@@ -55,7 +55,6 @@ RSpec.describe 'Posts API', type: :request do
             thumbnail_base: post.thumbnail_base,
             video_ms: post.video_ms,
             tags: post.snapshot_tag_names.join(' '),
-            tags_json: post.snapshot_tags_json,
             parent_post_ids: post.snapshot_parent_post_ids.join(' '),
             original_created_from: post.original_created_from,
             original_created_before: post.original_created_before,
@@ -148,15 +147,12 @@ RSpec.describe 'Posts API', type: :request do
 
     it 'keeps children and sections keys in non-detail tag responses' do
       PostTagSection.create!(post: hit_post, tag:, begin_ms: 1_000, end_ms: nil)
-      deprecated_tag = create(:tag, deprecated_at: Time.current)
-      create(:post_tag, post: hit_post, tag: deprecated_tag)
 
       get '/posts'
 
       expect(response).to have_http_status(:ok)
 
       hit_json = json.fetch('posts').find { |post| post['id'] == hit_post.id }
-      expect(hit_json.fetch('tags').map { |item| item.fetch('id') }).to eq([tag.id])
       tag_json = hit_json.fetch('tags').find { |item| item['name'] == 'spec_tag' }
 
       expect(tag_json.fetch('children')).to eq([])
@@ -165,26 +161,6 @@ RSpec.describe 'Posts API', type: :request do
       ])
     end
 
-    it 'preloads tag details and sections as the number of posts grows' do
-      5.times do
-        link = create(:post_tag, post: create(:post, uploaded_user: user))
-        create(:post_tag_section, post: link.post, tag: link.tag,
-                                  begin_ms: 1000, end_ms: 2000)
-      end
-      get '/posts', params: { limit: 1 }
-
-      one_post_queries = count_sql_queries do
-        get '/posts', params: { limit: 1 }
-      end
-      many_post_queries = count_sql_queries do
-        get '/posts', params: { limit: 20 }
-      end
-
-      expect(response).to have_http_status(:ok)
-      expect(json.fetch('posts').size).to eq(8)
-      expect(many_post_queries).to be <= one_post_queries
-    end
-
     context 'when q is provided' do
       it 'filters posts by q (hit case)' do
         get '/posts', params: { tags: 'spec_tag' }
@@ -483,71 +459,6 @@ RSpec.describe 'Posts API', type: :request do
       end
     end
 
-    context 'when update times include version history' do
-      let(:t0) { Time.zone.parse('2020-01-01 12:00:00') }
-      let(:t1) { t0 + 1.day }
-      let(:t2) { t0 + 2.days }
-      let(:t3) { t0 + 3.days }
-      let!(:history_post) do
-        create(:post, url: 'https://example.com/version-time/history',
-                      created_at: t0, updated_at: t0)
-      end
-      let!(:plain_post) do
-        create(:post, url: 'https://example.com/version-time/plain',
-                      created_at: t1, updated_at: t1)
-      end
-      let!(:newer_post) do
-        create(:post, url: 'https://example.com/version-time/newer',
-                      created_at: t0, updated_at: t3)
-      end
-
-      before do
-        link = create(:post_tag, post: history_post, tag:)
-        travel_to(t0) do
-          PostVersionRecorder.record!(post: history_post,
-                                      event_type: :create, created_by_user: nil)
-          PostVersionRecorder.record!(post: newer_post,
-                                      event_type: :create, created_by_user: nil)
-        end
-        travel_to(t2) do
-          link.destroy!
-          PostVersionRecorder.record!(post: history_post,
-                                      event_type: :update, created_by_user: nil)
-        end
-        create(:post_tag, post: plain_post, tag:, created_at: t3)
-      end
-
-      ['asc', 'desc'].each do |direction|
-        it "sorts by the later of post update and latest version time (#{ direction })" do
-          get '/posts', params: { url: '/version-time/', order: "updated_at:#{ direction }" }
-
-          expect(response).to have_http_status(:ok)
-          expected_ids = [plain_post.id, history_post.id, newer_post.id]
-          expected_ids.reverse! if direction == 'desc'
-          expect(json.fetch('posts').map { |item| item.fetch('id') }).to eq(expected_ids)
-          expect(json.fetch('count')).to eq(3)
-
-          times = json.fetch('posts').to_h do |item|
-            [item.fetch('id'), Time.zone.parse(item.fetch('updated_at'))]
-          end
-          expect(times).to eq({ plain_post.id => t1,
-                               history_post.id => t2,
-                               newer_post.id => t3 })
-          expect(history_post.reload.updated_at).to eq(t0)
-        end
-      end
-
-      it 'filters inclusively by the latest version time after a tag is deleted' do
-        get '/posts', params: { url: '/version-time/',
-                               updated_from: t2.iso8601,
-                               updated_to: t2.iso8601 }
-
-        expect(response).to have_http_status(:ok)
-        expect(json.fetch('posts').map { |item| item.fetch('id') }).to eq([history_post.id])
-        expect(json.fetch('count')).to eq(1)
-      end
-    end
-
     context 'when original_created_from/original_created_to are provided' do
       # 注意: controller の現状ロジックに合わせてる
       # original_created_from は `original_created_before > ?`
@@ -1507,11 +1418,9 @@ RSpec.describe 'Posts API', type: :request do
 
     it '200 and updates title + resync tags when member' do
       sign_in_as(member)
-      create(:post_tag_section, post: post_record, tag:,
-                                begin_ms: 1000, end_ms: 2000)
 
       tn2 = TagName.create!(name: 'spec_tag_2')
-      replacement_tag = Tag.create!(tag_name: tn2, category: :general)
+      Tag.create!(tag_name: tn2, category: :general)
 
       put "/posts/#{post_record.id}", params: post_update_params(
           post_record,
@@ -1524,38 +1433,6 @@ RSpec.describe 'Posts API', type: :request do
 
       names = json['tags'].map { |n| n['name'] }
       expect(names).to include('spec_tag_2')
-      expect(names).not_to include('spec_tag')
-      expect(PostTag.exists?(post: post_record, tag:)).to be(false)
-      expect(PostTagSection.exists?(post: post_record, tag:)).to be(false)
-      expect(tag.reload.post_count).to eq(0)
-      expect(replacement_tag.reload.post_count).to eq(1)
-
-      versions = post_record.post_versions.order(:version_no)
-      expect(versions.first.tags_json).to include(
-          a_hash_including('id' => tag.id,
-                           'sections' => [{ 'begin_ms' => 1000, 'end_ms' => 2000 }]))
-      expect(versions.last.tags_json.map { |item| item.fetch('id') })
-          .not_to include(tag.id)
-    end
-
-    it 'can add a removed tag again and records both changes' do
-      sign_in_as(member)
-
-      put "/posts/#{ post_record.id }", params: post_update_params(post_record, tags: '')
-      expect(response).to have_http_status(:ok)
-      expect(PostTag.exists?(post: post_record, tag:)).to be(false)
-
-      put "/posts/#{ post_record.id }", params: post_update_params(
-          post_record, tags: 'spec_tag')
-
-      expect(response).to have_http_status(:ok)
-      expect(PostTag.where(post: post_record, tag:).count).to eq(1)
-      expect(PostTag.find_by!(post: post_record, tag:).created_user).to eq(member)
-      expect(tag.reload.post_count).to eq(1)
-      snapshots = post_record.post_versions.order(:version_no).map do |version|
-        version.tags_json.map { |item| item.fetch('id') }
-      end
-      expect(snapshots.map { |ids| ids.include?(tag.id) }).to eq([true, false, true])
     end
 
     it 'rejects a deprecated tag specified directly' do
@@ -2001,29 +1878,123 @@ RSpec.describe 'Posts API', type: :request do
       expect(response).to have_http_status(:not_found)
     end
 
-    it 'returns viewed state and current tags with their sections' do
+    it '200 and returns viewed boolean' do
-      create(:post_tag_section, post: post_record, tag:,
-                                begin_ms: 1000, end_ms: nil)
-      deprecated_tag = create(:tag, deprecated_at: Time.current)
-      create(:post_tag, post: post_record, tag: deprecated_tag)
-
       get '/posts/random'
-
       expect(response).to have_http_status(:ok)
       expect(json).to have_key('viewed')
       expect([true, false]).to include(json['viewed'])
-      expect(json.fetch('tags')).to contain_exactly(
-          a_hash_including('id' => tag.id,
-                           'children' => [],
-                           'sections' => [{ 'begin_ms' => 1000, 'end_ms' => nil }]))
     end
   end
 
   describe 'GET /posts/changes' do
-    it 'returns 404 for the retired history endpoint' do
+    let(:member) { create(:user, :member) }
-      get '/posts/changes'
 
-      expect(response).to have_http_status(:not_found)
+    it 'returns add/remove events (history) for a post' do
+      # add
+      tn2 = TagName.create!(name: 'spec_tag2')
+      tag2 = Tag.create!(tag_name: tn2, category: :general)
+      pt = PostTag.create!(post: post_record, tag: tag2, created_user: member)
+
+      # remove (discard)
+      pt.discard_by!(member)
+
+      get '/posts/changes', params: { id: post_record.id }
+
+      expect(response).to have_http_status(:ok)
+      expect(json).to include('changes', 'count')
+      expect(json['changes']).to be_an(Array)
+      expect(json['count']).to be >= 2
+
+      types = json['changes'].map { |e| e['change_type'] }.uniq
+      expect(types).to include('add')
+      expect(types).to include('remove')
+    end
+
+    it 'filters history by tag' do
+      tn2 = TagName.create!(name: 'history_tag_hit')
+      tag2 = Tag.create!(tag_name: tn2, category: :general)
+
+      tn3 = TagName.create!(name: 'history_tag_miss')
+      tag3 = Tag.create!(tag_name: tn3, category: :general)
+
+      other_post = Post.create!(
+        title: 'other post',
+        url: 'https://example.com/history-other'
+      )
+
+      # hit: add
+      PostTag.create!(post: post_record, tag: tag2, created_user: member)
+
+      # hit: add + remove
+      pt2 = PostTag.create!(post: other_post, tag: tag2, created_user: member)
+      pt2.discard_by!(member)
+
+      # miss: add + remove
+      pt3 = PostTag.create!(post: post_record, tag: tag3, created_user: member)
+      pt3.discard_by!(member)
+
+      get '/posts/changes', params: { tag: tag2.id }
+
+      expect(response).to have_http_status(:ok)
+      expect(json).to include('changes', 'count')
+      expect(json['count']).to eq(3)
+
+      changes = json.fetch('changes')
+
+      expect(changes.map { |e| e.dig('tag', 'id') }.uniq).to eq([tag2.id])
+      expect(changes.map { |e| e['change_type'] }).to match_array(%w[add add remove])
+      expect(changes.map { |e| e.dig('post', 'id') }).to match_array([
+        post_record.id,
+        other_post.id,
+        other_post.id
+      ])
+    end
+
+    it 'filters history by post and tag together' do
+      tn2 = TagName.create!(name: 'history_tag_combo_hit')
+      tag2 = Tag.create!(tag_name: tn2, category: :general)
+
+      tn3 = TagName.create!(name: 'history_tag_combo_miss')
+      tag3 = Tag.create!(tag_name: tn3, category: :general)
+
+      other_post = Post.create!(
+        title: 'other combo post',
+        url: 'https://example.com/history-combo-other'
+      )
+
+      # hit
+      PostTag.create!(post: post_record, tag: tag2, created_user: member)
+
+      # miss by post
+      pt2 = PostTag.create!(post: other_post, tag: tag2, created_user: member)
+      pt2.discard_by!(member)
+
+      # miss by tag
+      pt3 = PostTag.create!(post: post_record, tag: tag3, created_user: member)
+      pt3.discard_by!(member)
+
+      get '/posts/changes', params: { id: post_record.id, tag: tag2.id }
+
+      expect(response).to have_http_status(:ok)
+      expect(json).to include('changes', 'count')
+      expect(json['count']).to eq(1)
+
+      changes = json.fetch('changes')
+      expect(changes.size).to eq(1)
+      expect(changes[0]['change_type']).to eq('add')
+      expect(changes[0].dig('post', 'id')).to eq(post_record.id)
+      expect(changes[0].dig('tag', 'id')).to eq(tag2.id)
+    end
+
+    it 'returns empty history when tag does not match' do
+      tn2 = TagName.create!(name: 'history_tag_no_hit')
+      tag2 = Tag.create!(tag_name: tn2, category: :general)
+
+      get '/posts/changes', params: { tag: tag2.id }
+
+      expect(response).to have_http_status(:ok)
+      expect(json.fetch('changes')).to eq([])
+      expect(json.fetch('count')).to eq(0)
     end
   end
 
@@ -2053,7 +2024,6 @@ RSpec.describe 'Posts API', type: :request do
         url: post.url,
         thumbnail_base: post.thumbnail_base,
         tags: snapshot_tags(post),
-        tags_json: post.snapshot_tags_json,
         parent_post_ids: post.snapshot_parent_post_ids.join(' '),
         original_created_from: post.original_created_from,
         original_created_before: post.original_created_before,
@@ -2075,7 +2045,7 @@ RSpec.describe 'Posts API', type: :request do
     end
 
     let!(:v2) do
-      post_record.post_tags.find_by!(tag: tag).destroy!
+      post_record.post_tags.kept.find_by!(tag: tag).discard_by!(member)
       PostTag.create!(post: post_record, tag: tag2, created_user: member)
       post_record.update!(
         title: 'updated spec post',

backend/spec/requests/tags_deerjikists_spec.rb

@@ -226,14 +226,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
               [platform2, code2],
             )
         end
-
-        it 'locks the tag before replacing the complete list' do
-          expect_any_instance_of(Tag).to receive(:lock!).and_call_original
-
-          do_request
-
-          expect(response).to have_http_status(:ok)
-        end
       end
 
       context 'when tag already has deerjikists' do
@@ -307,81 +299,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
         end
       end
 
-      context 'when platform is outside the enum' do
-        let(:payload) do
-          [
-            { platform: 'invalid', code: code1 },
-          ]
-        end
-
-        it 'returns 422 with an indexed platform error without changing the list' do
-          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
-
-          expect {
-            do_request
-          }.not_to change { Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] } }
-
-          expect(response).to have_http_status(:unprocessable_entity)
-          expect(json.fetch('errors')).to include(
-            'deerjikists.0.platform' => [be_present],
-          )
-        end
-      end
-
-      context 'when a requested deerjikist belongs to another tag' do
-        let!(:other_tag) { create(:tag, category: :deerjikist) }
-        let!(:owned_deerjikist) do
-          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
-        end
-        let!(:conflicting_deerjikist) do
-          Deerjikist.create!(platform: platform2, code: code2, tag: other_tag)
-        end
-        let(:payload) do
-          [
-            { platform: 'nico', code: 'new-code' },
-            { platform: platform2, code: code2 },
-          ]
-        end
-
-        before do
-          other_tag.tag_name.update!(name: 'existing-deerjikist')
-        end
-
-        it 'returns an indexed 422 error and rolls back the complete replacement' do
-          expect {
-            do_request
-          }.not_to change { Deerjikist.order(:platform, :code).pluck(:platform, :code, :tag_id) }
-
-          expect(response).to have_http_status(:unprocessable_entity)
-          expect(json.fetch('errors')).to include(
-            'deerjikists.1.code' => [include('existing-deerjikist')],
-          )
-          expect(owned_deerjikist.reload.tag_id).to eq(tag.id)
-          expect(conflicting_deerjikist.reload.tag_id).to eq(other_tag.id)
-        end
-      end
-
-      context 'when a requested deerjikist already belongs to the same tag' do
-        let!(:existing_deerjikist) do
-          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
-        end
-        let(:payload) do
-          [
-            { platform: platform1, code: code1 },
-          ]
-        end
-
-        it 'keeps the existing row' do
-          expect {
-            do_request
-          }.not_to change { existing_deerjikist.reload.created_at }
-
-          expect(response).to have_http_status(:ok)
-          expect(Deerjikist.where(tag: tag).pluck(:platform, :code))
-            .to eq([[platform1, code1]])
-        end
-      end
-
       context 'when youtube code is handle' do
         let(:channel_id) { 'UCabcdefghijklmnopqrstuv' }
         let(:payload) do

backend/spec/services/youtube/sync_spec.rb

@@ -268,10 +268,6 @@ RSpec.describe Youtube::Sync do
       expect(tag_ids).to include(deerjikist_tag.id)
       expect(tag_ids).not_to include(Tag.no_deerjikist.id)
 
-      expect(PostTag.exists?(post:, tag: Tag.no_deerjikist)).to be(false)
-      expect(Tag.no_deerjikist.reload.post_count).to eq(0)
-      expect(deerjikist_tag.reload.post_count).to eq(1)
-
       expect(PostVersionRecorder).to have_received(:ensure_snapshot!).with(
         post,
         created_by_user: nil

backend/spec/tasks/nico_sync_spec.rb

@@ -108,7 +108,7 @@ RSpec.describe 'nico:sync' do
     expect(calls).to eq(2)
   end
 
-  it '古い nico tag の関連を物理削除し、変更前後の履歴を version に残す' do
+  it '既存 post にあった古い nico tag は active から外され、履歴として discard される' do
     post = Post.create!(
       title: 'old',
       url: 'https://www.nicovideo.jp/watch/sm9',
@@ -117,8 +117,8 @@ RSpec.describe 'nico:sync' do
 
     # 旧nicoタグ（今回の同期結果に含まれない）
     old_nico = create_tag!('nico:OLD', category: 'nico')
-    PostTag.create!(post:, tag: old_nico)
+    old_pt = PostTag.create!(post: post, tag: old_nico)
-    create_post_version_for!(post)
+    expect(old_pt.discarded_at).to be_nil
 
     # 今回は NEW のみ欲しい
     new_nico = create_tag!('nico:NEW', category: 'nico')
@@ -132,17 +132,9 @@ RSpec.describe 'nico:sync' do
 
     run_rake_task('nico:sync')
 
-    expect(PostTag.exists?(post:, tag: old_nico)).to be(false)
+    # OLD は active から外れる（discarded_at が入る）
-    expect(old_nico.reload.post_count).to eq(0)
+    old_pts = PostTag.where(post_id: post.id, tag_id: old_nico.id).order(:id).to_a
-    expect(new_nico.reload.post_count).to eq(1)
+    expect(old_pts.last.discarded_at).to be_present
-
-    versions = post.post_versions.order(:version_no)
-    expect(versions.first.tags_json.map { |item| item.fetch('id') })
-        .to include(old_nico.id)
-    expect(versions.last.tags_json.map { |item| item.fetch('id') })
-        .to include(new_nico.id)
-    expect(versions.last.tags_json.map { |item| item.fetch('id') })
-        .not_to include(old_nico.id)
 
     # NEW は active にいる
     post.reload
@@ -164,7 +156,6 @@ RSpec.describe 'nico:sync' do
       url: post.url,
       thumbnail_base: post.thumbnail_base,
       tags: snapshot_tags(post),
-      tags_json: post.snapshot_tags_json,
       parent_post_ids: post.snapshot_parent_post_ids.join(' '),
       original_created_from: post.original_created_from,
       original_created_before: post.original_created_before,