* Make Array-creation behavior of Paginable more predictable Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it returns an Array if min_id option is present. The behavior caused problems fixed with the following commits: -976938bf30-5a8fa3ad95-1c70d8189cTo prevent from recurring similar problems, this commit introduces two changes: - The scope now always returns an Array whether min_id option is present or not. - The scope is renamed to to_a_paginated_by_id to clarify it returns an Array. * Transform Paginable.to_a_paginated_by_id from a scope to a class method https://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope > The method is intended to return an ActiveRecord::Relation object, which > is composable with other scopes. Paginable.to_a_paginated_by_id returns an Array and is not appropriate as a scope.
		
			
				
	
	
		
			61 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class Api::V1::BookmarksController < Api::BaseController
 | |
|   before_action -> { doorkeeper_authorize! :read, :'read:bookmarks' }
 | |
|   before_action :require_user!
 | |
|   after_action :insert_pagination_headers
 | |
| 
 | |
|   def index
 | |
|     @statuses = load_statuses
 | |
|     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def load_statuses
 | |
|     cached_bookmarks
 | |
|   end
 | |
| 
 | |
|   def cached_bookmarks
 | |
|     cache_collection(results.map(&:status), Status)
 | |
|   end
 | |
| 
 | |
|   def results
 | |
|     @_results ||= account_bookmarks.eager_load(:status).to_a_paginated_by_id(
 | |
|       limit_param(DEFAULT_STATUSES_LIMIT),
 | |
|       params_slice(:max_id, :since_id, :min_id)
 | |
|     )
 | |
|   end
 | |
| 
 | |
|   def account_bookmarks
 | |
|     current_account.bookmarks
 | |
|   end
 | |
| 
 | |
|   def insert_pagination_headers
 | |
|     set_pagination_headers(next_path, prev_path)
 | |
|   end
 | |
| 
 | |
|   def next_path
 | |
|     api_v1_bookmarks_url pagination_params(max_id: pagination_max_id) if records_continue?
 | |
|   end
 | |
| 
 | |
|   def prev_path
 | |
|     api_v1_bookmarks_url pagination_params(min_id: pagination_since_id) unless results.empty?
 | |
|   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_STATUSES_LIMIT)
 | |
|   end
 | |
| 
 | |
|   def pagination_params(core_params)
 | |
|     params.slice(:limit).permit(:limit).merge(core_params)
 | |
|   end
 | |
| end
 |