#431

backend/app/models/locale.rb

@@ -13,14 +13,13 @@ class Locale < ApplicationRecord
   def generate_tag_names!
     ApplicationRecord.transaction do
       tag_ids = TagName.where(language_code:, primary_flg: true).pluck(:tag_id)
-      Tag.where.not(id: tag_ids).find_each do
+      Tag.where.not(id: tag_ids).includes(:tag_names).find_each do
         TagName.create!(tag_id: _1.id,
                         language_code:,
                         name: TagName.generate_name(self, _1, _1.tag_name('ja')),
                         script_code:,
                         primary_flg: true,
-                        auto_generated: true,
-                        canonical_id: nil)
+                        auto_generated: true)
       end
     end
   end

backend/app/models/tag.rb

@@ -91,7 +91,6 @@ class Tag < ApplicationRecord
     end
   end
   def name(language_code) = tag_name(language_code)&.name
-  def wiki_page = tag_name('ja')&.wiki_page
 
   def system?
     tag_name('ja')&.name.in?(SYSTEM_TAG_NAMES)
@@ -260,16 +259,13 @@ class Tag < ApplicationRecord
       name = name.to_s.strip
 
       ApplicationRecord.transaction do
-        tn = TagName.find_or_create_by!(language_code:, name:) do
-          _1.script_code = locale.script_code
-          _1.primary_flg = true
-        end
+        tn = TagName.find_by(language_code:, name:)
+        next tn.tag if tn
 
-        tag = tn.tag
-        next tag if tag
-
-        tag = Tag.create!(tag_name_id: tn.id, category:)
-        tn.update!(tag:, primary_flg: true, canonical_id: nil, auto_generated: false)
+        tag = Tag.create!(category:)
+        tn = TagName.create!(tag:, language_code:, name:,
+                             script_code: locale.script_code, primary_flg: true,
+                             auto_generated: false)
         generate_tag_names!(locale, tag, tn)
         tag.association(:tag_names).reset
 
@@ -303,20 +299,17 @@ class Tag < ApplicationRecord
             end
           end
 
-          source_tag_name = source_tag.tag_name('ja')
-
-          if source_tag_name.wiki_page.present?
-            raise ActiveRecord::RecordInvalid.new(source_tag_name)
+          if source_tag.tag_descriptions.exists?
+            source_tag.errors.add(:base, :invalid)
+            raise ActiveRecord::RecordInvalid, source_tag
           end
 
           TagVersioning.record!(source_tag, event_type: :discard, created_by_user:)
           source_tag.tag_names.update_all(tag_id: target_tag.id, primary_flg: false,
+                                          auto_generated: false,
                                           updated_at: Time.current)
           source_tag.destroy!
 
-          source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,
-                                         updated_at: Time.current)
-
           TagVersioning.record!(target_tag, event_type: :update, created_by_user:)
         end
 
@@ -376,8 +369,7 @@ class Tag < ApplicationRecord
                           name: TagName.generate_name(locale, tag, base_tag_name),
                           script_code:,
                           primary_flg: true,
-                          auto_generated: true,
-                          canonical_id: nil)
+                          auto_generated: true)
         end
       end
     end

backend/app/models/tag_name.rb

@@ -1,14 +1,12 @@
 class TagName < ApplicationRecord
   belongs_to :language, foreign_key: :language_code, primary_key: :code
-  belongs_to :tag, optional: true
-  has_one :wiki_page
+  belongs_to :tag
 
   validates :name, presence: true,
                    length: { maximum: 255 },
                    uniqueness: { scope: :language_code }
 
   validate :alias_name_must_not_have_prefix
-  validate :alias_must_not_have_wiki_page
   validate :name_must_be_sanitised
   validate :name_mustnt_start_with_nico
   validate :generated_name_must_be_reserved
@@ -21,14 +19,16 @@ class TagName < ApplicationRecord
 
     tns = TagName.where(language_code: locale.language_code, name: names).index_by(&:name)
 
+    primary_names = TagName.where(
+        language_code: locale.language_code, tag_id: tns.values.map(&:tag_id),
+        primary_flg: true).pluck(:tag_id, :name).to_h
+
     names.map { |name|
       tag_name = tns[name]
-      if !tag_name || tag_name.primary? || tag_name.tag_id.nil?
+      if !tag_name || tag_name.primary?
         name
       else
-        TagName.find_by(language_code: locale.language_code,
-                        tag_id: tag_name.tag_id,
-                        primary_flg: true)&.name || name
+        primary_names[tag_name.tag_id] || name
       end
     }.uniq
   end
@@ -53,12 +53,6 @@ class TagName < ApplicationRecord
     end
   end
 
-  def alias_must_not_have_wiki_page
-    if !(primary?) && wiki_page
-      errors.add :primary_flg, 'Wiki 参照がある名前はエーリアスになれません．'
-    end
-  end
-
   def name_must_be_sanitised
     if name? && name != TagNameSanitisationRule.sanitise(name)
       errors.add :name, '名前に使用できない文字が含まれてゐます．'

backend/app/models/tag_name_sanitisation_rule.rb

@@ -33,13 +33,7 @@ class TagNameSanitisationRule < ApplicationRecord
               existing_tag = existing_tn.tag
               source_tag = tn.tag
 
-              if existing_tag
-                Tag.merge_tags!(existing_tag, source_tag) if tn.tag
-              elsif source_tag
-                tn.update_columns(tag_id: nil, updated_at: Time.current)
-                source_tag.update_columns(tag_name_id: existing_tn.id, updated_at: Time.current)
-                existing_tn.update_columns(tag_id: source_tag.id, updated_at: Time.current)
-              end
+              Tag.merge_tags!(existing_tag, source_tag) if existing_tag != source_tag
               tn.destroy!
 
               next

