From 383c00819cce101673f6c6ede08098336024ee70 Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 3 Jul 2023 13:06:57 -0300 Subject: [PATCH] Fix `/api/v2/search` not working with following query param (#25681) --- app/controllers/api/v2/search_controller.rb | 4 +-- app/services/search_service.rb | 16 +++++---- .../api/v2/search_controller_spec.rb | 33 +++++++++++++++++-- spec/services/search_service_spec.rb | 2 +- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb index 4d20aeb10f..35be549305 100644 --- a/app/controllers/api/v2/search_controller.rb +++ b/app/controllers/api/v2/search_controller.rb @@ -34,11 +34,11 @@ class Api::V2::SearchController < Api::BaseController params[:q], current_account, 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 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 diff --git a/app/services/search_service.rb b/app/services/search_service.rb index dad8c0b28f..05d2d0e7ce 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -2,12 +2,13 @@ class SearchService < BaseService def call(query, account, limit, options = {}) - @query = query&.strip - @account = account - @options = options - @limit = limit.to_i - @offset = options[:type].blank? ? 0 : options[:offset].to_i - @resolve = options[:resolve] || false + @query = query&.strip + @account = account + @options = options + @limit = limit.to_i + @offset = options[:type].blank? ? 0 : options[:offset].to_i + @resolve = options[:resolve] || false + @following = options[:following] || false default_results.tap do |results| next if @query.blank? || @limit.zero? @@ -31,7 +32,8 @@ class SearchService < BaseService limit: @limit, resolve: @resolve, offset: @offset, - use_searchable_text: true + use_searchable_text: true, + following: @following ) end diff --git a/spec/controllers/api/v2/search_controller_spec.rb b/spec/controllers/api/v2/search_controller_spec.rb index bfabe8cc17..a3b92fc37a 100644 --- a/spec/controllers/api/v2/search_controller_spec.rb +++ b/spec/controllers/api/v2/search_controller_spec.rb @@ -14,13 +14,40 @@ RSpec.describe Api::V2::SearchController do end describe 'GET #index' do - before do - get :index, params: { q: 'test' } - end + let!(:bob) { Fabricate(:account, username: 'bob_test') } + let!(:ana) { Fabricate(:account, username: 'ana_test') } + let!(:tom) { Fabricate(:account, username: 'tom_test') } + let(:params) { { q: 'test' } } it 'returns http success' do + get :index, params: params + expect(response).to have_http_status(200) 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 diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb index 3bf7f8ce9f..497ec74474 100644 --- a/spec/services/search_service_spec.rb +++ b/spec/services/search_service_spec.rb @@ -68,7 +68,7 @@ describe SearchService, type: :service do allow(AccountSearchService).to receive(:new).and_return(service) 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]) end end