Improve spec coverage and clean up api/v1/favourites controller (#3472)

This commit is contained in:
Matt Jankowski 2017-05-31 14:30:39 -04:00 committed by Eugen Rochko
parent 2cc3111a77
commit 75cad1d9d6
2 changed files with 60 additions and 10 deletions

View File

@ -3,23 +3,71 @@
class Api::V1::FavouritesController < ApiController class Api::V1::FavouritesController < ApiController
before_action -> { doorkeeper_authorize! :read } before_action -> { doorkeeper_authorize! :read }
before_action :require_user! before_action :require_user!
after_action :insert_pagination_headers
respond_to :json respond_to :json
def index def index
results = Favourite.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) @statuses = load_statuses
@statuses = cache_collection(Status.where(id: results.map(&:status_id)), Status)
set_maps(@statuses)
next_path = api_v1_favourites_url(pagination_params(max_id: results.last.id)) if results.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = api_v1_favourites_url(pagination_params(since_id: results.first.id)) unless results.empty?
set_pagination_headers(next_path, prev_path)
end end
private private
def load_statuses
cached_favourites.tap do |statuses|
set_maps(statuses)
end
end
def cached_favourites
cache_collection(
Status.where(
id: results.map(&:status_id)
),
Status
)
end
def results
@_results ||= account_favourites.paginate_by_max_id(
limit_param(DEFAULT_STATUSES_LIMIT),
params[:max_id],
params[:since_id]
)
end
def account_favourites
current_account.favourites
end
def insert_pagination_headers
set_pagination_headers(next_path, prev_path)
end
def next_path
if records_continue?
api_v1_favourites_url pagination_params(max_id: pagination_max_id)
end
end
def prev_path
unless results.empty?
api_v1_favourites_url pagination_params(since_id: pagination_since_id)
end
end
def pagination_max_id
results.last.id
end
def pagination_since_id
results.first.id
end
def records_continue?
results.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::FavouritesController, 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(:favourite, 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