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
Do not return deleted addresses for api v2
Szymon Iwaczcbad3fb55511
diff --git a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rbindex 003d1e4c25..07bb1eaa14 100644--- a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb@@ -36,6 +36,10 @@ module Spreecollection_finder.new(scope: scope, params: params).executeend+ def scope+ model_class.not_deleted+ end+def model_classSpree::Addressenddiff --git a/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb b/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rbindex a7d082feda..bfe6abc976 100644--- a/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb@@ -47,6 +47,22 @@ describe 'Storefront API v2 Addresses spec', type: :request doit_behaves_like 'returns 403 HTTP status'end++ context 'when address can not be deleted' do+ let!(:address) { create(:address, user_id: user.id) }++ before do+ expect(address).to receive(:can_be_deleted?).and_return(false).at_least(:once)+ address.destroy!+ get '/api/v2/storefront/account/addresses', headers: headers_bearer+ end++ it 'should not return deleted address' do+ expect(address.deleted_at).not_to be_nil+ expect(json_response['data'][0]).to have_type('address')+ expect(json_response['data'].size).to eq(addresses.count)+ end+ endenddescribe 'addresses#create' dodiff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex eb541661ad..4fca080a8e 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -25,6 +25,8 @@ module SpreeADDRESS_FIELDS = %w(firstname lastname company address1 address2 city state zipcode country phone)EXCLUDED_KEYS_FOR_COMPARISION = %w(id updated_at created_at deleted_at label user_id)+ scope :not_deleted, -> { where(deleted_at: nil) }+belongs_to :country, class_name: 'Spree::Country'belongs_to :state, class_name: 'Spree::State', optional: truebelongs_to :user, class_name: Spree.user_class.name, optional: truediff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rbindex 921c3038f2..4dd54a7ef5 100644--- a/core/spec/models/spree/address_spec.rb+++ b/core/spec/models/spree/address_spec.rb@@ -509,7 +509,8 @@ describe Spree::Address, type: :model doit 'is destroyed deleted timestamp' doaddress2.destroy- expect(Spree::Address.where(['id = (?)', address2.id])).to_not be_empty+ expect(Spree::Address.where(['id = (?)', address2.id])).not_to be_empty+ expect(Spree::Address.not_deleted.where(['id = (?)', address2.id])).to be_emptyendenddiff --git a/frontend/spec/controllers/spree/store_controller_spec.rb b/frontend/spec/controllers/spree/store_controller_spec.rbindex 20bcd6c899..5525a611f7 100644--- a/frontend/spec/controllers/spree/store_controller_spec.rb+++ b/frontend/spec/controllers/spree/store_controller_spec.rb@@ -5,6 +5,7 @@ describe Spree::StoreController, type: :controller dolet!(:store) { create(:store, default: true, default_locale: 'es', default_currency: 'EUR') }before { controller.send(:set_locale) }+ after { I18n.locale = I18n.default_locale }context 'guest visitor' doit dodiff --git a/frontend/spec/support/add_to_cart.rb b/frontend/spec/support/add_to_cart.rbindex 50c3a0b9bc..6aa3ff66ce 100644--- a/frontend/spec/support/add_to_cart.rb+++ b/frontend/spec/support/add_to_cart.rb@@ -10,6 +10,6 @@ def add_to_cart(product)yieldelseclick_link 'View cart'- expect(page).to have_content 'YOUR SHOPPING CART'+ expect(page).to have_content(Spree.t('cart_page.header').upcase)endend