Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Improve create service for `Spree::Address` (#12193)

Łukasz Adamczyk5f8e91215e5a
diff --git a/core/app/services/spree/addresses/create.rb b/core/app/services/spree/addresses/create.rb
index 7023233d46..8cbb17b248 100644
--- a/core/app/services/spree/addresses/create.rb
+++ b/core/app/services/spree/addresses/create.rb
@@ -6,19 +6,44 @@ module Spree
attr_accessor :country
- def call(address_params: {}, user: nil)
+ def call(address_params: {}, user: nil, **opts)
+ order = opts[:order]
+ default_billing = opts.fetch(:default_billing, false)
+ default_shipping = opts.fetch(:default_shipping, false)
+
address_params = fill_country_and_state_ids(address_params)
address = Spree::Address.new(address_params)
address.user = user if user.present?
- if address.save
- assign_to_user_as_default(user: user, address_id: address.id) if user.present?
- success(address)
- else
- failure(address)
+ ApplicationRecord.transaction do
+ if address.save
+ if user.present?
+ if user.addresses.pluck(:id) == [address.id]
+ user.update(bill_address_id: address.id, ship_address_id: address.id)
+ else
+ assign_to_user_as_default(
+ user: user,
+ address_id: address.id,
+ default_billing: default_billing,
+ default_shipping: default_shipping
+ )
+ end
+ end
+
+ assign_to_order(order: order, address_id: address.id) if order.present?
+ success(address)
+ else
+ failure(address)
+ end
end
end
+
+ private
+
+ def assign_to_order(order:, address_id:)
+ order.update(ship_address_id: address_id, state: 'address')
+ end
end
end
end
diff --git a/core/app/services/spree/addresses/helper.rb b/core/app/services/spree/addresses/helper.rb
index 061c5ba2b7..b58c8d406c 100644
--- a/core/app/services/spree/addresses/helper.rb
+++ b/core/app/services/spree/addresses/helper.rb
@@ -31,10 +31,13 @@ module Spree
params
end
- def assign_to_user_as_default(user:, address_id:)
- if user.addresses.pluck(:id) == [address_id] # check if it's user first address
- user.update(bill_address_id: address_id, ship_address_id: address_id)
- end
+ def assign_to_user_as_default(user:, address_id:, default_billing: true, default_shipping: true)
+ attributes_to_update = {
+ ship_address_id: (address_id if default_shipping),
+ bill_address_id: (address_id if default_billing),
+ }.compact_blank
+
+ user.update_columns(**attributes_to_update, updated_at: Time.current) if attributes_to_update.present?
end
end
end
diff --git a/core/app/services/spree/addresses/update.rb b/core/app/services/spree/addresses/update.rb
index 0c94e0b311..bf4ab2a994 100644
--- a/core/app/services/spree/addresses/update.rb
+++ b/core/app/services/spree/addresses/update.rb
@@ -88,15 +88,6 @@ module Spree
)
end
- def assign_to_user_as_default(user:, address_id:, default_billing: true, default_shipping: true)
- attributes_to_update = {
- ship_address_id: (address_id if default_shipping),
- bill_address_id: (address_id if default_billing),
- }.compact_blank
-
- user.update_columns(**attributes_to_update, updated_at: Time.current) if attributes_to_update.present?
- end
-
def new_address(address_params = {})
@new_address ||= ::Spree::Address.not_deleted.find_or_create_by(address_params.except(:id, :updated_at, :created_at))
end
diff --git a/core/spec/services/spree/account/addresses/create_spec.rb b/core/spec/services/spree/account/addresses/create_spec.rb
index e4ef4f2e40..c472fdbc6d 100644
--- a/core/spec/services/spree/account/addresses/create_spec.rb
+++ b/core/spec/services/spree/account/addresses/create_spec.rb
@@ -83,6 +83,52 @@ module Spree
end
end
end
+
+ context 'when order is passed' do
+ let(:result) { subject.call(user: user, address_params: address_params, order: order) }
+
+ let(:order) { create(:order, user: user, state: 'delivery', ship_address: address, bill_address: address) }
+ let(:address) { create(:address, user: user) }
+
+ it 'assigns a new ship address to the order' do
+ result
+
+ expect(order.reload.ship_address).to eq(value)
+ expect(order.bill_address).to eq(address)
+ end
+
+ it 'updates order to address state' do
+ expect { result }.to change { order.reload.state }.from('delivery').to('address')
+ end
+ end
+
+ context 'when default billing is passed' do
+ let(:result) { subject.call(user: user, address_params: address_params, default_billing: true) }
+
+ let!(:user) { create(:user) }
+ let!(:address) { create(:address, user: user) }
+
+ before { user.update!(bill_address: address) }
+
+ it 'updates user\'s bill address' do
+ result
+ expect(user.reload.bill_address).to eq(value)
+ end
+ end
+
+ context 'when default shipping is passed' do
+ let(:result) { subject.call(user: user, address_params: address_params, default_shipping: true) }
+
+ let!(:user) { create(:user) }
+ let!(:address) { create(:address, user: user) }
+
+ before { user.update!(ship_address: address) }
+
+ it 'updates user\'s ship address' do
+ result
+ expect(user.reload.ship_address).to eq(value)
+ end
+ end
end
context 'with invalid params' do