AI: address issue #272

backend/app/controllers/tags_controller.rb

@@ -218,63 +218,16 @@ class TagsController < ApplicationController
     locale = resolve_locale!
 
     q = params[:q].to_s.strip.sub(/\Anot:/i, '')
-    prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%"
+    literal = ActiveRecord::Base.sanitize_sql_like(q)
+    nico = bool?(:nico, default: true)
+    present = bool?(:present, default: true)
 
-    with_nico = bool?(:nico, default: true)
-    present_only = bool?(:present, default: true)
-
-    alias_rows =
-        TagName
-        .where(language_code: locale.language_code, primary_flg: false)
-        .where('name LIKE ?', prefix)
-        .pluck(:tag_id, :name)
-
-    matched_alias_by_tag_id = { }
-    tag_ids = []
-    alias_rows.each do |tag_id, alias_name|
-      tag_ids << tag_id
-      matched_alias_by_tag_id[tag_id] ||= alias_name
+    rows = autocomplete_rows(locale:, pattern: "#{ literal }%", nico:, present:)
+    if rows.length < 20 && q.present?
+      suffix_rows = autocomplete_rows(locale:, pattern: "%#{ literal }", nico:, present:)
+      rows = (rows + suffix_rows).uniq { [_1['category'], _1['id']] }.first(20)
     end
 
-    base =
-        Tag
-        .joins(:tag_names)
-        .preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
-                 parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
-        .where(tag_names: { language_code: locale.language_code, primary_flg: true },
-               deprecated_at: nil)
-    base = base.where('tags.post_count > 0') if present_only
-
-    canonical_hit = base.where('tag_names.name LIKE ?', prefix)
-
-    internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
-
-    internal_rows =
-        internal_tags
-        .order(Arel.sql('tags.post_count DESC, tag_names.name'))
-        .limit(20)
-        .map { |tag|
-          TagRepr.base(tag, language_code: locale.language_code)
-                 .merge(matched_alias: matched_alias_by_tag_id[tag.id])
-        }
-
-    return render json: internal_rows unless with_nico
-
-    external_base = ExternalTag.all
-    external_base = external_base.where('post_count > 0') if present_only
-
-    external_rows =
-        external_base
-        .where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", prefix, prefix)
-        .order(post_count: :desc, name: :asc)
-        .limit(20)
-        .map { external_tag_json(_1) }
-
-    rows =
-    (internal_rows + external_rows)
-        .sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
-        .first(20)
-
     render json: rows
   end
 
@@ -545,6 +498,59 @@ class TagsController < ApplicationController
 
   private
 
+  def autocomplete_rows locale:, pattern:, nico:, present:
+    alias_rows =
+        TagName
+        .where(language_code: locale.language_code, primary_flg: false)
+        .where('name LIKE ?', pattern)
+        .pluck(:tag_id, :name)
+
+    matched_alias_by_tag_id = { }
+    tag_ids = []
+    alias_rows.each do |tag_id, alias_name|
+      tag_ids << tag_id
+      matched_alias_by_tag_id[tag_id] ||= alias_name
+    end
+
+    base =
+        Tag
+        .joins(:tag_names)
+        .preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
+                 parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
+        .where(tag_names: { language_code: locale.language_code, primary_flg: true },
+               deprecated_at: nil)
+    base = base.where('tags.post_count > 0') if present
+
+    canonical_hit = base.where('tag_names.name LIKE ?', pattern)
+
+    internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
+
+    internal_rows =
+        internal_tags
+        .order(Arel.sql('tags.post_count DESC, tag_names.name'))
+        .limit(20)
+        .map { |tag|
+          TagRepr.base(tag, language_code: locale.language_code)
+                 .merge(matched_alias: matched_alias_by_tag_id[tag.id])
+        }
+
+    return internal_rows unless nico
+
+    external_base = ExternalTag.all
+    external_base = external_base.where('post_count > 0') if present
+
+    external_rows =
+        external_base
+        .where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", pattern, pattern)
+        .order(post_count: :desc, name: :asc)
+        .limit(20)
+        .map { external_tag_json(_1) }
+
+    (internal_rows + external_rows)
+        .sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
+        .first(20)
+  end
+
   def material_filter_param default:
     value = params[:material_filter].to_s.presence
     return default unless ['present', 'missing', 'any'].include?(value)

backend/app/services/post_tag_search.rb

@@ -4,11 +4,11 @@ class PostTagSearch
     tokens = raw.split.reject { _1.downcase == 'type:or' }
     names = tokens.map { _1.sub(/\Anot:/i, '') }
     registered = TagName.where(language_code: locale.language_code, name: names)
-        .pluck(:name, :tag_id).to_h.transform_keys(&:downcase)
+        .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|
-      { name: primary[registered[name.downcase]] || name,
+      { name: primary[registered[name]] || name,
         negative: token.downcase.start_with?('not:') }
     end
   end
@@ -20,11 +20,11 @@ class PostTagSearch
   def self.references_for(locale, literals)
     names = literals.map { _1[:name] }.uniq
     internal = TagName.where(language_code: locale.language_code, name: names)
-        .pluck(:name, :tag_id).group_by { _1.first.downcase }
+        .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 { _1.first.downcase }
-    names.to_h { |name| [name, [internal.fetch(name.downcase, []).map(&:last).uniq,
-                              external.fetch(name.downcase, []).map(&:last).uniq]] }
+        .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
 end