#55

backend/app/services/post_create_plan.rb

@@ -8,13 +8,13 @@ class PostCreatePlan
     @existing_tags_by_name = nil
   end
 
-  def build!
-    direct_tag_specs, tag_sections = parse_direct_tag_specs
+  def build! locale
+    direct_tag_specs, tag_sections = parse_direct_tag_specs(locale)
     default_tag_specs = build_default_tag_specs(direct_tag_specs)
     snapshot_tag_specs = merge_tag_specs(direct_tag_specs + default_tag_specs)
     preload_existing_tags_by_name!(snapshot_tag_specs.map { _1[:name] })
     validate_new_tag_specs!(snapshot_tag_specs)
-    post_tag_specs = expand_parent_tag_specs(snapshot_tag_specs)
+    post_tag_specs = expand_parent_tag_specs(locale, snapshot_tag_specs)
     video_ms = normalise_video_ms(snapshot_tag_specs)
     validate_video_sections!(video_ms, tag_sections)
     parent_post_ids = normalise_parent_post_ids
@@ -42,13 +42,13 @@ class PostCreatePlan
 
   def tag_names = @attributes[:tags].to_s.split
 
-  def parse_direct_tag_specs
+  def parse_direct_tag_specs locale
     tag_sections = { }
     direct_tag_specs = []
 
     tag_names.each do |raw_name|
