Refactor and extract DefaultPaginationStrategy.
This commit is contained in:
parent
7e78eacd2a
commit
cc1d141127
|
@ -1,6 +1,18 @@
|
||||||
module API
|
module API
|
||||||
module Helpers
|
module Helpers
|
||||||
module Pagination
|
module Pagination
|
||||||
|
def paginate(relation)
|
||||||
|
DefaultPaginationStrategy.new(self).paginate(relation)
|
||||||
|
end
|
||||||
|
|
||||||
|
class DefaultPaginationStrategy
|
||||||
|
attr_reader :ctx
|
||||||
|
delegate :params, :header, :request, to: :ctx
|
||||||
|
|
||||||
|
def initialize(ctx)
|
||||||
|
@ctx = ctx
|
||||||
|
end
|
||||||
|
|
||||||
def paginate(relation)
|
def paginate(relation)
|
||||||
relation = add_default_order(relation)
|
relation = add_default_order(relation)
|
||||||
|
|
||||||
|
@ -11,6 +23,14 @@ module API
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def add_default_order(relation)
|
||||||
|
if relation.is_a?(ActiveRecord::Relation) && relation.order_values.empty?
|
||||||
|
relation = relation.order(:id)
|
||||||
|
end
|
||||||
|
|
||||||
|
relation
|
||||||
|
end
|
||||||
|
|
||||||
def add_pagination_headers(paginated_data)
|
def add_pagination_headers(paginated_data)
|
||||||
header 'X-Per-Page', paginated_data.limit_value.to_s
|
header 'X-Per-Page', paginated_data.limit_value.to_s
|
||||||
header 'X-Page', paginated_data.current_page.to_s
|
header 'X-Page', paginated_data.current_page.to_s
|
||||||
|
@ -53,17 +73,10 @@ module API
|
||||||
[paginated_data.total_pages, 1].max
|
[paginated_data.total_pages, 1].max
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_default_order(relation)
|
|
||||||
if relation.is_a?(ActiveRecord::Relation) && relation.order_values.empty?
|
|
||||||
relation = relation.order(:id)
|
|
||||||
end
|
|
||||||
|
|
||||||
relation
|
|
||||||
end
|
|
||||||
|
|
||||||
def data_without_counts?(paginated_data)
|
def data_without_counts?(paginated_data)
|
||||||
paginated_data.is_a?(Kaminari::PaginatableWithoutCount)
|
paginated_data.is_a?(Kaminari::PaginatableWithoutCount)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,8 +17,6 @@ module Gitlab
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
# Methods needed by `API::Helpers::Pagination`
|
# Methods needed by `API::Helpers::Pagination`
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue