From 9bb7096be100192b488aea743ebac781086f1c4e Mon Sep 17 00:00:00 2001 From: Paulo Vilarinho Date: Mon, 4 Jan 2021 20:21:39 -0300 Subject: [PATCH] apply pagination data concern to products_controller --- app/controllers/api/products_controller.rb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/products_controller.rb b/app/controllers/api/products_controller.rb index e59b64aba1..3d61e2669b 100644 --- a/app/controllers/api/products_controller.rb +++ b/app/controllers/api/products_controller.rb @@ -7,6 +7,8 @@ module Api DEFAULT_PAGE = 1 DEFAULT_PER_PAGE = 15 + include PaginationData + skip_authorization_check only: [:show, :bulk_products, :overridable] def show @@ -140,7 +142,9 @@ module Api # This line is used by the PagedFetcher JS service (inventory). pages: products.num_pages, # This hash is used by the BulkProducts JS service. - pagination: pagination_data(products) + pagination: pagination_data(products, + default_page: DEFAULT_PAGE, + default_per_page: DEFAULT_PER_PAGE) }.to_json end @@ -148,15 +152,6 @@ module Api (params[:q] || {}).reverse_merge(s: 'created_at desc') end - def pagination_data(results) - { - results: results.total_count, - pages: results.num_pages, - page: (params[:page] || DEFAULT_PAGE).to_i, - per_page: (params[:per_page] || DEFAULT_PER_PAGE).to_i - } - end - def product_params params.require(:product).permit PermittedAttributes::Product.attributes end