#55

backend/app/services/post_create_plan.rb

@@ -12,8 +12,8 @@ class PostCreatePlan
     direct_tag_specs, tag_sections = parse_direct_tag_specs(locale)
     default_tag_specs = build_default_tag_specs(locale, 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)
+    preload_existing_tags_by_name!(locale, snapshot_tag_specs.map { _1[:name] })
+    validate_new_tag_specs!(locale, 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)
@@ -49,7 +49,9 @@ class PostCreatePlan
     tag_names.each do |raw_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?
+      if existing_tag&.deprecated?
+        raise Tag::DeprecatedTagNormalisationError, [existing_tag.name(locale.language_code)]
+      end
 
       direct_tag_specs << {
           name: tag_name,
@@ -106,17 +108,18 @@ class PostCreatePlan
     default_tag_specs
   end
 
-  def validate_new_tag_specs! specs
+  def validate_new_tag_specs! locale, specs
     Array(specs).each do |spec|
-      next if existing_tags_by_name.key?(spec[:name])
+      next if existing_tags_by_name(locale).key?(spec[:name])
 
-      validate_new_tag_spec!(spec)
+      validate_new_tag_spec!(locale, spec)
     end
   end
 
-  def validate_new_tag_spec! spec
-    tag_name = TagName.new(name: spec[:name])
-    tag = Tag.new(category: spec[:category], tag_name:)
+  def validate_new_tag_spec! locale, spec
+    tag_name = TagName.new(name: spec[:name], language_code: locale.language_code,
+                           script_code: locale.script_code, primary_flg: true)
+    tag = Tag.new(category: spec[:category])
     return if tag_name.valid? && tag.valid?
 
     post = Post.new
@@ -139,7 +142,7 @@ class PostCreatePlan
         Tag.expand_parent_tags(existing_snapshot_tags)
            .reject(&:deprecated?)
            .map { |tag|
-             { name: tag.name,
+             { name: tag.name(locale.language_code),
                category: tag.category.to_sym }
         }
     merge_tag_specs(snapshot_tag_specs + expanded_parent_specs)
@@ -161,7 +164,9 @@ class PostCreatePlan
   def existing_tags_by_name locale
     @existing_tags_by_name ||= begin
       names = tag_names.map { canonical_tag_name_without_sections(locale, _1) }.uniq
-      Tag.joins(:tag_name).where(tag_names: { name: names }).index_by(&:name)
+      TagName.where(language_code: locale.language_code, primary_flg: true, name: names)
+             .includes(:tag)
+             .each_with_object({ }) { |tag_name, tags| tags[tag_name.name] = tag_name.tag }
     end
   end
 
@@ -171,9 +176,11 @@ class PostCreatePlan
     return if missing_names.empty?
 
     existing_tags_by_name(locale).merge!(
-        Tag.joins(:tag_name)
-           .where(tag_names: { name: missing_names })
-           .index_by(&:name))
+        TagName.where(language_code: locale.language_code,
+                      primary_flg: true,
+                      name: missing_names)
+               .includes(:tag)
+               .each_with_object({ }) { |tag_name, tags| tags[tag_name.name] = tag_name.tag })
   end
 
   def canonical_tag_name_without_sections locale, raw_name
@@ -266,8 +273,8 @@ class PostCreatePlan
     tag_name = TagName.find_by(language_code: locale.language_code, name:)
     return name if !(tag_name) || tag_name.primary?
 
-    TagName.find_by!(language_code: locale.language_code,
-                     tag_id: tag_name.tag_id,
-                     primary_flg: true).name
+    TagName.find_by(language_code: locale.language_code,
+                    tag_id: tag_name.tag_id,
+                    primary_flg: true)&.name || name
   end
 end