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.

Refactor Cart::Associate service to own business logic

Damian Legawiec16a260b5fba9
diff --git a/spree/api/app/controllers/spree/api/v3/store/cart_controller.rb b/spree/api/app/controllers/spree/api/v3/store/cart_controller.rb
index a6ec8e0fbb..f89e9966d0 100644
--- a/spree/api/app/controllers/spree/api/v3/store/cart_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/store/cart_controller.rb
@@ -36,10 +36,13 @@ module Spree
def associate
@cart = find_cart_by_token
- # Associate the cart with the current user
- @cart.associate_user!(current_user)
+ result = Spree.cart_associate_service.call(guest_order: @cart, user: current_user, guest_only: true)
- render json: serialize_resource(@cart)
+ if result.success?
+ render json: serialize_resource(@cart)
+ else
+ render_service_error(result.error.to_s)
+ end
end
protected
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index 31db3aed5c..326b2a17b1 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -422,22 +422,13 @@ module Spree
end
# Associates the specified user with the order.
+ # Delegates to {Spree::Cart::Associate} service.
+ #
+ # @param user [Spree.user_class] the user to associate with the order
+ # @param override_email [Boolean] whether to override the order email with the user's email
+ # @return [Spree::ServiceModule::Result]
def associate_user!(user, override_email = true)
- self.user = user
- self.email = user.email if override_email
- self.bill_address ||= user.bill_address
- self.ship_address ||= user.ship_address
-
- changes = slice(*ASSOCIATED_USER_ATTRIBUTES)
-
- # immediately persist the changes we just made, but don't use save
- # since we might have an invalid address associated
- ActiveRecord::Base.connected_to(role: :writing) do
- self.class.unscoped.where(id: self).update_all(changes)
- end
-
- # Manually publish update event since update_all bypasses callbacks
- publish_event('order.updated') if changes.present?
+ Spree.cart_associate_service.call(guest_order: self, user: user, override_email: override_email)
end
def disassociate_user!
diff --git a/spree/core/app/services/spree/cart/associate.rb b/spree/core/app/services/spree/cart/associate.rb
index a7e54ddbf4..8b47514e5f 100644
--- a/spree/core/app/services/spree/cart/associate.rb
+++ b/spree/core/app/services/spree/cart/associate.rb
@@ -3,13 +3,26 @@ module Spree
class Associate
prepend Spree::ServiceModule::Base
- def call(guest_order:, user:)
- if guest_order.user.nil?
- guest_order.associate_user!(user)
- success(guest_order)
- else
- failure(guest_order, 'Already assigned to a user')
+ def call(guest_order:, user:, override_email: true, guest_only: false)
+ return failure(guest_order, 'Already assigned to a user') if guest_only && guest_order.user.present? && guest_order.user != user
+
+ guest_order.user = user
+ guest_order.email = user.email if override_email
+ guest_order.bill_address ||= user.bill_address
+ guest_order.ship_address ||= user.ship_address
+
+ changes = guest_order.slice(*Spree::Order::ASSOCIATED_USER_ATTRIBUTES)
+
+ # immediately persist the changes we just made, but don't use save
+ # since we might have an invalid address associated
+ ActiveRecord::Base.connected_to(role: :writing) do
+ Spree::Order.unscoped.where(id: guest_order.id).update_all(changes)
end
+
+ # Manually publish update event since update_all bypasses callbacks
+ guest_order.publish_event('order.updated') if changes.present?
+
+ success(guest_order)
end
end
end
diff --git a/spree/core/spec/services/spree/cart/associate_spec.rb b/spree/core/spec/services/spree/cart/associate_spec.rb
index fac76483a5..56e256efa8 100644
--- a/spree/core/spec/services/spree/cart/associate_spec.rb
+++ b/spree/core/spec/services/spree/cart/associate_spec.rb
@@ -18,9 +18,18 @@ module Spree
let(:assigned_user) { create(:user) }
let(:order) { create(:order, user: assigned_user) }
- it 'returns failure' do
- expect(subject).to be_failure
- expect(order.user).to eq(assigned_user)
+ it 'reassigns order to new user' do
+ expect(subject).to be_success
+ expect(order.user).to eq(user)
+ end
+
+ context 'with guest_only: true' do
+ subject { described_class.call(guest_order: order, user: user, guest_only: true) }
+
+ it 'returns failure' do
+ expect(subject).to be_failure
+ expect(order.user).to eq(assigned_user)
+ end
end
end
end