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
Delete an origin group's zones and methods with it
Damian Legawiecc5c2243707cb
diff --git a/spree/core/app/models/spree/delivery_origin_group.rb b/spree/core/app/models/spree/delivery_origin_group.rbindex d24de05bd3..88b5afba9a 100644--- a/spree/core/app/models/spree/delivery_origin_group.rb+++ b/spree/core/app/models/spree/delivery_origin_group.rb@@ -15,18 +15,21 @@ module Spreehas_many :delivery_origin_group_locations, class_name: 'Spree::DeliveryOriginGroupLocation',dependent: :destroy, inverse_of: :delivery_origin_grouphas_many :stock_locations, through: :delivery_origin_group_locations, class_name: 'Spree::StockLocation'- has_many :delivery_zones, class_name: 'Spree::DeliveryZone', dependent: :restrict_with_error,+ # The group contains its zones and methods — that is how the dashboard+ # nests them and how a merchant reads it — so deleting the group takes+ # them with it rather than asking for them to be emptied by hand first.+ # (Destroying a zone cascades to its own methods in turn.)+ has_many :delivery_zones, class_name: 'Spree::DeliveryZone', dependent: :destroy,inverse_of: :delivery_origin_group- has_many :delivery_methods, class_name: 'Spree::DeliveryMethod', dependent: :restrict_with_error,+ has_many :delivery_methods, class_name: 'Spree::DeliveryMethod', dependent: :destroy,inverse_of: :delivery_origin_groupdelegate :store, to: :delivery_profile- # The last group is load-bearing (zones and methods must live somewhere);- # others go once nothing hangs off them.+ # Only one rule survives: a profile needs somewhere for delivery to live,+ # so its last group stays. Anything hanging off a group goes with it.def can_be_deleted?- delivery_zones.none? && delivery_methods.none? &&- delivery_profile.delivery_origin_groups.where.not(id: id).exists?+ delivery_profile.delivery_origin_groups.where.not(id: id).exists?end# Whether packages originating from this stock location are served bydiff --git a/spree/core/spec/models/spree/delivery_origin_group_spec.rb b/spree/core/spec/models/spree/delivery_origin_group_spec.rbnew file mode 100644index 0000000000..fb4233316d--- /dev/null+++ b/spree/core/spec/models/spree/delivery_origin_group_spec.rb@@ -0,0 +1,75 @@+require 'spec_helper'++describe Spree::DeliveryOriginGroup, type: :model do+ let(:store) { @default_store }+ let(:profile) { create(:delivery_profile, store: store) }++ # The dashboard nests zones and methods inside their group, and a merchant+ # reads that as containment: deleting the group takes what it holds rather+ # than demanding the contents be emptied by hand first.+ describe 'destroying a group' do+ let!(:group) { create(:delivery_origin_group, delivery_profile: profile, name: 'EU') }+ let!(:other_group) { create(:delivery_origin_group, delivery_profile: profile, name: 'US') }++ it 'takes its zones with it' do+ zone = create(:delivery_zone, store: store, delivery_profile: profile, delivery_origin_group: group)++ expect { group.destroy }.to change { Spree::DeliveryZone.exists?(zone.id) }.from(true).to(false)+ end++ it 'takes its methods with it' do+ method = create(:delivery_method, store: store, delivery_profile: profile,+ delivery_origin_group: group)++ expect { group.destroy }.to change { Spree::DeliveryMethod.exists?(method.id) }.from(true).to(false)+ end++ # The zone cascade runs too, so a method inside a zone inside the group+ # goes exactly once rather than being orphaned midway.+ it 'takes methods held inside its zones' do+ zone = create(:delivery_zone, store: store, delivery_profile: profile, delivery_origin_group: group)+ method = create(:delivery_method, store: store, delivery_profile: profile,+ delivery_origin_group: group, delivery_zone: zone)++ group.destroy++ expect(Spree::DeliveryMethod.exists?(method.id)).to be false+ expect(Spree::DeliveryZone.exists?(zone.id)).to be false+ end++ it 'leaves other groups alone' do+ other_zone = create(:delivery_zone, store: store, delivery_profile: profile, delivery_origin_group: other_group)++ group.destroy++ expect(Spree::DeliveryZone.exists?(other_zone.id)).to be true+ end+ end++ describe '#can_be_deleted?' do+ # Delivery has to live somewhere, so the profile's last group stays put.+ it 'is false for the only group in a profile' do+ group = profile.delivery_origin_groups.first || create(:delivery_origin_group, delivery_profile: profile)+ profile.delivery_origin_groups.where.not(id: group.id).destroy_all++ expect(group.reload.can_be_deleted?).to be false+ end++ it 'is true once the profile has another group' do+ group = create(:delivery_origin_group, delivery_profile: profile, name: 'EU')+ create(:delivery_origin_group, delivery_profile: profile, name: 'US')++ expect(group.can_be_deleted?).to be true+ end++ # Occupancy no longer blocks deletion — the contents cascade.+ it 'is true even while holding zones and methods' do+ group = create(:delivery_origin_group, delivery_profile: profile, name: 'EU')+ create(:delivery_origin_group, delivery_profile: profile, name: 'US')+ create(:delivery_zone, store: store, delivery_profile: profile, delivery_origin_group: group)+ create(:delivery_method, store: store, delivery_profile: profile, delivery_origin_group: group)++ expect(group.can_be_deleted?).to be true+ end+ end+end