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

backend/app/models/tag.rb

@@ -1,8 +1,12 @@
 class Tag < ApplicationRecord
+  include Discard::Model
+
   class NicoTagNormalisationError < ArgumentError
     ;
   end
 
+  default_scope -> { kept }
+
   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'
@@ -144,29 +148,28 @@ class Tag < ApplicationRecord
     target_tag => Tag
 
     Tag.transaction do
-      Array(source_tags).compact.uniq.each do |st|
-        st => Tag
+      Array(source_tags).compact.uniq.each do |source_tag|
+        source_tag => Tag
 
-        next if st == target_tag
+        next if source_tag == target_tag
 
-        st.post_tags.find_each do |pt|
-          if PostTag.kept.exists?(post_id: pt.post_id, tag_id: target_tag.id)
-            pt.discard_by!(nil)
+        source_tag.post_tags.kept.find_each do |source_pt|
+          post_id = source_pt.post_id
+          source_pt.discard_by!(nil)
+          unless PostTag.kept.exists?(post_id:, tag: target_tag)
+            PostTag.create!(post_id:, tag: target_tag)
           end
-          # discard 後の update! は禁止なので DB を直に更新
-          pt.update_columns(tag_id: target_tag.id, updated_at: Time.current)
         end
 
-        tag_name = st.tag_name
-        nico_flg = st.nico?
-        st.destroy!
-        tag_name.reload
+        source_tag_name = source_tag.tag_name
+        nico_flg = source_tag.nico?
+        source_tag.discard!
+        source_tag_name.reload
 
         if nico_flg
-          tag_name.destroy!
+          source_tag_name.destroy!
         else
-          tag_name.update_columns(canonical_id: target_tag.tag_name&.id,
-                                  updated_at: Time.current)
+          source_tag_name.update!(canonical: target_tag.tag_name)
         end
       end