backend/app/models/user.rb

@@ -13,10 +13,10 @@ class User < ApplicationRecord
   has_many :ip_addresses, through: :user_ips
   has_many :user_post_views, dependent: :destroy
   has_many :viewed_posts, through: :user_post_views, source: :post
-  has_many :created_wiki_pages,
-           class_name: 'WikiPage', foreign_key: :created_user_id, dependent: :nullify
-  has_many :updated_wiki_pages,
-           class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
+  has_many :created_tag_descriptions, class_name: 'TagDescription',
+           foreign_key: :created_by_user_id, dependent: :nullify
+  has_many :updated_tag_descriptions, class_name: 'TagDescription',
+           foreign_key: :updated_by_user_id, dependent: :nullify
 
   def viewed?(post) = user_post_views.exists?(post_id: post.id)
 

backend/app/models/wiki_line.rb

@@ -1,15 +0,0 @@
-class WikiLine < ApplicationRecord
-  has_many :wiki_revision_lines, dependent: :restrict_with_exception
-
-  validates :sha256, presence: true, uniqueness: true, length: { is: 64 }
-  validates :body, presence: true
-
-  def self.upsert_by_body! body
-    sha = Digest::SHA256.hexdigest(body)
-    now = Time.current
-
-    upsert(sha256: sha, body:, created_at: now, updated_at: now)
-
-    find_by!(sha256: sha)
-  end
-end

backend/app/models/wiki_page.rb

@@ -1,58 +0,0 @@
-require 'set'
-
-
-class WikiPage < ApplicationRecord
-  include MyDiscard
-
-  has_many :wiki_revisions, dependent: :destroy
-  belongs_to :created_user, class_name: 'User'
-  belongs_to :updated_user, class_name: 'User'
-
-  has_many :redirected_from_revisions,
-           class_name: 'WikiRevision',
-           foreign_key: :redirect_page_id,
-           dependent: :nullify
-
-  has_many :wiki_versions
-
-  attribute :version_no, :integer, default: 1
-
-  belongs_to :tag_name
-  validates :tag_name, presence: true
-  validates :body, presence: true
-
-  def title = tag_name.name
-  def deprecated_at = tag_name.tag&.deprecated_at
-
-  def title= val
-    (self.tag_name ||= build_tag_name).name = val
-  end
-
-  def current_revision = wiki_revisions.order(id: :desc).first
-
-  def resolve_redirect limit: 10
-    page = self
-    visited = Set.new
-
-    limit.times do
-      return page if visited.include?(page.id)
-
-      visited.add(page.id)
-
-      rev = page.current_revision
-      return page if !(rev&.redirect?) || !(rev.redirect_page)
-
-      page = rev.redirect_page
-    end
-
-    page
-  end
-
-  def pred_revision_id revision_id
-    wiki_revisions.where('id < ?', revision_id).order(id: :desc).limit(1).pick(:id)
-  end
-
-  def succ_revision_id revision_id
-    wiki_revisions.where('id > ?', revision_id).order(id: :asc).limit(1).pick(:id)
-  end
-end

backend/app/models/wiki_revision.rb

@@ -1,55 +0,0 @@
-class WikiRevision < ApplicationRecord
-  belongs_to :wiki_page
-  belongs_to :base_revision, class_name: 'WikiRevision', optional: true
-  belongs_to :created_user, class_name: 'User'
-  belongs_to :redirect_page, class_name: 'WikiPage', optional: true
-
-  has_many :wiki_revision_lines, dependent: :delete_all
-  has_many :wiki_lines, through: :wiki_revision_lines
-
-  enum :kind, content: 0, redirect: 1
-
-  validates :kind, presence: true
-  validates :lines_count, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
-  validates :tree_sha256, length: { is: 64 }, allow_nil: true
-
-  validate :kind_consistency
-
-  def body
-    return unless content?
-
-    wiki_revision_lines
-        .includes(:wiki_line)
-        .order(:position)
-        .map { |rev| rev.wiki_line.body }
-        .join("\n")
-  end
-
-  private
-
-  def kind_consistency
-    if content?
-      if tree_sha256.blank?
-        errors.add(:tree_sha256, '種類がページの場合は必須です．') 
-      end
-
-      if redirect_page_id.present?
-        errors.add(:redirect_page_id, '種類がページの場合は空である必要があります．')
-      end
-    end
-
-    if redirect?
-      if redirect_page_id.blank?
-        errors.add(:redirect_page_id, '種類がリダイレクトの場合は必須です．')
-      end
-
-      if tree_sha256.present?
-        errors.add(:tree_sha256, '種類がリダイレクトの場合は空である必要があります．')
-      end
-
-      if lines_count.to_i > 0
-        errors.add(:lines_count, '種類がリダイレクトの場合は 0 である必要があります．')
-      end
-    end
-  end
-end

backend/app/models/wiki_revision_line.rb

@@ -1,8 +0,0 @@
-class WikiRevisionLine < ApplicationRecord
-  belongs_to :wiki_revision
-  belongs_to :wiki_line
-
-  validates :position, presence: true,
-                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
-  validates :position, uniqueness: { scope: :wiki_revision_id }
-end

backend/app/models/wiki_version.rb

@@ -1,8 +0,0 @@
-class WikiVersion < ApplicationRecord
-  include VersionRecord
-
-  belongs_to :wiki_page
-
-  validates :title, presence: true
-  validates :body, presence: true
-end