From 5236a6286107f5731c5f57940592a46ebd3c6107 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 31 May 2017 14:34:51 -0400 Subject: [PATCH] Improve spec coverage and clean up api/v1/blocks controller (#3464) --- app/controllers/api/v1/blocks_controller.rb | 56 +++++++++++++++---- .../api/v1/blocks_controller_spec.rb | 4 +- 2 files changed, 49 insertions(+), 11 deletions(-) diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb index b2f3ae51254..d15cb439cf5 100644 --- a/app/controllers/api/v1/blocks_controller.rb +++ b/app/controllers/api/v1/blocks_controller.rb @@ -3,24 +3,60 @@ class Api::V1::BlocksController < ApiController before_action -> { doorkeeper_authorize! :follow } before_action :require_user! + after_action :insert_pagination_headers respond_to :json def index - @accounts = Account.includes(:blocked_by) - .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) + @accounts = load_accounts end 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) params.permit(:limit).merge(core_params) end diff --git a/spec/controllers/api/v1/blocks_controller_spec.rb b/spec/controllers/api/v1/blocks_controller_spec.rb index ca20a2d172f..4fd968b27c8 100644 --- a/spec/controllers/api/v1/blocks_controller_spec.rb +++ b/spec/controllers/api/v1/blocks_controller_spec.rb @@ -7,12 +7,14 @@ RSpec.describe Api::V1::BlocksController, type: :controller do let(:token) { double acceptable?: true, resource_owner_id: user.id } before do + Fabricate(:block, account: user.account) allow(controller).to receive(:doorkeeper_token) { token } end describe 'GET #index' do it 'returns http success' do - get :index + get :index, params: { limit: 1 } + expect(response).to have_http_status(:success) end end