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
add user default address validations
KacperMekarskiad9312fd8f46
diff --git a/core/app/models/concerns/spree/user_address.rb b/core/app/models/concerns/spree/user_address.rbindex cd37d375ef..fcdede22de 100644--- a/core/app/models/concerns/spree/user_address.rb+++ b/core/app/models/concerns/spree/user_address.rb@@ -16,6 +16,8 @@ module Spreehas_many :addresses, -> { where(deleted_at: nil).order('updated_at DESC') },class_name: 'Spree::Address', foreign_key: :user_id+ validate :address_not_associated_with_other_user, :address_not_associated_with_placed_order+def persist_order_address(order)b_address = bill_address || build_bill_addressb_address.attributes = order.bill_address.value_attributes@@ -30,6 +32,21 @@ module Spreeupdate(ship_address_id: s_address.id)endend++ private++ BELONGS_TO_OTHER_USER = 'belongs to other user'+ ADDRESS_ASSOCIATED_WITH_COMPLETED_ORDER = 'associated with completed order'++ def address_not_associated_with_other_user+ errors.add(:bill_address_id, BELONGS_TO_OTHER_USER) if bill_address&.user_id && self != bill_address&.user+ errors.add(:ship_address_id, BELONGS_TO_OTHER_USER) if ship_address&.user_id && self != ship_address&.user+ end++ def address_not_associated_with_placed_order+ errors.add(:bill_address_id, ADDRESS_ASSOCIATED_WITH_COMPLETED_ORDER) if orders.complete.where(bill_address: bill_address_id).any?+ errors.add(:ship_address_id, ADDRESS_ASSOCIATED_WITH_COMPLETED_ORDER) if orders.complete.where(ship_address: ship_address_id).any?+ endendendenddiff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rbindex 8d94d9202f..da62b64511 100644--- a/core/spec/models/spree/user_spec.rb+++ b/core/spec/models/spree/user_spec.rb@@ -224,4 +224,148 @@ describe Spree.user_class, type: :model doexpect(subject.addresses).to eq [address2, address]endend++ describe 'validations' do+ shared_examples 'valid' do+ it 'is valid' do+ expect(subject.valid?).to be true+ end+ end++ describe '#address_not_associated_with_other_user' do+ subject { user }++ let!(:user) { create(:user_with_addresses) }+ let!(:other_user) { create(:user_with_addresses) }+ let(:bill_address) { create(:address, user: assigned_user) }+ let(:ship_address) { create(:address, user: assigned_user) }++ shared_examples 'invalid' do+ it 'is invalid' do+ expect(subject.valid?).to be false+ expect(subject.errors.messages.values.flatten).to include('belongs to other user')+ end+ end++ context 'bill_address' do+ before { subject.update(bill_address: bill_address) }++ context 'when default bill address does not belong to any user' do+ let(:assigned_user) { nil }++ it_should_behave_like 'valid'+ end++ context 'when default bill address belongs to user' do+ let(:assigned_user) { user }++ it_should_behave_like 'valid'+ end++ context 'when associated bill address belongs to other user' do+ let(:assigned_user) { other_user }++ it_should_behave_like 'invalid'++ it 'assigns error to bill address' do+ expect(subject.errors.messages.keys).to include(:bill_address_id)+ end+ end+ end++ context 'ship_address' do+ before { subject.update(ship_address: ship_address) }++ context 'when default ship address does not belong to any user' do+ let(:assigned_user) { nil }++ it_should_behave_like 'valid'+ end++ context 'when default ship address belongs to user' do+ let(:assigned_user) { user }++ it_should_behave_like 'valid'+ end++ context 'when associated ship address belongs to other user' do+ let(:assigned_user) { other_user }++ it_should_behave_like 'invalid'++ it 'assigns error to ship address' do+ expect(subject.errors.messages.keys).to include(:ship_address_id)+ end+ end+ end+ end++ describe '#address_not_associated_with_placed_order' do+ subject { user }++ let!(:user) { create(:user_with_addresses) }+ let(:address) { create(:address, user: user) }++ shared_examples 'invalid' do+ it 'is invalid' do+ expect(subject.valid?).to be false+ expect(subject.errors.messages.values.flatten).to include('associated with completed order')+ end+ end++ context 'bill_address' do+ before { subject.update(bill_address: address) }++ context 'when default bill address is not associated to completed order' do+ let!(:comleted_order) { create(:completed_order_with_totals, user: user) }++ it_should_behave_like 'valid'+ end++ context 'when default bill address is associated to uncompleted order' do+ let!(:uncomleted_order) { create(:order, user: user, bill_address: address, ship_address: address) }++ it_should_behave_like 'valid'+ end++ context 'when default bill address is associated to completed order' do+ let!(:comleted_order) { create(:completed_order_with_totals, user: user, bill_address: address, ship_address: address) }++ it_should_behave_like 'invalid'++ it 'assigns error to bill address' do+ expect(subject.valid?).to be false+ expect(subject.errors.messages.keys).to include(:bill_address_id)+ end+ end+ end++ context 'ship_address' do+ before { subject.update(ship_address: address) }++ context 'when default ship address is not associated to completed order' do+ let!(:comleted_order) { create(:completed_order_with_totals, user: user) }++ it_should_behave_like 'valid'+ end++ context 'when default ship address is associated to uncompleted order' do+ let!(:uncomleted_order) { create(:order, user: user, ship_address: address, ship_address: address) }++ it_should_behave_like 'valid'+ end++ context 'when default ship address is associated to completed order' do+ let!(:comleted_order) { create(:completed_order_with_totals, user: user, ship_address: address, ship_address: address) }++ it_should_behave_like 'invalid'++ it 'assigns error to ship address' do+ expect(subject.valid?).to be false+ expect(subject.errors.messages.keys).to include(:ship_address_id)+ end+ end+ end+ end+ endend