From 75cad1d9d6778419a163d2f256d87dbafa9febd4 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 31 May 2017 14:30:39 -0400 Subject: [PATCH] Improve spec coverage and clean up api/v1/favourites controller (#3472) --- .../api/v1/favourites_controller.rb | 66 ++++++++++++++++--- .../api/v1/favourites_controller_spec.rb | 4 +- 2 files changed, 60 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb index 22b93fe79a..4614a0c724 100644 --- a/app/controllers/api/v1/favourites_controller.rb +++ b/app/controllers/api/v1/favourites_controller.rb @@ -3,23 +3,71 @@ class Api::V1::FavouritesController < ApiController before_action -> { doorkeeper_authorize! :read } before_action :require_user! + after_action :insert_pagination_headers respond_to :json def index - results = Favourite.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) - @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) + @statuses = load_statuses end 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) params.permit(:limit).merge(core_params) end diff --git a/spec/controllers/api/v1/favourites_controller_spec.rb b/spec/controllers/api/v1/favourites_controller_spec.rb index a6e9963e52..062e91adcc 100644 --- a/spec/controllers/api/v1/favourites_controller_spec.rb +++ b/spec/controllers/api/v1/favourites_controller_spec.rb @@ -7,12 +7,14 @@ RSpec.describe Api::V1::FavouritesController, type: :controller do let(:token) { double acceptable?: true, resource_owner_id: user.id } before do + Fabricate(:favourite, 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