From eba60a6130b29dfbcdd129dfb2381e09570c4bcf Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 18 Jun 2021 17:24:02 +0100
Subject: [PATCH] Deal with Api::OrdersController and SearchOrders service

---
 app/controllers/api/v0/orders_controller.rb |  6 ++++--
 app/services/search_orders.rb               | 12 ------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/controllers/api/v0/orders_controller.rb b/app/controllers/api/v0/orders_controller.rb
index 48a40e13cc..5a3cd24e96 100644
--- a/app/controllers/api/v0/orders_controller.rb
+++ b/app/controllers/api/v0/orders_controller.rb
@@ -15,9 +15,11 @@ module Api
 
         orders = SearchOrders.new(params, current_api_user).orders
 
+        pagy, paged_orders = pagy(orders, items: params[:per_page] || default_per_page)
+
         render json: {
-          orders: serialized_orders(orders),
-          pagination: pagination_data(orders)
+          orders: serialized_orders(paged_orders),
+          pagination: pagination_data(pagy)
         }
       end
 
diff --git a/app/services/search_orders.rb b/app/services/search_orders.rb
index 3e17a8bed3..0da52721f3 100644
--- a/app/services/search_orders.rb
+++ b/app/services/search_orders.rb
@@ -19,8 +19,6 @@ class SearchOrders
       includes(:payments, :subscription, :shipments, :bill_address, :distributor, :order_cycle).
       ransack(params[:q])
 
-    return paginated_results if using_pagination?
-
     @search.result(distinct: true)
   end
 
@@ -35,14 +33,4 @@ class SearchOrders
                shipping_method_id: params[:shipping_method_id]
              })
   end
-
-  def paginated_results
-    @search.result(distinct: true)
-      .page(params[:page])
-      .per(params[:per_page])
-  end
-
-  def using_pagination?
-    params[:page]
-  end
 end