From a1ec74c6d9d53e31728baf784a1f4020d0fb05e5 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Fri, 20 Nov 2026 02:06:25 +0900 Subject: [PATCH] WIP: unverified Codex job issue-279-k4skc3rg --- .../app/controllers/nico_tags_controller.rb | 6 ++- backend/app/controllers/tags_controller.rb | 5 +- backend/spec/requests/nico_tags_spec.rb | 50 +++++++++++++++++++ backend/spec/requests/tags_spec.rb | 38 ++++++++++++++ 4 files changed, 95 insertions(+), 4 deletions(-) diff --git a/backend/app/controllers/nico_tags_controller.rb b/backend/app/controllers/nico_tags_controller.rb index 902358d..6bf49aa 100644 --- a/backend/app/controllers/nico_tags_controller.rb +++ b/backend/app/controllers/nico_tags_controller.rb @@ -28,17 +28,19 @@ class NicoTagsController < ApplicationController 'ON post_tag_max.external_tag_id = external_tags.id') .includes(linked_tags: [:tag_names, :tag_descriptions]) if name + name_pattern = ExternalTag.sanitize_sql_like(name).tr('*?', '%_') q = q.where(('external_tags.name LIKE ? ' + "OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"), - "%#{ name }%", "%#{ name }") + "%#{ name_pattern }%", "%#{ name_pattern }") end if linked_tag + linked_tag_pattern = "%#{ Tag.sanitize_sql_like(linked_tag).tr('*?', '%_') }%" linked_tag_ids = Tag .joins(:tag_names) .where(tag_names: { language_code: locale.language_code, primary_flg: true }) - .where('tag_names.name LIKE ?', "%#{ linked_tag }%") + .where('tag_names.name LIKE ?', linked_tag_pattern) .pluck(:id) linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id) q = q.where(id: linked_nico_tag_ids) diff --git a/backend/app/controllers/tags_controller.rb b/backend/app/controllers/tags_controller.rb index 65a9de1..5730ac4 100644 --- a/backend/app/controllers/tags_controller.rb +++ b/backend/app/controllers/tags_controller.rb @@ -56,10 +56,11 @@ class TagsController < ApplicationController end if name - tags = tags.where('tag_names.name LIKE ?', "%#{ name }%") + name_pattern = "%#{ Tag.sanitize_sql_like(name).tr('*?', '%_') }%" + tags = tags.where('tag_names.name LIKE ?', name_pattern) external_tags = external_tags.where("CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?", - "%#{ name }%") + name_pattern) end if category == 'nico' diff --git a/backend/spec/requests/nico_tags_spec.rb b/backend/spec/requests/nico_tags_spec.rb index 264f844..dd32b98 100644 --- a/backend/spec/requests/nico_tags_spec.rb +++ b/backend/spec/requests/nico_tags_spec.rb @@ -3,6 +3,56 @@ require 'rails_helper' RSpec.describe 'NicoTags', type: :request do describe 'GET /tags/nico' do + [:name, :linked_tag].each do |field| + context "when #{ field } contains wildcards" do + let!(:search_tags) do + names = ['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end'] + names.map.with_index do |name, index| + if field == :name + create(:external_tag, name:) + else + destination = create(:tag, primary_name: name) + external = create(:external_tag, name: "wild-linked-#{ index }") + NicoTagRelation.create!(nico_tag: external, tag: destination) + external + end + end + end + + { + '%' => [0, 4], + '_' => [1, 4], + 'wild%end' => [0], + 'wild_end' => [1], + 'wild*end' => [0, 1, 2, 3, 4], + 'wild?end' => [0, 1, 2], + 'wild??end' => [3, 4], + 'wild%*end' => [0, 4], + 'wild_?nd' => [1], + 'wild%?end' => [4] }.each do |query, indices| + it "filters #{ field } with #{ query.inspect }" do + get '/tags/nico', params: { field => query } + + expected_ids = indices.map { |index| search_tags[index].id } + expect(response).to have_http_status(:ok) + expect(json.fetch('tags').pluck('id')).to match_array(expected_ids) + expect(json.fetch('count')).to eq(expected_ids.size) + end + end + end + end + + it 'supports wildcards in qualified external names' do + external = create(:external_tag, name: 'qualified_end') + create(:external_tag, name: 'qualifiedABend') + + get '/tags/nico', params: { name: 'nico:qualified?end' } + + expect(response).to have_http_status(:ok) + expect(json.fetch('tags').pluck('id')).to eq([external.id]) + expect(json.fetch('count')).to eq(1) + end + it 'returns the legacy Tag-compatible external fields' do external = create(:external_tag, name: 'legacy_external', post_count: 3) diff --git a/backend/spec/requests/tags_spec.rb b/backend/spec/requests/tags_spec.rb index 7a66889..1fe8b07 100644 --- a/backend/spec/requests/tags_spec.rb +++ b/backend/spec/requests/tags_spec.rb @@ -39,6 +39,44 @@ RSpec.describe 'Tags API', type: :request do end describe 'GET /tags' do + context 'when the name contains wildcards' do + let(:names) do + ['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end'] + end + + before do + names.each do |name| + create(:tag, primary_name: name) + create(:external_tag, name:) + end + end + + { + '%' => [0, 4], + '_' => [1, 4], + 'wild%end' => [0], + 'wild_end' => [1], + 'wild*end' => [0, 1, 2, 3, 4], + 'wild?end' => [0, 1, 2], + 'wild??end' => [3, 4], + 'wild%*end' => [0, 4], + 'wild_?nd' => [1], + 'wild%?end' => [4], + 'nico:wild?end' => [0, 1, 2] }.each do |query, indices| + it "filters internal and external names with #{ query.inspect }" do + get '/tags', params: { name: query } + + expected_names = indices.flat_map do |index| + name = names[index] + query.start_with?('nico:') ? ["nico:#{ name }"] : [name, "nico:#{ name }"] + end + expect(response).to have_http_status(:ok) + expect(response_names).to match_array(expected_names) + expect(json.fetch('count')).to eq(expected_names.size) + end + end + end + it 'serialises descriptions and parents without loading legacy Wiki pages' do TagDescription.create!(tag:, language_code: 'ja', body: '', version_no: 1) TagDescription.create!(tag: tag2, language_code: 'ja', body: '', version_no: 1)