post_versions.tags_json への移行 (#354) (#415)

画面テストまだ．

Reviewed-on: #415
Co-authored-by: miteruzo <miteruzo@naver.com>

backend/app/controllers/application_controller.rb

@@ -85,4 +85,11 @@ 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
+    tag_id = params[:tag].presence&.to_i
     page = (params[:page].presence || 1).to_i
     limit = (params[:limit].presence || 20).to_i
 
@@ -10,12 +10,6 @@ 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
@@ -23,17 +17,18 @@ class PostVersionsController < ApplicationController
               prev.post_id = post_versions.post_id
               AND prev.version_no = post_versions.version_no - 1
         SQL
-        .select('post_versions.*', 'prev.title AS prev_title', 'prev.url AS prev_url',
-                'prev.thumbnail_base AS prev_thumbnail_base', 'prev.tags AS prev_tags',
+        .select('post_versions.*',
+                'prev.title AS prev_title',
+                '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_name
-      escaped = ActiveRecord::Base.sanitize_sql_like(tag_name.name)
-      q = q.where(("CONCAT(' ', post_versions.tags, ' ') LIKE :kw " +
-                   "OR CONCAT(' ', prev.tags, ' ') LIKE :kw"),
-                  kw: "% #{ escaped } %")
+    if tag_id
+      q = q.where("JSON_CONTAINS(post_versions.tags_json, JSON_OBJECT('id', #{ tag_id })) " +
+                  "OR JSON_CONTAINS(prev.tags_json, JSON_OBJECT('id', #{ tag_id }))")
     end
 
     count = q.except(:select, :order, :limit, :offset).count
@@ -52,51 +47,69 @@ class PostVersionsController < ApplicationController
     users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
 
     rows.map do |row|
-      cur_tags = split_tags(row.tags)
-      prev_tags = split_tags(row.attributes['prev_tags'])
+      cur_tags =
+          normalise_json(row.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) }
+      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']
-        },
-        url: {
-          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']
-        },
+        title: { current: row.title, prev: row.attributes['prev_title'] },
+        url: { 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,
-          prev: row.attributes['prev_original_created_from']&.iso8601
-        },
+            current: row.original_created_from&.iso8601,
+            prev: row.attributes['prev_original_created_from']&.iso8601 },
         original_created_before: {
-          current: row.original_created_before&.iso8601,
-          prev: row.attributes['prev_original_created_before']&.iso8601
-        },
+            current: row.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
-            {
-              id: row.created_by_user_id,
-              name: users_by_id[row.created_by_user_id]
-            }
-          end
-      }
+            if row.created_by_user_id
+              { id: row.created_by_user_id,
+                name: users_by_id[row.created_by_user_id] }
+            end }
     end
   end
 
@@ -117,8 +130,4 @@ class PostVersionsController < ApplicationController
       }
     end
   end
-
-  def split_tags(tags)
-    tags.to_s.split(/\s+/).reject(&:blank?)
-  end
 end

backend/app/controllers/posts_controller.rb

@@ -699,7 +699,10 @@ class PostsController < ApplicationController
   end
 
   def editable_tag_names_from_version version
-    version.tags.to_s.split.reject { |name| name.downcase.start_with?('nico:') }.sort
+    version.tags_json
+        .reject { _1.fetch('category') == 'nico' }
+        .map { Post.tag_snapshot_literal(_1) }
+        .sort
   end
 
   def post_snapshot_from_record post