#55 いったん中断；外部タグ分離優先

backend/app/controllers/application_controller.rb

@@ -92,4 +92,6 @@ class ApplicationController < ActionController::API
 
     value
   end
+
+  def resolve_locale! = Locale.find_by(code: params[:locale]) || Locale.nipponese
 end

backend/app/controllers/materials_controller.rb

@@ -72,6 +72,7 @@ class MaterialsController < ApplicationController
     return head :unauthorized unless current_user
     return head :forbidden unless current_user.gte_member?
 
+    locale = resolve_locale!
     tag_name_raw = params[:tag].to_s.strip
     file = params[:file]
     file_sha256 = MaterialFileSha256.from_upload(file)
@@ -89,7 +90,7 @@ class MaterialsController < ApplicationController
 
     begin
       Material.transaction do
-        tag = resolve_material_tag!(tag_name_raw)
+        tag = resolve_material_tag!(locale, tag_name_raw)
         material = Material.new(tag:, url:,
                                 created_by_user: current_user,
                                 updated_by_user: current_user)
@@ -237,9 +238,7 @@ class MaterialsController < ApplicationController
   end
 
   def resolve_material_tag! locale, tag_name_raw
-    tag_name = TagName.find_or_create_by!(language_code: locale.language_code,
-                                          name: tag_name_raw)
-    tag_name.tag || Tag.create!(tag_name:, category: :material)
+    Tag.find_or_create_by_tag_name!(locale, tag_name_raw, category: :material)
   end
 
   def material_index_needs_tag_name? filters

backend/app/controllers/nico_tags_controller.rb

@@ -70,6 +70,8 @@ class NicoTagsController < ApplicationController
     return head :unauthorized unless current_user
     return head :forbidden unless current_user.gte_member?
 
+    locale = resolve_locale!
+
     id = params[:id].to_i
 
     tag = Tag.find(id)
@@ -79,8 +81,9 @@ class NicoTagsController < ApplicationController
     linked_tags = nil
 
     ApplicationRecord.transaction do
-      linked_tags = Tag.normalise_tags!(linked_tag_names, with_tagme: false,
-                                                          with_no_deerjikist: false)
+      linked_tags = Tag.normalise_tags!(locale, linked_tag_names,
+                                        with_tagme: false,
+                                        with_no_deerjikist: false)
       if linked_tags.any? { |t| t.nico? }
         raise Tag::NicoTagNormalisationError
       end

backend/app/controllers/posts_controller.rb

@@ -690,9 +690,10 @@ class PostsController < ApplicationController
   def post_incoming_snapshot locale:, title:, original_created_from:, original_created_before:,
                              tag_names:, video_ms_param:, duration_param:, parent_post_ids:
     validate_original_created_values!(original_created_from, original_created_before)
-    Tag.normalise_tags!(locale, tag_names, with_tagme: false, deny_deprecated: true,
-                                           with_sections: true) =>
-        { tags:, sections: }
+    Tag.normalise_tags!(locale, tag_names,
+                        with_tagme: false,
+                        deny_deprecated: true,
+                        with_sections: true) => { tags:, sections: }
 
     tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
     video_ms = normalise_video_ms(tags, video_ms_param:, duration_param:)

backend/app/controllers/tags_controller.rb

@@ -278,6 +278,8 @@ class TagsController < ApplicationController
 
     return unless validate_tag_rename(tag, name)
 
+    locale = resolve_locale!
+
     alias_names = params[:aliases].to_s.split.uniq
     parent_names = params[:parent_tags].to_s.split.uniq
     deprecated = bool?(:deprecated)
@@ -308,7 +310,7 @@ class TagsController < ApplicationController
       alias_names.delete(name)
 
       update_aliases!(tag, alias_names)
-      update_parent_tags!(tag, parent_names)
+      update_parent_tags!(locale, tag, parent_names)
 
       tag.reload
 
@@ -659,10 +661,11 @@ class TagsController < ApplicationController
     end
   end
 
-  def update_parent_tags! tag, parent_names
-    parent_tags = Tag.normalise_tags!(parent_names, with_tagme: false,
-                                                    with_no_deerjikist: false,
-                                                    deny_nico: true)
+  def update_parent_tags! locale, tag, parent_names
+    parent_tags = Tag.normalise_tags!(locale, parent_names,
+                                      with_tagme: false,
+                                      with_no_deerjikist: false,
+                                      deny_nico: true)
 
     old_parent_tags = tag.parents.to_a
 

backend/app/models/tag.rb

@@ -242,12 +242,14 @@ class Tag < ApplicationRecord
     end
 
     tag = tn.tag
-    unless tag
-      tag = Tag.find_undiscard_or_create_by!(tag_name_id: tn.id) do
-        _1.category = category
-      end
+    if tag
+      tag.update!(tag_name_id: tn.id) if tag.tag_name_id != tn.id
+      return tag
     end
 
+    tag = Tag.create!(tag_name: tn, category:)
+    tn.update!(tag:)
+
     tag
   rescue ActiveRecord::RecordNotUnique
     retry

backend/app/models/tag_name.rb

@@ -1,5 +1,5 @@
 class TagName < ApplicationRecord
-  belongs_to :tag
+  belongs_to :tag, optional: true
   has_one :wiki_page
 
   belongs_to :canonical, class_name: 'TagName', optional: true

backend/app/services/post_creator.rb

@@ -9,7 +9,7 @@ class PostCreator
     @field_warnings = { }
   end
 
-  def create!
+  def create!(locale)
     thumbnail_attachment = prepare_thumbnail_attachment
     post = Post.new(title: @attributes[:title].presence,
                     url: @attributes[:url],
@@ -25,7 +25,7 @@ class PostCreator
       post_tags = planned_post_tags
       sections = planned_sections
       TagVersioning.record_tag_snapshots!(snapshot_tags, created_by_user: @actor)
-      post.video_ms = planned_video_ms
+      post.video_ms = planned_video_ms(locale)
       post.save!
       sync_post_tags!(post, post_tags, sections)
       sync_parent_posts!(post, planned_parent_post_ids)
@@ -53,15 +53,15 @@ class PostCreator
 
   def planned_parent_post_ids = planned_create_attributes[:normalised_parent_post_ids]
 
-  def planned_video_ms
-    planned_create_attributes[:video_ms]
+  def planned_video_ms locale
+    planned_create_attributes(locale)[:video_ms]
   end
 
-  def planned_create_attributes
+  def planned_create_attributes locale
     @planned_create_attributes ||= begin
       if @attributes.key?(:snapshot_tag_specs)
-        snapshot_tags = materialise_tags(@attributes[:snapshot_tag_specs] || [])
-        post_tags = materialise_tags(@attributes[:post_tag_specs] || [])
+        snapshot_tags = materialise_tags(locale, @attributes[:snapshot_tag_specs] || [])
+        post_tags = materialise_tags(locale, @attributes[:post_tag_specs] || [])
         {
             snapshot_tags: snapshot_tags,
             post_tags: post_tags,
@@ -92,13 +92,13 @@ class PostCreator
         video_ms: plan[:video_ms] }
   end
 
-  def materialise_tags specs
+  def materialise_tags locale, specs
     Array(specs).each_with_object({ }) do |spec, tags|
       name = spec[:name] || spec['name']
       category = spec[:category] || spec['category']
       next if name.blank? || category.blank?
 
-      tag = Tag.find_or_create_by_tag_name!(name, category:)
+      tag = Tag.find_or_create_by_tag_name!(locale, name, category:)
       tag.update!(category:) if tag.category.to_sym != category.to_sym
       tags[name] ||= tag
     end.values