#428

backend/app/controllers/post_versions_controller.rb

@@ -1,5 +1,6 @@
 class PostVersionsController < ApplicationController
   def index
+    locale = resolve_locale!
     post_id = params[:post].presence
     tag_id = params[:tag].presence&.to_i
     external_tag_id = params[:external_tag].presence&.to_i
@@ -45,12 +46,12 @@ class PostVersionsController < ApplicationController
                 .limit(limit)
                 .offset(offset)
 
-    render json: { versions: serialise_versions(versions), count: }
+    render json: { versions: serialise_versions(versions, locale.language_code), count: }
   end
 
   private
 
-  def serialise_versions rows
+  def serialise_versions rows, language_code
     rows = rows.to_a
     user_ids = rows.map(&:created_by_user_id).compact.uniq
     users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
@@ -58,12 +59,16 @@ class PostVersionsController < ApplicationController
       [normalise_json(row.tags_json),
        normalise_json(row.attributes['prev_tags_json']) || []]
     }
+    tag_ids = snapshots.flatten.filter_map { _1['tag_id'] }.uniq
+    tag_names = TagName.where(tag_id: tag_ids, language_code:, primary_flg: true)
+                       .pluck(:tag_id, :name).to_h
     external_tag_names = external_tag_names_for(snapshots)
 
     rows.map do |row|
-      cur_tags = snapshot_tag_literals(normalise_json(row.tags_json), external_tag_names)
+      cur_tags = snapshot_tag_literals(
+          normalise_json(row.tags_json), tag_names, external_tag_names)
       prev_tags = snapshot_tag_literals(
-          normalise_json(row.attributes['prev_tags_json']) || [], external_tag_names)
+          normalise_json(row.attributes['prev_tags_json']) || [], tag_names, external_tag_names)
 
       { post_id: row.post_id,
         version_no: row.version_no,
@@ -106,17 +111,23 @@ class PostVersionsController < ApplicationController
     names
   end
 
-  def snapshot_tag_literals snapshots, external_tag_names
+  def snapshot_tag_literals snapshots, tag_names, external_tag_names
     snapshots
         .filter_map { |snapshot|
           if snapshot.key?('tag_id')
+            sections = snapshot.fetch('sections', []).map { |section|
+              [section.fetch('begin_ms'), section['end_ms']]
+            }.sort_by { |begin_ms, end_ms| [begin_ms, end_ms || Float::INFINITY] }
+            name = tag_names[snapshot['tag_id']] || snapshot.fetch('name')
             [tag_category_order(snapshot['category']),
-             Post.tag_snapshot_literal(snapshot)]
+             { identity: [:tag, snapshot['tag_id'], sections],
+               name: Post.tag_snapshot_literal(snapshot.merge('name' => name)) }]
           elsif external_tag_names[snapshot['external_tag_id']]
-            [6, external_tag_names[snapshot['external_tag_id']]]
+            [6, { identity: [:external_tag, snapshot['external_tag_id']],
+                  name: external_tag_names[snapshot['external_tag_id']] }]
           end
         }
-        .sort_by { |order, name| [order, name.downcase] }
+        .sort_by { |order, tag| [order, tag[:name].downcase] }
         .map(&:second)
   end
 
@@ -125,17 +136,20 @@ class PostVersionsController < ApplicationController
   end
 
   def build_version_tags cur_tags, prev_tags
-    (cur_tags | prev_tags).map do |name|
+    current = cur_tags.to_h { [_1[:identity], _1[:name]] }
+    previous = prev_tags.to_h { [_1[:identity], _1[:name]] }
+
+    (current.keys | previous.keys).map do |identity|
       type =
-          if cur_tags.include?(name) && prev_tags.include?(name)
+          if current.key?(identity) && previous.key?(identity)
             'context'
-          elsif cur_tags.include?(name)
+          elsif current.key?(identity)
             'added'
           else
             'removed'
           end
 
-      { name:, type: }
+      { name: current[identity] || previous[identity], type: }
     end
   end
 end