AI: address issue #446

backend/app/controllers/tag_versions_controller.rb

@@ -69,8 +69,11 @@ class TagVersionsController < ApplicationController
 
       parent_tags =
           build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
-          .map do |h|
-            { tag: parent_json.fetch(h[:tag_id]),
+          .filter_map do |h|
+            parent = parent_json[h[:tag_id]]
+            next unless parent
+
+            { tag: parent,
               type: h[:type] }
           end
 

backend/app/services/post_tag_search.rb

@@ -3,8 +3,8 @@ class PostTagSearch
   def self.literals(locale, raw)
     tokens = raw.split.reject { _1.downcase == 'type:or' }
     names = tokens.map { _1.sub(/\Anot:/i, '') }
-    registered = matching_names(TagName.where(language_code: locale.language_code),
-        names, 'tag_names.name', :tag_id).to_h
+    registered = TagName.where(language_code: locale.language_code, name: names)
+        .pluck(:name, :tag_id).to_h
     primary = TagName.where(language_code: locale.language_code,
         tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
     tokens.zip(names).map do |token, name|
@@ -19,25 +19,12 @@ class PostTagSearch
 
   def self.references_for(locale, literals)
     names = literals.map { _1[:name] }.uniq
-    internal = matching_names(TagName.where(language_code: locale.language_code),
-        names, 'tag_names.name', :tag_id).group_by(&:first)
-    external = matching_names(ExternalTag.all, names,
-        "CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
+    internal = TagName.where(language_code: locale.language_code, name: names)
+        .pluck(:name, :tag_id).group_by(&:first)
+    external = names.empty? ? {} : ExternalTag.where(
+        "CONCAT(platform, ':', name) IN (?)", names)
+        .pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
     names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
                               external.fetch(name, []).map(&:last).uniq]] }
   end
-
-  def self.matching_names(scope, names, expression, identifier)
-    return [] if names.empty?
-
-    queries = names.uniq.map do |name|
-      scope.klass.sanitize_sql_array(['SELECT ? AS name', name])
-    end
-    # Return the input spelling so Ruby does not recheck database equivalence.
-    scope.joins(<<~SQL).pluck(Arel.sql('search_names.name'), identifier)
-      INNER JOIN (#{ queries.join(' UNION ALL ') }) AS search_names
-        ON #{ expression } = search_names.name COLLATE utf8mb4_0900_ai_ci
-    SQL
-  end
-  private_class_method :matching_names
 end