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

1 files changed, 54 insertions, 6 deletions

diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 22b93fe79..4614a0c72 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -3,22 +3,70 @@
 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)
+    @statuses = load_statuses
+  end
+
+  private
+
+  def load_statuses
+    cached_favourites.tap do |statuses|
+      set_maps(statuses)
+    end
+  end
 
-    set_maps(@statuses)
+  def cached_favourites
+    cache_collection(
+      Status.where(
+        id: results.map(&:status_id)
+      ),
+      Status
+    )
+  end
 
-    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?
+  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
 
-  private
+  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)