Fix `/api/v2/search` not working with following query param (#25681)
parent
69e124e2ed
commit
383c00819c
|
@ -34,11 +34,11 @@ class Api::V2::SearchController < Api::BaseController
|
||||||
params[:q],
|
params[:q],
|
||||||
current_account,
|
current_account,
|
||||||
limit_param(RESULTS_LIMIT),
|
limit_param(RESULTS_LIMIT),
|
||||||
search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed))
|
search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed), following: truthy_param?(:following))
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def search_params
|
def search_params
|
||||||
params.permit(:type, :offset, :min_id, :max_id, :account_id)
|
params.permit(:type, :offset, :min_id, :max_id, :account_id, :following)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,6 +8,7 @@ class SearchService < BaseService
|
||||||
@limit = limit.to_i
|
@limit = limit.to_i
|
||||||
@offset = options[:type].blank? ? 0 : options[:offset].to_i
|
@offset = options[:type].blank? ? 0 : options[:offset].to_i
|
||||||
@resolve = options[:resolve] || false
|
@resolve = options[:resolve] || false
|
||||||
|
@following = options[:following] || false
|
||||||
|
|
||||||
default_results.tap do |results|
|
default_results.tap do |results|
|
||||||
next if @query.blank? || @limit.zero?
|
next if @query.blank? || @limit.zero?
|
||||||
|
@ -31,7 +32,8 @@ class SearchService < BaseService
|
||||||
limit: @limit,
|
limit: @limit,
|
||||||
resolve: @resolve,
|
resolve: @resolve,
|
||||||
offset: @offset,
|
offset: @offset,
|
||||||
use_searchable_text: true
|
use_searchable_text: true,
|
||||||
|
following: @following
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -14,13 +14,40 @@ RSpec.describe Api::V2::SearchController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET #index' do
|
describe 'GET #index' do
|
||||||
before do
|
let!(:bob) { Fabricate(:account, username: 'bob_test') }
|
||||||
get :index, params: { q: 'test' }
|
let!(:ana) { Fabricate(:account, username: 'ana_test') }
|
||||||
end
|
let!(:tom) { Fabricate(:account, username: 'tom_test') }
|
||||||
|
let(:params) { { q: 'test' } }
|
||||||
|
|
||||||
it 'returns http success' do
|
it 'returns http success' do
|
||||||
|
get :index, params: params
|
||||||
|
|
||||||
expect(response).to have_http_status(200)
|
expect(response).to have_http_status(200)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when searching accounts' do
|
||||||
|
let(:params) { { q: 'test', type: 'accounts' } }
|
||||||
|
|
||||||
|
it 'returns all matching accounts' do
|
||||||
|
get :index, params: params
|
||||||
|
|
||||||
|
expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(bob.id.to_s, ana.id.to_s, tom.id.to_s)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with following=true' do
|
||||||
|
let(:params) { { q: 'test', type: 'accounts', following: 'true' } }
|
||||||
|
|
||||||
|
before do
|
||||||
|
user.account.follow!(ana)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns only the followed accounts' do
|
||||||
|
get :index, params: params
|
||||||
|
|
||||||
|
expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(ana.id.to_s)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ describe SearchService, type: :service do
|
||||||
allow(AccountSearchService).to receive(:new).and_return(service)
|
allow(AccountSearchService).to receive(:new).and_return(service)
|
||||||
|
|
||||||
results = subject.call(query, nil, 10)
|
results = subject.call(query, nil, 10)
|
||||||
expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false, use_searchable_text: true)
|
expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false, use_searchable_text: true, following: false)
|
||||||
expect(results).to eq empty_results.merge(accounts: [account])
|
expect(results).to eq empty_results.merge(accounts: [account])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue