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.

Fixed: enforce uniqueness validation on Zone Members (#13887)

Damian Legawiec2c307b7eead9
diff --git a/spree/core/app/models/spree/zone_member.rb b/spree/core/app/models/spree/zone_member.rb
index ef92bc9ced..34d7a12311 100644
--- a/spree/core/app/models/spree/zone_member.rb
+++ b/spree/core/app/models/spree/zone_member.rb
@@ -4,6 +4,7 @@ module Spree
belongs_to :zoneable, polymorphic: true
validates :zone, :zoneable, presence: true
+ validates :zoneable_id, uniqueness: { scope: spree_base_uniqueness_scope + [:zone_id, :zoneable_type] }
scope :defunct_without_kind, ->(kind) do
where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}")
diff --git a/spree/core/app/services/spree/seeds/zones.rb b/spree/core/app/services/spree/seeds/zones.rb
index bf414261a2..a24bc0cb7c 100644
--- a/spree/core/app/services/spree/seeds/zones.rb
+++ b/spree/core/app/services/spree/seeds/zones.rb
@@ -25,7 +25,12 @@ module Spree
def create_zone_members(zone, country_codes)
countries_ids = Spree::Country.where(iso: country_codes).ids
- zone_members = countries_ids.map do |country_id|
+ existing_ids = zone.zone_members.where(zoneable_type: 'Spree::Country', zoneable_id: countries_ids).pluck(:zoneable_id)
+ new_ids = countries_ids - existing_ids
+
+ return if new_ids.empty?
+
+ zone_members = new_ids.map do |country_id|
{
zoneable_id: country_id,
zoneable_type: 'Spree::Country',
diff --git a/spree/core/db/migrate/20260408000001_add_unique_index_to_spree_zone_members.rb b/spree/core/db/migrate/20260408000001_add_unique_index_to_spree_zone_members.rb
new file mode 100644
index 0000000000..2c75bd7caa
--- /dev/null
+++ b/spree/core/db/migrate/20260408000001_add_unique_index_to_spree_zone_members.rb
@@ -0,0 +1,31 @@
+class AddUniqueIndexToSpreeZoneMembers < ActiveRecord::Migration[7.2]
+ def up
+ # Remove duplicate zone members, keeping the oldest record
+ # Uses derived table for MySQL compatibility
+ execute <<~SQL
+ DELETE FROM spree_zone_members
+ WHERE id NOT IN (
+ SELECT min_id FROM (
+ SELECT MIN(id) AS min_id
+ FROM spree_zone_members
+ GROUP BY zone_id, zoneable_type, zoneable_id
+ ) AS keeper_ids
+ )
+ SQL
+
+ remove_index :spree_zone_members, [:zoneable_id, :zoneable_type],
+ name: 'index_spree_zone_members_on_zoneable_id_and_zoneable_type',
+ if_exists: true
+
+ add_index :spree_zone_members, [:zone_id, :zoneable_type, :zoneable_id],
+ unique: true,
+ name: 'index_spree_zone_members_uniqueness'
+ end
+
+ def down
+ remove_index :spree_zone_members, name: 'index_spree_zone_members_uniqueness', if_exists: true
+
+ add_index :spree_zone_members, [:zoneable_id, :zoneable_type],
+ name: 'index_spree_zone_members_on_zoneable_id_and_zoneable_type'
+ end
+end
diff --git a/spree/core/db/sample_data/markets.rb b/spree/core/db/sample_data/markets.rb
index fb88cc5138..29d92b1850 100644
--- a/spree/core/db/sample_data/markets.rb
+++ b/spree/core/db/sample_data/markets.rb
@@ -17,7 +17,7 @@ end
eu_zone = Spree::Zone.find_by(name: 'EU_VAT')
if eu_zone
- eu_countries = eu_zone.zone_members.where(zoneable_type: 'Spree::Country').map(&:zoneable)
+ eu_countries = eu_zone.zone_members.where(zoneable_type: 'Spree::Country').map(&:zoneable).uniq.compact
if eu_countries.any?
eu_market = store.markets.find_or_initialize_by(name: 'Europe')
diff --git a/spree/core/spec/models/spree/zone_member_spec.rb b/spree/core/spec/models/spree/zone_member_spec.rb
index 9821e23424..9bf0d302a3 100644
--- a/spree/core/spec/models/spree/zone_member_spec.rb
+++ b/spree/core/spec/models/spree/zone_member_spec.rb
@@ -6,6 +6,22 @@ describe Spree::ZoneMember, type: :model do
let(:zone) { create(:zone, kind: 'country') }
let(:zone_member) { create(:zone_member, zone: zone, zoneable: country) }
+ describe 'validations' do
+ it 'does not allow duplicate zoneable in the same zone' do
+ zone_member
+ duplicate = build(:zone_member, zone: zone, zoneable: country)
+ expect(duplicate).not_to be_valid
+ expect(duplicate.errors[:zoneable_id]).to be_present
+ end
+
+ it 'allows the same zoneable in different zones' do
+ zone_member
+ other_zone = create(:zone, kind: 'country')
+ other_member = build(:zone_member, zone: other_zone, zoneable: country)
+ expect(other_member).to be_valid
+ end
+ end
+
describe 'scopes' do
describe '.defunct_without_kind' do
let(:defunct_without_kind) { Spree::ZoneMember.defunct_without_kind('country') }