From c1375c05a545a0d239d7465f90ec277f19d849e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=83=84=E3=83=8E=E3=83=8B=E3=82=B8=E3=82=AB?= <969+codex-bot@noreply.localhost> Date: Mon, 23 Nov 2026 00:28:18 +0900 Subject: [PATCH] =?UTF-8?q?AI:=20#279=20=E6=A4=9C=E7=B4=A2=E3=81=AE?= =?UTF-8?q?=E3=83=AF=E3=82=A4=E3=83=AB=E3=83=89=E3=82=AB=E3=83=BC=E3=83=89?= =?UTF-8?q?=20(#488)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs #279 Branch mode: `continue`; base: `main`; head: `feature/279` Implementation model: `gpt-6.1-sol` / reasoning: `medium` ## Automated implementation (requires human review) `backend/spec/requests/tags_spec.rb` を修正しました。`_` 単独検索で共通データの `spec_tag` まで一致するため、このテスト内だけ名前を `background-tag` に変更しました。 本体コードの変更・テスト追加はありません。差分の空白検査は通過しました。テストは指示どおり自身では実行せず、コントローラーの検証に引き継ぎます。 過去の `event_id` 制約エラーは原因を特定できておらず、解消済みとは判断していません。 ## Verification **PASS**: bundle check, /usr/bin/python3 /opt/gitea-codex-v4/prepare_btrc_test.py, bundle exec rspec - A passing test suite is not a substitute for human UI/security review. - The repository owner alone reviews changes. No AI review is executed. - Do not merge before human acceptance and required checks. --------- Co-authored-by: Codex Night Worker Co-authored-by: みてるぞ Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/488 Co-authored-by: テツノニジカ <969+codex-bot@noreply.localhost> --- .../app/controllers/nico_tags_controller.rb | 6 +- backend/app/controllers/posts_controller.rb | 4 +- backend/app/controllers/tags_controller.rb | 11 +-- backend/spec/requests/nico_tags_spec.rb | 50 +++++++++++++ backend/spec/requests/posts_spec.rb | 39 ++++++++++ backend/spec/requests/tags_spec.rb | 75 +++++++++++++++++++ 6 files changed, 176 insertions(+), 9 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/posts_controller.rb b/backend/app/controllers/posts_controller.rb index ba15e99..2b4d7cd 100644 --- a/backend/app/controllers/posts_controller.rb +++ b/backend/app/controllers/posts_controller.rb @@ -46,8 +46,8 @@ class PostsController < ApplicationController :tag_names, :tag_descriptions] }]) .with_attached_thumbnail - q = q.where('posts.url LIKE ?', "%#{ url }%") if url - q = q.where('posts.title LIKE ?', "%#{ title }%") if title + q = q.where('posts.url LIKE ?', "%#{ Post.sanitize_sql_like(url).tr('*?', '%_') }%") if url + q = q.where('posts.title LIKE ?', "%#{ Post.sanitize_sql_like(title).tr('*?', '%_') }%") if title if original_created_from q = q.where('posts.original_created_before > ?', original_created_from) end diff --git a/backend/app/controllers/tags_controller.rb b/backend/app/controllers/tags_controller.rb index 7c6feac..15ef924 100644 --- a/backend/app/controllers/tags_controller.rb +++ b/backend/app/controllers/tags_controller.rb @@ -9,8 +9,8 @@ class TagsController < ApplicationController post_id = params[:post] - name = params[:name].presence - category = params[:category].presence + name = params[:name].to_s.strip.presence + category = params[:category].to_s.strip.presence post_count_between = (params[:post_count_gte].presence || -1).to_i, (params[:post_count_lte].presence || -1).to_i post_count_between[0] = nil if post_count_between[0] < 0 @@ -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' @@ -218,7 +219,7 @@ class TagsController < ApplicationController locale = resolve_locale! q = params[:q].to_s.strip.sub(/\Anot:/i, '') - prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%" + prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q).tr('*?', '%_') }%" with_nico = bool?(:nico, default: true) present_only = bool?(:present, default: true) 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/posts_spec.rb b/backend/spec/requests/posts_spec.rb index aa5f7c1..907e981 100644 --- a/backend/spec/requests/posts_spec.rb +++ b/backend/spec/requests/posts_spec.rb @@ -516,6 +516,45 @@ RSpec.describe 'Posts API', type: :request do end end + [:title, :url].each do |field| + context "when #{field} contains wildcards" do + let!(:search_posts) do + values = [ + 'needle%25end', 'needleX25end', 'needle_end', + 'needleXend', 'needleABend', 'needle%25_end'] + values.map.with_index do |value, index| + Post.create!(uploaded_user: user, + title: field == :title ? "prefix #{value} suffix" : 'url search post', + url: field == :url ? "https://example.com/prefix-#{value}-suffix" : + "https://example.com/title-search-#{index}") + end + end + + { + '%' => [0, 5], + '_' => [2, 5], + 'needle%25end' => [0], + 'needle_end' => [2], + 'needle*end' => [0, 1, 2, 3, 4, 5], + 'needle?end' => [2, 3], + 'needle??end' => [4], + 'needle%*end' => [0, 5], + 'needle_?nd' => [2], + 'needle%25_end' => [5], + 'needle%25_*end' => [5] + }.each do |query, expected_indices| + it "matches #{query.inspect} using only * and ? as wildcards" do + get '/posts', params: { field => query } + + expect(response).to have_http_status(:ok) + expected_ids = expected_indices.map { |i| search_posts[i].id } + expect(json.fetch('posts').map { |p| p['id'] }).to match_array(expected_ids) + expect(json.fetch('count')).to eq(expected_ids.size) + end + end + end + end + context 'when created_from/created_to are provided' do let(:t_created_hit) { Time.zone.local(2010, 1, 5, 12, 0, 0) } let(:t_created_miss) { Time.zone.local(2012, 1, 5, 12, 0, 0) } diff --git a/backend/spec/requests/tags_spec.rb b/backend/spec/requests/tags_spec.rb index 7a66889..da16111 100644 --- a/backend/spec/requests/tags_spec.rb +++ b/backend/spec/requests/tags_spec.rb @@ -39,6 +39,46 @@ RSpec.describe 'Tags API', type: :request do end describe 'GET /tags' do + context 'when the name contains wildcards' do + let!(:tn) { create(:tag_name, name: 'background-tag') } + + 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) @@ -439,6 +479,41 @@ RSpec.describe 'Tags API', type: :request do end describe 'GET /tags/autocomplete' do + context 'when q contains wildcards' do + let(:names) { ['wildend', 'wildXend', 'wildABend', 'otherwildXend'] } + + before do + names.each_with_index do |name, index| + create(:tag, primary_name: name, post_count: 1) + alias_target = create(:tag, primary_name: "target_#{ index }", post_count: 1) + create(:tag_name, :alias, name: "#{ name }_alias", tag: alias_target) + create(:external_tag, name:, post_count: 1) + end + end + + { + 'wild*end' => [0, 1, 2], + 'wild?end' => [1], + 'not:wild?end' => [1], + 'nico:wild?end' => [1] }.each do |query, indices| + it "matches primary, alias, and external names with #{ query.inspect }" do + get '/tags/autocomplete', params: { q: query } + + expected_names = indices.flat_map do |index| + name = names[index] + query.start_with?('nico:') ? ["nico:#{ name }"] : + [name, "target_#{ index }", "nico:#{ name }"] + end + expect(response).to have_http_status(:ok) + expect(json.map { |row| row.fetch('name') }).to match_array(expected_names) + unless query.start_with?('nico:') + row = json.find { |item| item.fetch('name') == "target_#{ indices.first }" } + expect(row.fetch('matched_alias')).to eq("#{ names[indices.first] }_alias") + end + end + end + end + it 'combines internal and external matches without conflating equal ids' do internal = create(:tag, category: :general, primary_name: 'mixed_internal', post_count: 2) external = create(:external_tag, id: internal.id,