From 5a2c0707f163f14565d186db48bf0b4fe0b05b4f Mon Sep 17 00:00:00 2001
From: Gomasy <nyan@gomasy.jp>
Date: Mon, 18 Nov 2019 01:09:42 +0900
Subject: [PATCH] Support min_id-based pagination for bookmarks (#12381)
* Support min_id-based pagination for bookmarks
* Fix spec
---
app/controllers/api/v1/bookmarks_controller.rb | 7 +++----
spec/controllers/api/v1/bookmarks_controller_spec.rb | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index cf4cba8dd..e1b244e76 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -26,10 +26,9 @@ class Api::V1::BookmarksController < Api::BaseController
end
def results
- @_results ||= account_bookmarks.paginate_by_max_id(
+ @_results ||= account_bookmarks.paginate_by_id(
limit_param(DEFAULT_STATUSES_LIMIT),
- params[:max_id],
- params[:since_id]
+ params_slice(:max_id, :since_id, :min_id)
)
end
@@ -46,7 +45,7 @@ class Api::V1::BookmarksController < Api::BaseController
end
def prev_path
- api_v1_bookmarks_url pagination_params(since_id: pagination_since_id) unless results.empty?
+ api_v1_bookmarks_url pagination_params(min_id: pagination_since_id) unless results.empty?
end
def pagination_max_id
diff --git a/spec/controllers/api/v1/bookmarks_controller_spec.rb b/spec/controllers/api/v1/bookmarks_controller_spec.rb
index 79601b6e6..d7c5847b0 100644
--- a/spec/controllers/api/v1/bookmarks_controller_spec.rb
+++ b/spec/controllers/api/v1/bookmarks_controller_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe Api::V1::BookmarksController, type: :controller do
get :index, params: { limit: 1 }
expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&max_id=#{bookmark.id}"
- expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&since_id=#{bookmark.id}"
+ expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&min_id=#{bookmark.id}"
end
it 'does not add pagination headers if not necessary' do