Improve spec coverage and clean up api/v1/blocks controller (#3464)

signup-info-prompt
Matt Jankowski 2017-05-31 14:34:51 -04:00 committed by Eugen Rochko
parent 0f155829b7
commit 5236a62861
2 changed files with 49 additions and 11 deletions

View File

@ -3,24 +3,60 @@
class Api::V1::BlocksController < ApiController class Api::V1::BlocksController < ApiController
before_action -> { doorkeeper_authorize! :follow } before_action -> { doorkeeper_authorize! :follow }
before_action :require_user! before_action :require_user!
after_action :insert_pagination_headers
respond_to :json respond_to :json
def index def index
@accounts = Account.includes(:blocked_by) @accounts = load_accounts
.references(:blocked_by)
.merge(Block.where(account: current_account)
.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]))
.to_a
next_path = api_v1_blocks_url(pagination_params(max_id: @accounts.last.blocked_by_ids.last)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = api_v1_blocks_url(pagination_params(since_id: @accounts.first.blocked_by_ids.first)) unless @accounts.empty?
set_pagination_headers(next_path, prev_path)
end end
private private
def load_accounts
default_accounts.merge(paginated_blocks).to_a
end
def default_accounts
Account.includes(:blocked_by).references(:blocked_by)
end
def paginated_blocks
Block.where(account: current_account).paginate_by_max_id(
limit_param(DEFAULT_ACCOUNTS_LIMIT),
params[:max_id],
params[:since_id]
)
end
def insert_pagination_headers
set_pagination_headers(next_path, prev_path)
end
def next_path
if records_continue?
api_v1_blocks_url pagination_params(max_id: pagination_max_id)
end
end
def prev_path
unless @accounts.empty?
api_v1_blocks_url pagination_params(since_id: pagination_since_id)
end
end
def pagination_max_id
@accounts.last.blocked_by_ids.last
end
def pagination_since_id
@accounts.first.blocked_by_ids.first
end
def records_continue?
@accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
end
def pagination_params(core_params) def pagination_params(core_params)
params.permit(:limit).merge(core_params) params.permit(:limit).merge(core_params)
end end

View File

@ -7,12 +7,14 @@ RSpec.describe Api::V1::BlocksController, type: :controller do
let(:token) { double acceptable?: true, resource_owner_id: user.id } let(:token) { double acceptable?: true, resource_owner_id: user.id }
before do before do
Fabricate(:block, account: user.account)
allow(controller).to receive(:doorkeeper_token) { token } allow(controller).to receive(:doorkeeper_token) { token }
end end
describe 'GET #index' do describe 'GET #index' do
it 'returns http success' do it 'returns http success' do
get :index get :index, params: { limit: 1 }
expect(response).to have_http_status(:success) expect(response).to have_http_status(:success)
end end
end end