Fix pagination in Api::V1::BlocksController (#5285)

This commit is contained in:
Akihiko Odaki 2017-10-10 00:30:31 +09:00 committed by Eugen Rochko
parent 7fd66cf2fe
commit cc796298c9
2 changed files with 49 additions and 19 deletions

View File

@ -15,15 +15,13 @@ class Api::V1::BlocksController < Api::BaseController
private private
def load_accounts def load_accounts
default_accounts.merge(paginated_blocks).to_a paginated_blocks.map(&:target_account)
end
def default_accounts
Account.includes(:blocked_by).references(:blocked_by)
end end
def paginated_blocks def paginated_blocks
Block.where(account: current_account).paginate_by_max_id( @paginated_blocks ||= Block.eager_load(:target_account)
.where(account: current_account)
.paginate_by_max_id(
limit_param(DEFAULT_ACCOUNTS_LIMIT), limit_param(DEFAULT_ACCOUNTS_LIMIT),
params[:max_id], params[:max_id],
params[:since_id] params[:since_id]
@ -41,21 +39,21 @@ class Api::V1::BlocksController < Api::BaseController
end end
def prev_path def prev_path
unless @accounts.empty? unless paginated_blocks.empty?
api_v1_blocks_url pagination_params(since_id: pagination_since_id) api_v1_blocks_url pagination_params(since_id: pagination_since_id)
end end
end end
def pagination_max_id def pagination_max_id
@accounts.last.blocked_by_ids.last paginated_blocks.last.id
end end
def pagination_since_id def pagination_since_id
@accounts.first.blocked_by_ids.first paginated_blocks.first.id
end end
def records_continue? def records_continue?
@accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) paginated_blocks.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
end end
def pagination_params(core_params) def pagination_params(core_params)

View File

@ -6,15 +6,47 @@ RSpec.describe Api::V1::BlocksController, type: :controller do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') } let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') }
before do before { allow(controller).to receive(:doorkeeper_token) { token } }
Fabricate(:block, account: user.account)
allow(controller).to receive(:doorkeeper_token) { token }
end
describe 'GET #index' do describe 'GET #index' do
it 'returns http success' do it 'limits according to limit parameter' do
2.times.map { Fabricate(:block, account: user.account) }
get :index, params: { limit: 1 } get :index, params: { limit: 1 }
expect(body_as_json.size).to eq 1
end
it 'queries blocks in range according to max_id' do
blocks = 2.times.map { Fabricate(:block, account: user.account) }
get :index, params: { max_id: blocks[1] }
expect(body_as_json.size).to eq 1
expect(body_as_json[0][:id]).to eq blocks[0].target_account_id.to_s
end
it 'queries blocks in range according to since_id' do
blocks = 2.times.map { Fabricate(:block, account: user.account) }
get :index, params: { since_id: blocks[0] }
expect(body_as_json.size).to eq 1
expect(body_as_json[0][:id]).to eq blocks[1].target_account_id.to_s
end
it 'sets pagination header for next path' do
blocks = 2.times.map { Fabricate(:block, account: user.account) }
get :index, params: { limit: 1, since_id: blocks[0] }
expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq api_v1_blocks_url(limit: 1, max_id: blocks[1])
end
it 'sets pagination header for previous path' do
block = Fabricate(:block, account: user.account)
get :index
expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq api_v1_blocks_url(since_id: block)
end
it 'returns http success' do
get :index
expect(response).to have_http_status(:success) expect(response).to have_http_status(:success)
end end
end end