-      tag_name, category, sections = parse_raw_tag_name(raw_name)
-      existing_tag = existing_tags_by_name[tag_name]
+      tag_name, category, sections = parse_raw_tag_name(locale, raw_name)
+      existing_tag = existing_tags_by_name(locale)[tag_name]
       raise Tag::DeprecatedTagNormalisationError, [existing_tag.name] if existing_tag&.deprecated?
 
       direct_tag_specs << {
@@ -65,7 +65,7 @@ class PostCreatePlan
     [merge_tag_specs(direct_tag_specs), tag_sections]
   end
 
-  def parse_raw_tag_name raw_name
+  def parse_raw_tag_name locale, raw_name
     name = raw_name.to_s
     prefix, category =
         Tag::CATEGORY_PREFIXES.find {
@@ -74,7 +74,7 @@ class PostCreatePlan
     name = name.sub(/\A#{ prefix }/i, '')
 
     sections = []
-    while (match = name.match(/\A(\S*?)\[([^\[\]\s]*)-([^\[\]\s]*)\](\S*)\z/))
+    while match = name.match(/\A(\S*?)\[([^\[\]\s]*)-([^\[\]\s]*)\](\S*)\z/)
       name = "#{ match[1] }#{ match[4] }"
       next if match[2].empty? && match[3].empty?
 
@@ -87,17 +87,17 @@ class PostCreatePlan
       raise Tag::SectionLiteralParseError.new(raw_name, raw_name)
     end
 
-    [resolved_tag_name(name), category&.to_sym, sections]
+    [resolved_tag_name(locale, name), category&.to_sym, sections]
   end
 
-  def build_default_tag_specs direct_tag_specs
+  def build_default_tag_specs locale, direct_tag_specs
     default_tag_specs = []
     if direct_tag_specs.length < 10 && direct_tag_specs.none? { _1[:name] == TAGME_TAG_NAME }
       default_tag_specs << {
           name: TAGME_TAG_NAME,
           category: :meta }
     end
-    if direct_tag_specs.none? { deerjikist_tag_spec?(_1) }
+    if direct_tag_specs.none? { deerjikist_tag_spec?(locale, _1) }
       default_tag_specs << {
           name: NO_DEERJIKIST_TAG_NAME,
           category: :meta }
@@ -131,8 +131,10 @@ class PostCreatePlan
     raise ActiveRecord::RecordInvalid, post
   end
 
-  def expand_parent_tag_specs snapshot_tag_specs
-    existing_snapshot_tags = snapshot_tag_specs.filter_map { existing_tags_by_name[_1[:name]] }
+  def expand_parent_tag_specs locale, snapshot_tag_specs
+    existing_snapshot_tags = snapshot_tag_specs.filter_map do
+      existing_tags_by_name(locale)[_1[:name]]
+    end
     expanded_parent_specs =
         Tag.expand_parent_tags(existing_snapshot_tags)
            .reject(&:deprecated?)
@@ -156,33 +158,33 @@ class PostCreatePlan
     }.values.sort_by { _1[:name] }
   end
 
-  def existing_tags_by_name
+  def existing_tags_by_name locale
     @existing_tags_by_name ||= begin
-      names = tag_names.map { canonical_tag_name_without_sections(_1) }.uniq
+      names = tag_names.map { canonical_tag_name_without_sections(locale, _1) }.uniq
       Tag.joins(:tag_name).where(tag_names: { name: names }).index_by(&:name)
     end
   end
 
-  def preload_existing_tags_by_name! names
+  def preload_existing_tags_by_name! locale, names
     wanted_names = Array(names).map { _1.to_s }.reject(&:blank?).uniq
-    missing_names = wanted_names - existing_tags_by_name.keys
+    missing_names = wanted_names - existing_tags_by_name(locale).keys
     return if missing_names.empty?
 
-    existing_tags_by_name.merge!(
+    existing_tags_by_name(locale).merge!(
         Tag.joins(:tag_name)
            .where(tag_names: { name: missing_names })
            .index_by(&:name))
   end
 
-  def canonical_tag_name_without_sections raw_name
-    name, = parse_raw_tag_name(raw_name)
+  def canonical_tag_name_without_sections locale, raw_name
+    name, = parse_raw_tag_name(locale, raw_name)
     name
   end
 
-  def deerjikist_tag_spec? spec
+  def deerjikist_tag_spec? locale, spec
     return true if spec[:category] == :deerjikist
 
-    existing_tags_by_name[spec[:name]]&.deerjikist?
+    existing_tags_by_name(locale)[spec[:name]]&.deerjikist?
   end
 
   def normalise_parent_post_ids
@@ -260,10 +262,13 @@ class PostCreatePlan
     end
   end
 
-  def resolved_tag_name name
-    tag_name = TagName.includes(:canonical).find_by(name:)
-    return name if tag_name.nil?
-
-    (tag_name.canonical || tag_name).name
+  def resolved_tag_name locale, name
+    tag_name = TagName.find_by!(language_code: locale.language_code, name:)
+    unless tag_name.primary_flg
+      tag_name = TagName.find_by!(language_code: locale.language_code,
+                                  tag_id: tag_name.tag_id,
+                                  primary_flg: true)
+    end
+    tag_name.name
   end
 end

backend/app/services/post_creator.rb

@@ -21,14 +21,14 @@ class PostCreator
     ApplicationRecord.transaction do
       post.save!
       post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
-      snapshot_tags = planned_snapshot_tags
-      post_tags = planned_post_tags
-      sections = planned_sections
+      snapshot_tags = planned_snapshot_tags(locale)
+      post_tags = planned_post_tags(locale)
+      sections = planned_sections(locale)
       TagVersioning.record_tag_snapshots!(snapshot_tags, created_by_user: @actor)
       post.video_ms = planned_video_ms(locale)
       post.save!
       sync_post_tags!(post, post_tags, sections)
-      sync_parent_posts!(post, planned_parent_post_ids)
+      sync_parent_posts!(post, planned_parent_post_ids(locale))
       PostVersionRecorder.record!(post:, event_type: :create, created_by_user: @actor)
     end
     post
@@ -45,13 +45,15 @@ class PostCreator
         thumbnail_base: @attributes[:thumbnail_base].presence)
   end
 
-  def planned_snapshot_tags = planned_create_attributes[:snapshot_tags]
+  def planned_snapshot_tags(locale) = planned_create_attributes(locale)[:snapshot_tags]
 
-  def planned_post_tags = planned_create_attributes[:post_tags]
+  def planned_post_tags(locale) = planned_create_attributes(locale)[:post_tags]
 
-  def planned_sections = planned_create_attributes[:tag_sections]
+  def planned_sections(locale) = planned_create_attributes(locale)[:tag_sections]
 
-  def planned_parent_post_ids = planned_create_attributes[:normalised_parent_post_ids]
+  def planned_parent_post_ids locale
+    planned_create_attributes(locale)[:normalised_parent_post_ids]
+  end
 
   def planned_video_ms locale
     planned_create_attributes(locale)[:video_ms]