#55

backend/app/controllers/posts_controller.rb

@@ -53,7 +53,7 @@ class PostsController < ApplicationController
         .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
         .preload(:external_tags, :uploaded_user, :parents, :children,
                  post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                { tag_name: :wiki_page }] }])
+                                                { tag_names: :wiki_page }] }])
         .with_attached_thumbnail
 
     q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -110,7 +110,7 @@ class PostsController < ApplicationController
         filtered_posts(locale)
         .preload(:uploaded_user, :parents, :children,
                  post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                { tag_name: :wiki_page }] }])
+                                                { tag_names: :wiki_page }] }])
         .with_attached_thumbnail
         .order('RAND()')
         .first
@@ -195,7 +195,7 @@ class PostsController < ApplicationController
         Post
         .includes(:uploaded_user, :parents, :children,
                   post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                 { tag_name: :wiki_page }] }])
+                                                 { tag_names: :wiki_page }] }])
         .with_attached_thumbnail
         .find_by(id: params[:id])
     return head :not_found unless post
@@ -341,7 +341,7 @@ class PostsController < ApplicationController
         base_version = post.post_versions.find_by!(version_no: base_version_no)
 
         base_snapshot = post_snapshot_from_version(base_version)
-        current_snapshot = post_snapshot_from_record(post)
+        current_snapshot = post_snapshot_from_record(post, locale)
       end
       incoming_snapshot = post_incoming_snapshot(locale:,
                                                  title:,
@@ -418,11 +418,11 @@ class PostsController < ApplicationController
 
     if match_type == 'any'
       literals.reduce(Post.none) do |posts, literal|
-        posts.or(tag_literal_relation(literal[:name], negative: literal[:negative]))
+        posts.or(tag_literal_relation(locale, literal[:name], negative: literal[:negative]))
       end
     else
       literals.reduce(Post.all) do |posts, literal|
-        ids = tagged_post_ids_for(literal[:name])
+        ids = tagged_post_ids_for(locale, literal[:name])
         if literal[:negative]
           posts.where.not(id: ids)
         else
@@ -432,8 +432,8 @@ class PostsController < ApplicationController
     end
   end
 
-  def tag_literal_relation name, negative:
-    ids = tagged_post_ids_for(name)
+  def tag_literal_relation locale, name, negative:
+    ids = tagged_post_ids_for(locale, name)
     if negative
       Post.where.not(id: ids)
     else
@@ -441,11 +441,11 @@ class PostsController < ApplicationController
     end
   end
 
-  def tagged_post_ids_for(name)
+  def tagged_post_ids_for locale, name
     posts_by_internal_tags =
         Post
-        .joins(tags: :tag_name)
-        .where(tag_names: { name: })
+        .joins(tags: :tag_names)
+        .where(tag_names: { language_code: locale.language_code, name: })
         .select(:id)
 
     posts_by_external_tags =
@@ -688,24 +688,25 @@ class PostsController < ApplicationController
         .sort
   end
 
-  def post_snapshot_from_record post
+  def post_snapshot_from_record post, locale
     { title: post.title,
       video_ms: post.video_ms,
       original_created_from: snapshot_time(post.original_created_from),
       original_created_before: snapshot_time(post.original_created_before),
-      tag_names: editable_tag_names_from_post(post),
+      tag_names: editable_tag_names_from_post(post, locale.language_code),
       parent_post_ids: post.parent_posts.order(:id).pluck(:id) }
   end
 
-  def editable_tag_names_from_post post
+  def editable_tag_names_from_post post, language_code
     post
         .post_tags
-        .joins(tag: :tag_name)
+        .joins(tag: :tag_names)
         .merge(Tag.where(deprecated_at: nil))
-        .includes(:sections, tag: :tag_name)
+        .where(tag_names: { language_code:, primary_flg: true })
+        .includes(:sections, tag: :tag_names)
         .order('tag_names.name')
         .map do |post_tag|
-      name = post_tag.tag.tag_name.name
+      name = post_tag.tag.name(language_code)
       sections = post_tag.sections.sort_by(&:begin_ms)
 
       next name if sections.empty?
@@ -732,7 +733,7 @@ class PostsController < ApplicationController
       original_created_from: snapshot_time(original_created_from),
       original_created_before: snapshot_time(original_created_before),
       tag_names: tags.uniq(&:id).map { |tag|
-        "#{ tag.name }#{ sections[tag.id].to_a.map { section_literal(_1) }.join }"
+        "#{ tag.name(locale.language_code) }#{ sections[tag.id].to_a.map { section_literal(_1) }.join }"
       }.sort,
       parent_post_ids: parent_post_ids.sort }
   end
@@ -868,7 +869,8 @@ class PostsController < ApplicationController
                         with_tagme: false,
                         deny_deprecated: true,
                         with_sections: true) => { tags:, sections: }
-    TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
+    TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user,
+                                        language_code: locale.language_code)
 
     tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)