#317

backend/app/controllers/tags_controller.rb

@@ -302,10 +302,9 @@ class TagsController < ApplicationController
       NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
     else
       TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
-      if tag.has_wiki
-        WikiVersionRecorder.record!(page: tag.tag_name.wiki_page,
-                                    event_type: :update,
-                                    created_by_user:)
+      wiki_page = tag.tag_name.wiki_page
+      if wiki_page&.wiki_versions&.exists?
+        WikiVersionRecorder.record!(page: wiki_page, event_type: :update, created_by_user:)
       end
     end
   end

backend/app/models/wiki_page.rb

@@ -17,6 +17,7 @@ class WikiPage < ApplicationRecord
 
   belongs_to :tag_name
   validates :tag_name, presence: true
+  validates :body, presence: true
 
   def title = tag_name.name
 
@@ -26,11 +27,6 @@ class WikiPage < ApplicationRecord
 
   def current_revision = wiki_revisions.order(id: :desc).first
 
-  def body
-    rev = current_revision
-    rev.body if rev&.content?
-  end
-
   def resolve_redirect limit: 10
     page = self
     visited = Set.new

backend/app/services/wiki/commit.rb

@@ -7,6 +7,31 @@ module Wiki
       ;
     end
 
+    def self.create_content! tag_name:, body:, created_by_user:, message: nil
+      normalised = normalise_body(body)
+
+      page = WikiPage.new(tag_name:,
+                          body: normalised,
+                          created_user: created_by_user,
+                          updated_user: created_by_user)
+
+      if normalised.blank?
+        page.errors.add(:body, :blank)
+        raise ActiveRecord::RecordInvalid, page
+      end
+
+      ActiveRecord::Base.transaction do
+        page.save!
+
+        new(page:, created_user: created_by_user).content!(
+            body: normalised,
+            message:,
+            base_revision_id: nil)
+
+        page
+      end
+    end
+
     def self.content! page:, body:, created_user:, message: nil, base_revision_id: nil
       new(page:, created_user:).content!(body:, message:, base_revision_id:)
     end
@@ -21,7 +46,12 @@ module Wiki
     end
 
     def content! body:, message:, base_revision_id:
-      normalised = normalise_body(body).gsub(/\n+$/, '')
+      normalised = self.class.normalise_body(body)
+      if normalised.blank?
+        @page.errors.add(:body, :blank)
+        raise ActiveRecord::RecordInvalid, @page
+      end
+
       lines = split_lines(normalised)
 
       line_shas = lines.map { |line| Digest::SHA256.hexdigest(line) }
@@ -45,11 +75,12 @@ module Wiki
         @page.update!(body: normalised)
 
         WikiVersionRecorder.record!(
-            page: { title: @page.title, body: normalised },
+            page: @page,
             event_type: @page.wiki_versions.exists? ? :update : :create,
+            reason: message,
             created_by_user: @created_user)
         tag = @page.tag_name.tag
-        if tag
+        if tag&.tag_versions&.exists?
           TagVersionRecorder.record!(tag:, event_type: :update, created_by_user: @created_user)
         end
 
@@ -74,14 +105,15 @@ module Wiki
 
     def redirect!(redirect_page:, message:, base_revision_id:) = raise '廃止しました．'
 
-    private
-
-    def normalise_body body
+    def self.normalise_body body
       s = body.to_s
       s.gsub!(/\r\n?/, "\n")
       s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '🖕')
+      s.gsub(/\n+$/, '')
     end
 
+    private
+
     def split_lines(body) = body.split("\n")
 
     def upsert_lines! lines, line_shas

backend/app/services/wiki_version_recorder.rb

@@ -1,9 +1,10 @@
 class WikiVersionRecorder < VersionRecorder
-  def self.record! page:, event_type:, created_by_user:
+  def self.record! page:, event_type:, reason: nil, created_by_user:
     new(page:, event_type:, created_by_user:).record!
   end
 
-  def initialize page:, event_type:, created_by_user:
+  def initialize page:, event_type:, reason: nil, created_by_user:
+    @reason = reason
     super(record: page, event_type:, created_by_user:)
   end
 
@@ -13,5 +14,8 @@ class WikiVersionRecorder < VersionRecorder
   def version_association = :wiki_versions
   def record_key = :wiki_page
 
-  def snapshot_attributes = { title: @record.title, body: @record.body }
+  def snapshot_attributes = {
+      title: @record.title,
+      body: @record.body,
+      reason: @reason }
 end