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

backend/app/models/post.rb

@@ -55,25 +55,27 @@ class Post < ApplicationRecord
   belongs_to :uploaded_user, class_name: 'User', optional: true
 
   has_many :post_tags, dependent: :destroy, inverse_of: :post
-  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 :tags, through: :post_tags
   has_many :active_tags, -> { where(tags: { deprecated_at: nil }) },
-           through: :active_post_tags, source: :tag
+           through: :post_tags,
+           source: :tag
 
   has_many :user_post_views, dependent: :delete_all
   has_many :post_similarities, dependent: :delete_all
   has_many :post_versions
+
   has_many :gekanator_guessed_games,
            class_name: 'GekanatorGame',
            foreign_key: :guessed_post_id,
            dependent: :delete_all,
            inverse_of: :guessed_post
+
   has_many :gekanator_correct_games,
            class_name: 'GekanatorGame',
            foreign_key: :correct_post_id,
            dependent: :delete_all,
            inverse_of: :correct_post
+
   has_many :gekanator_question_examples, dependent: :delete_all
 
   has_many :parent_post_implications,
@@ -123,7 +125,6 @@ class Post < ApplicationRecord
 
   def snapshot_tag_names
     post_tags
-        .kept
         .joins(tag: :tag_name)
         .includes(:sections, tag: :tag_name)
         .order('tag_names.name')
@@ -150,7 +151,6 @@ class Post < ApplicationRecord
 
   def snapshot_tags_json
     post_tags
-        .kept
         .joins(tag: :tag_name)
         .includes(:sections, tag: :tag_name)
         .order('tags.id')

backend/app/models/post_tag.rb

@@ -1,14 +1,7 @@
 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],
@@ -18,18 +11,5 @@ class PostTag < ApplicationRecord
 
   validates :post_id, presence: true
   validates :tag_id, presence: true
-  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
+  validates :post_id, uniqueness: { scope: :tag_id }
 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, -> { kept }, foreign_key: [:post_id, :tag_id],
-                                     primary_key: [:post_id, :tag_id],
-                                     inverse_of: :sections,
-                                     optional: true
+  belongs_to :post_tag, foreign_key: [:post_id, :tag_id],
+                        primary_key: [:post_id, :tag_id],
+                        inverse_of: :sections,
+                        optional: true
 
   validates :post_id, presence: true
   validates :tag_id, presence: true

backend/app/models/tag.rb

@@ -2,8 +2,6 @@ require 'set'
 
 
 class Tag < ApplicationRecord
-  include MyDiscard
-
   class NicoTagNormalisationError < ArgumentError
     ;
   end
@@ -28,9 +26,7 @@ class Tag < ApplicationRecord
   end
 
   has_many :post_tags, inverse_of: :tag
-  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 :posts, through: :post_tags
 
   has_many :nico_tag_relations, foreign_key: :nico_tag_id, dependent: :destroy
   has_many :linked_tags, through: :nico_tag_relations, source: :tag
@@ -272,11 +268,11 @@ class Tag < ApplicationRecord
 
         TagVersioning.ensure_snapshot!(source_tag, created_by_user:)
 
-        source_tag.post_tags.kept.find_each do |source_pt|
+        source_tag.post_tags.find_each do |source_pt|
           post_id = source_pt.post_id
           affected_post_ids << post_id
-          source_pt.discard_by!(created_by_user)
-          unless PostTag.kept.exists?(post_id:, tag: target_tag)
+          source_pt.destroy!
+          unless PostTag.exists?(post_id:, tag: target_tag)
             PostTag.create!(post_id:, tag: target_tag)
           end
         end
@@ -288,10 +284,10 @@ class Tag < ApplicationRecord
         end
 
         TagVersioning.record!(source_tag, event_type: :discard, created_by_user:)
-        source_tag.discard!
+        source_tag.destroy!
 
         if source_tag.nico?
-          source_tag_name.discard!
+          source_tag_name.destroy!
         else
           source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,
                                          updated_at: Time.current)
@@ -306,13 +302,13 @@ class Tag < ApplicationRecord
       end
 
       # 投稿件数を再集計
-      target_tag.update_columns(post_count: PostTag.kept.where(tag: target_tag).count)
+      target_tag.update_columns(post_count: PostTag.where(tag: target_tag).count)
     end
 
     target_tag.reload
   end
 
-  def snapshot_aliases = tag_name.aliases.kept.order(:name).pluck(:name)
+  def snapshot_aliases = tag_name.aliases.order(:name).pluck(:name)
 
   def snapshot_parent_tag_ids = parents.order(:id).pluck(:id)
 

backend/app/models/tag_name.rb

@@ -1,6 +1,4 @@
 class TagName < ApplicationRecord
-  include MyDiscard
-
   belongs_to :tag
   has_one :wiki_page
 

backend/app/models/tag_name_sanitisation_rule.rb

@@ -32,7 +32,7 @@ class TagNameSanitisationRule < ApplicationRecord
             elsif source_tag
               source_tag.update_columns(tag_name_id: existing_tn.id, updated_at: Time.current)
             end
-            tn.discard!
+            tn.destroy!
 
             next
           end