spree_core 5.4.0.rc7 → 5.4.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07eb5e06c1dbe2e9d89b69a3768a376fcf5d23f0be28bb15bd4e9fac1ce0bcaf
-  data.tar.gz: 99e243c978fb95cfd04e4b8ee42cc42b63f3580493939b4271be7992006c2bbb
+  metadata.gz: e7f093947be22917f630a9dba320707abe88feebd4b9c52ab6cda4bdd466dce3
+  data.tar.gz: a3506d0767031f85540001a3619ea350c0ee6099bb138c79e612f5a79369b0ed
 SHA512:
-  metadata.gz: 2967ba8a3825d98180adb93f0a025370c6aa6aee76520cf5400be56bfb6328b63f121434065f2acf8b600099f53136b067becec17c0f1523078dedd95cc4ccd5
-  data.tar.gz: ca2d9d12300bd8a765b3130cf86fd857d8c8b0ad7cc413f895956a806a642d5ef44c20983b08d227de1fff80b9bcfd68995173061fc60849ebe5dab185631ffb
+  metadata.gz: bde43c704ad11a1ce86595a27d692f71e23fb598d1086bf656c390aacc0754d579ea8d9d99f5b5f8f0a23c57b3ce2f3aa186600151bbe621a54cf8266ea3ef38
+  data.tar.gz: 401e1fb164e632bb37f60b1ab6491dad4aa4dc5eb01ca53dd3a3b03a2449807cc31a943edcb43095f04f52c0eee763f5cdea61699a530c7f0ee2121fb1d45ab4

data/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}")

data/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',

data/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

data/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')

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.4.0.rc7'.freeze
+  VERSION = '5.4.0.rc8'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc7
+  version: 5.4.0.rc8
 platform: ruby
 authors:
 - Sean Schofield
@@ -1502,6 +1502,7 @@ files:
 - db/migrate/20260402000001_add_kind_to_spree_option_types.rb
 - db/migrate/20260402000002_add_color_code_to_spree_option_values.rb
 - db/migrate/20260403000000_add_market_to_spree_orders.rb
+- db/migrate/20260408000001_add_unique_index_to_spree_zone_members.rb
 - db/sample_data/customers.csv
 - db/sample_data/markets.rb
 - db/sample_data/metafield_definitions.rb
@@ -1732,9 +1733,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc7
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc8
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc7
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc8
 post_install_message:
 rdoc_options: []
 require_paths: