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
Make `ensure_store` a global for all store resources (#14231)
Damian Legawiec6632c1bfcb55
diff --git a/spree/core/app/models/concerns/spree/single_store_resource.rb b/spree/core/app/models/concerns/spree/single_store_resource.rbindex 22da264c77..29f5137abe 100644--- a/spree/core/app/models/concerns/spree/single_store_resource.rb+++ b/spree/core/app/models/concerns/spree/single_store_resource.rb@@ -3,6 +3,7 @@ module Spreeextend ActiveSupport::Concernincluded do+ before_validation :ensure_store, unless: :store_id?validate :ensure_store_association_is_not_changedscope :for_store, ->(store) { where(store_id: store.id) }@@ -10,6 +11,10 @@ module Spreeprotected+ def ensure_store+ self.store ||= Spree::Current.store+ end+def ensure_store_association_is_not_changedif store_id_changed? && persisted?errors.add(:store, Spree.t('errors.messages.store_association_can_not_be_changed'))diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex 5bfefee289..470058f608 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -224,7 +224,6 @@ module Spreeaccepts_nested_attributes_for :shipments# Needs to happen before save_permalink is called- before_validation :ensure_store_presencebefore_validation :ensure_market_presencebefore_validation :ensure_channel_presencebefore_validation :ensure_currency_presence@@ -500,7 +499,8 @@ module Spreeenddef ensure_store_presence- self.store ||= Spree::Store.default+ Spree::Deprecation.warn('Spree::Order#ensure_store_presence is deprecated and will be removed in Spree 6.0. ensure_store instead.')+ ensure_storeenddef ensure_market_presencediff --git a/spree/core/app/models/spree/role_user.rb b/spree/core/app/models/spree/role_user.rbindex 2969c75bec..05a3022f3b 100644--- a/spree/core/app/models/spree/role_user.rb+++ b/spree/core/app/models/spree/role_user.rb@@ -28,7 +28,7 @@ module Spree## Callbacks#- before_validation :set_default_resource, :ensure_store+ before_validation :set_default_resourceprivate@@ -37,9 +37,5 @@ module Spreedef set_default_resourceself.resource ||= Spree::Store.currentend-- def ensure_store- self.store ||= Spree::Current.store- endendenddiff --git a/spree/core/app/models/spree/taxon.rb b/spree/core/app/models/spree/taxon.rbindex 20ca7dbe36..70710d7289 100644--- a/spree/core/app/models/spree/taxon.rb+++ b/spree/core/app/models/spree/taxon.rb@@ -4,6 +4,8 @@ require 'stringex'module Spreeclass Taxon < Spree.base_class+ include Spree::SingleStoreResource+has_prefix_id :ctgRULES_MATCH_POLICIES = %w[all any].freeze@@ -81,7 +83,6 @@ module Spree#before_validation :set_permalink, if: :namebefore_validation :copy_taxonomy_from_parent- before_validation :set_storebefore_save :set_pretty_nameafter_save :touch_ancestors_and_taxonomyafter_update :sync_taxonomy_name@@ -495,11 +496,16 @@ module Spreeself.taxonomy = parent.taxonomy if parent.present? && taxonomy.blank?end+ def set_store+ Spree::Deprecation.warn('Spree::Taxon#set_store is deprecated and will be removed in Spree 6.0. ensure_store instead.')+ ensure_store+ end+# Every taxon is store-owned. Resolve the store from the taxonomy, then the# parent, finally the current store — so the direct column is always# populated for new records. Guards on the raw +store_id+ column rather than# +#store+, whose reader masks an unset column with the taxonomy fallback.- def set_store+ def ensure_storereturn if store_id.present?self.store = taxonomy&.store || parent&.store || Spree::Store.currentdiff --git a/spree/core/spec/models/spree/allowed_origin_spec.rb b/spree/core/spec/models/spree/allowed_origin_spec.rbindex 645e298051..657900ae12 100644--- a/spree/core/spec/models/spree/allowed_origin_spec.rb+++ b/spree/core/spec/models/spree/allowed_origin_spec.rb@@ -12,7 +12,6 @@ RSpec.describe Spree::AllowedOrigin, type: :model dodescribe 'validations' dosubject { build(:allowed_origin, store: store) }- it { is_expected.to validate_presence_of(:store) }it { is_expected.to validate_presence_of(:origin) }it 'validates uniqueness of origin scoped to store' dodiff --git a/spree/core/spec/models/spree/customer_group_spec.rb b/spree/core/spec/models/spree/customer_group_spec.rbindex 1d6ce092da..8479fc8e1c 100644--- a/spree/core/spec/models/spree/customer_group_spec.rb+++ b/spree/core/spec/models/spree/customer_group_spec.rb@@ -12,7 +12,6 @@ RSpec.describe Spree::CustomerGroup, type: :model dodescribe 'validations' doit { is_expected.to validate_presence_of(:name) }- it { is_expected.to validate_presence_of(:store) }context 'uniqueness' dolet!(:existing_group) { create(:customer_group, name: 'VIP', store: store) }diff --git a/spree/core/spec/models/spree/market_spec.rb b/spree/core/spec/models/spree/market_spec.rbindex ecd500b8a2..eee9f872fe 100644--- a/spree/core/spec/models/spree/market_spec.rb+++ b/spree/core/spec/models/spree/market_spec.rb@@ -6,7 +6,6 @@ RSpec.describe Spree::Market, type: :model dodescribe 'validations' dosubject { build(:market, store: store) }- it { is_expected.to validate_presence_of(:store) }it { is_expected.to validate_presence_of(:name) }it { is_expected.to validate_presence_of(:currency) }it { is_expected.to validate_presence_of(:default_locale) }diff --git a/spree/core/spec/models/spree/wishlist_spec.rb b/spree/core/spec/models/spree/wishlist_spec.rbindex 84f83a59df..4407bb7a46 100644--- a/spree/core/spec/models/spree/wishlist_spec.rb+++ b/spree/core/spec/models/spree/wishlist_spec.rb@@ -1,14 +1,14 @@require 'spec_helper'describe Spree::Wishlist, type: :model do- let!(:store) { @default_store }- let!(:other_store) { create(:store) }- let!(:user) { create(:user) }- let!(:other_user) { create(:user) }+ let(:store) { @default_store }+ let(:other_store) { create(:store) }+ let(:user) { create(:user) }+ let(:other_user) { create(:user) }- let!(:wishlist) { create(:wishlist, user: user, name: 'My Wishlist', store: store, is_default: true) }- let!(:wishlist_belonging_to_other_store) { create(:wishlist, user: user, name: 'My Wishlist', store: other_store, is_default: true) }- let!(:wishlist_belonging_to_other_user) { create(:wishlist, user: other_user, name: 'My Wishlist', store: store, is_default: true) }+ let(:wishlist) { create(:wishlist, user: user, name: 'My Wishlist', store: store, is_default: true) }+ let(:wishlist_belonging_to_other_store) { create(:wishlist, user: user, name: 'My Wishlist', store: other_store, is_default: true) }+ let(:wishlist_belonging_to_other_user) { create(:wishlist, user: other_user, name: 'My Wishlist', store: store, is_default: true) }describe 'lifecycle events', events: true dodescribe 'wishlist.created' do@@ -41,25 +41,14 @@ describe Spree::Wishlist, type: :model doendend- it 'has a valid factory' do- expect(wishlist).to be_valid- end-- it 'validates presence of name' do- expect(described_class.new(name: nil, user: user, store: store)).not_to be_valid- end-- it 'validates presence of store' do- expect(described_class.new(name: 'My Wishlist', user: user, store: nil)).not_to be_valid- end-- it 'validates presence of user' do- expect(described_class.new(name: 'My Wishlist', user: nil, store: store)).not_to be_valid- end-describe '.ensure_default_exists_and_is_unique' docontext 'when user creates a new default store' do- let!(:new_wl) { create(:wishlist, name: 'My New WishList', user: user, store: store, is_default: true) }+ let(:new_wl) { create(:wishlist, name: 'My New WishList', user: user, store: store, is_default: true) }++ before do+ wishlist+ new_wl+ endit 'preserves is_default: true for new wishlist' doexpect(new_wl.is_default).to be true