Make Api::V1::MutesController paginate properly (#8472)

Fixes #8463
signup-info-prompt
Jakub Mendyk 2018-08-26 21:30:17 +02:00 committed by Eugen Rochko
parent b534249a8d
commit f3a12ddfd0
2 changed files with 61 additions and 21 deletions

View File

@ -15,19 +15,17 @@ class Api::V1::MutesController < Api::BaseController
private private
def load_accounts def load_accounts
default_accounts.merge(paginated_mutes).to_a paginated_mutes.map(&:target_account)
end
def default_accounts
Account.includes(:muted_by).references(:muted_by)
end end
def paginated_mutes def paginated_mutes
Mute.where(account: current_account).paginate_by_max_id( @paginated_mutes ||= Mute.eager_load(:target_account)
limit_param(DEFAULT_ACCOUNTS_LIMIT), .where(account: current_account)
params[:max_id], .paginate_by_max_id(
params[:since_id] limit_param(DEFAULT_ACCOUNTS_LIMIT),
) params[:max_id],
params[:since_id]
)
end end
def insert_pagination_headers def insert_pagination_headers
@ -41,21 +39,21 @@ class Api::V1::MutesController < Api::BaseController
end end
def prev_path def prev_path
unless @accounts.empty? unless paginated_mutes.empty?
api_v1_mutes_url pagination_params(since_id: pagination_since_id) api_v1_mutes_url pagination_params(since_id: pagination_since_id)
end end
end end
def pagination_max_id def pagination_max_id
@accounts.last.muted_by_ids.last paginated_mutes.last.id
end end
def pagination_since_id def pagination_since_id
@accounts.first.muted_by_ids.first paginated_mutes.first.id
end end
def records_continue? def records_continue?
@accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) paginated_mutes.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
end end
def pagination_params(core_params) def pagination_params(core_params)

View File

@ -3,19 +3,61 @@ require 'rails_helper'
RSpec.describe Api::V1::MutesController, type: :controller do RSpec.describe Api::V1::MutesController, type: :controller do
render_views render_views
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: 'read:mutes') } let(:scopes) { 'read:mutes' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
before do before { allow(controller).to receive(:doorkeeper_token) { token } }
Fabricate(:mute, account: user.account, hide_notifications: false)
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(:mute, account: user.account) }
get :index, params: { limit: 1 } get :index, params: { limit: 1 }
expect(body_as_json.size).to eq 1
end
it 'queries mutes in range according to max_id' do
mutes = 2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { max_id: mutes[1] }
expect(body_as_json.size).to eq 1
expect(body_as_json[0][:id]).to eq mutes[0].target_account_id.to_s
end
it 'queries mutes in range according to since_id' do
mutes = 2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { since_id: mutes[0] }
expect(body_as_json.size).to eq 1
expect(body_as_json[0][:id]).to eq mutes[1].target_account_id.to_s
end
it 'sets pagination header for next path' do
mutes = 2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { limit: 1, since_id: mutes[0] }
expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq api_v1_mutes_url(limit: 1, max_id: mutes[1])
end
it 'sets pagination header for previous path' do
mute = Fabricate(:mute, account: user.account)
get :index
expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq api_v1_mutes_url(since_id: mute)
end
it 'returns http success' do
get :index
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
end end
context 'with wrong scopes' do
let(:scopes) { 'write:mutes' }
it 'returns http forbidden' do
get :index
expect(response).to have_http_status(403)
end
end
end end
end end