diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 7339af3c61..e0dc176820 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -1,5 +1,7 @@ module Api class OrdersController < Api::BaseController + include PaginationData + def show authorize! :read, order render json: order, serializer: Api::OrderDetailedSerializer, current_order: order @@ -10,9 +12,11 @@ module Api search_results = SearchOrders.new(params, current_api_user) + orders = search_results.orders + render json: { - orders: serialized_orders(search_results.orders), - pagination: search_results.pagination_data + orders: orders, + pagination: pagination_required? ? pagination_data(orders) : nil } end diff --git a/app/services/search_orders.rb b/app/services/search_orders.rb index 30afb964a7..351dccddb2 100644 --- a/app/services/search_orders.rb +++ b/app/services/search_orders.rb @@ -8,17 +8,6 @@ class SearchOrders @orders = fetch_orders end - def pagination_data - return unless using_pagination? - - { - results: @orders.total_count, - pages: @orders.num_pages, - page: params[:page].to_i, - per_page: params[:per_page].to_i - } - end - private attr_reader :params, :current_user @@ -50,6 +39,6 @@ class SearchOrders end def using_pagination? - params[:per_page] + params[:page] end end