Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Storefront Countries API should return all countries on a single page by default (#11289)
Damian Legawiec4e0bf4e2d158
diff --git a/api/app/controllers/concerns/spree/api/v2/caching.rb b/api/app/controllers/concerns/spree/api/v2/caching.rbindex 85ad4dad76..cd70e2b39e 100644--- a/api/app/controllers/concerns/spree/api/v2/caching.rb+++ b/api/app/controllers/concerns/spree/api/v2/caching.rb@@ -14,8 +14,8 @@ module Spreesparse_fields,serializer_params,params[:sort]&.strip,- params[:page]&.strip,- params[:per_page]&.strip,+ params[:page]&.to_s&.strip,+ params[:per_page]&.to_s&.strip,].flatten.join('-')Digest::MD5.hexdigest(cache_key_parts)diff --git a/api/app/controllers/spree/api/v2/storefront/countries_controller.rb b/api/app/controllers/spree/api/v2/storefront/countries_controller.rbindex 093958813d..72a05a1586 100644--- a/api/app/controllers/spree/api/v2/storefront/countries_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/countries_controller.rb@@ -3,6 +3,8 @@ module Spreemodule V2module Storefrontclass CountriesController < ::Spree::Api::V2::ResourceController+ before_action :set_default_per_page+privatedef serialize_collection(collection)@@ -43,6 +45,11 @@ module Spreedef model_classSpree::Countryend++ # by default we want to return all countries on a single page+ def set_default_per_page+ params[:per_page] ||= Spree::Country.count+ endendendenddiff --git a/api/spec/requests/spree/api/v2/storefront/countries_spec.rb b/api/spec/requests/spree/api/v2/storefront/countries_spec.rbindex b6080907ef..bc1a8d8d87 100644--- a/api/spec/requests/spree/api/v2/storefront/countries_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/countries_spec.rb@@ -25,13 +25,14 @@ describe 'Storefront API v2 Countries spec', type: :request dodescribe 'countries#index' docontext 'general' do+ let!(:countries_list) { create_list(:country, 238) }before { get '/api/v2/storefront/countries' }it_behaves_like 'returns 200 HTTP status'it 'returns all countries' do- expect(json_response['data'].size).to eq(Spree::Country.count)+ expect(json_response['data'].size).to eq(240)expect(json_response['data'][0]).to have_type('country')expect(json_response['data'][0]).not_to have_relationships(:states)end