#434

backend/app/services/counts_candidates.rb

@@ -23,22 +23,25 @@ class CountsCandidates
     internal = CountsPopulation.new(options)
     external = CountsPopulation.new(options.merge('resource' => 'nico_tags',
         'execution_at' => internal.at.iso8601(6)))
-    language = Locale.find_by!(code: @params.fetch('locale', 'ja')).language_code
     connection = TagVersion.connection
-    path = connection.quote("$.#{ language.to_json }.name")
-    name = "COALESCE(JSON_UNQUOTE(JSON_EXTRACT(v.names, #{ path })), v.name)"
-    sources = [[internal, 'internal', name, 'v.category'],
-               [external, 'external', 'v.name', 'NULL']].map do |population, kind, title, category|
-      population.scope.except(:select).select(Arel.sql(
+    sources = [[internal, 'internal', 'v.category', 'v.names'],
+               [external, 'external', 'NULL', 'JSON_OBJECT()']]
+    sources = sources.map do |population, kind, category, names|
+      scope = population.scope.except(:select)
+      if @params['query'].present?
+        pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
+        scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
+            "SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
+            "JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
+            'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
+      end
+      scope.select(Arel.sql(
           "CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
-          "#{ title } AS name, #{ category } AS category, '#{ kind }' AS kind")).to_sql
+          "v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind"))
+          .to_sql
     end
     clauses = []
     binds = []
-    if @params['query'].present?
-      clauses << '(name LIKE ? OR CAST(id AS CHAR) = ?)'
-      binds += ["%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%", @params['query']]
-    end
     if @params['category'].present?
       clauses << 'category = ?'
       binds << @params['category']
@@ -49,6 +52,7 @@ class CountsCandidates
       #{ where } ORDER BY kind, id LIMIT #{ LIMIT + 1 } OFFSET #{ (@page - 1) * LIMIT }
     SQL
     rows = connection.select_all(ApplicationRecord.sanitize_sql_array([sql, *binds])).to_a
+    rows.each { _1['names'] = JSON.parse(_1['names']) if _1['names'].is_a?(String) }
     { rows: rows.first(LIMIT), page: @page, more: rows.length > LIMIT,
       execution_at: internal.at.iso8601(6) }
   end