about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-05-31 14:34:51 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-05-31 20:34:51 +0200
commit5236a6286107f5731c5f57940592a46ebd3c6107 (patch)
tree341c2c93c877c1b029a6b05d55b3bbeb5fececb3 /app
parent0f155829b7362d2bb81e2b80e96a351dc7dac538 (diff)
Improve spec coverage and clean up api/v1/blocks controller (#3464)
Diffstat (limited to 'app')
-rw-r--r--app/controllers/api/v1/blocks_controller.rb52
1 files changed, 44 insertions, 8 deletions
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index b2f3ae512..d15cb439c 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -3,23 +3,59 @@
 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
+    @accounts = load_accounts
+  end
 
-    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?
+  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
 
-  private
+  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)