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
Optimize and reduce number of SQL queries when applying promotions (#13090)
Damian Legawiec054cfbf2aa29
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rbindex e452ca4821..5febed1024 100644--- a/core/app/models/spree/promotion.rb+++ b/core/app/models/spree/promotion.rb@@ -49,7 +49,7 @@ module Spreebefore_validation :downcase_code, if: -> { code.present? }before_validation :set_starts_at_to_current_time, if: -> { starts_at.blank? }after_commit :generate_coupon_codes, if: -> { multi_codes? }, on: [:create, :update]- after_commit :remove_coupons, unless: -> { multi_codes? }, on: :update+ after_commit :remove_coupons, on: :updatebefore_destroy :not_used?#@@ -193,7 +193,7 @@ module Spree# if the rules make this promotable ineligible, then nil is returned (i.e. this promotable is not eligible)def eligible_rules(promotable, options = {})# Promotions without rules are eligible by default.- return [] if rules.none?+ return [] if rules.to_a.none? # preloaded rules as we're going to use them anyway, so avoiding additional database queriesspecific_rules = rules.select { |rule| rule.applicable?(promotable) }return [] if specific_rules.none?@@ -329,6 +329,9 @@ module Spreeenddef remove_coupons+ return unless (previous_changes.key?('kind') && previous_changes['kind'][0] == 'coupon_code' && kind == 'automatic') ||+ (previous_changes.key?('multi_codes') && previous_changes['multi_codes'][0] == true && multi_codes == false)+coupon_codes.where(deleted_at: nil).update_all(deleted_at: Time.current)enddiff --git a/core/spec/models/spree/promotion_spec.rb b/core/spec/models/spree/promotion_spec.rbindex 09828a7c4d..6981e1519b 100644--- a/core/spec/models/spree/promotion_spec.rb+++ b/core/spec/models/spree/promotion_spec.rb@@ -6,7 +6,7 @@ describe Spree::Promotion, type: :model dolet(:store) { @default_store }let(:promotion) { create(:promotion, kind: :automatic) }- describe 'validations' do+ describe 'Validations' dolet!(:valid_promotion) { build(:promotion, name: 'A promotion', stores: [store], kind: :automatic) }it 'valid_promotion is valid' do@@ -69,8 +69,8 @@ describe Spree::Promotion, type: :model doendend- describe 'callbacks' do- describe 'set_usage_limit_to_nil' do+ describe 'Callbacks' do+ describe '#set_usage_limit_to_nil' dolet(:promotion) { create(:promotion, kind: :coupon_code, usage_limit: 100) }context 'when promo has one code for all customers' do@@ -89,6 +89,14 @@ describe Spree::Promotion, type: :model doendendend++ describe '#remove_coupons' do+ let!(:promotion) { create(:promotion, kind: :coupon_code, multi_codes: true, number_of_codes: 1) }++ it 'removes the coupons' do+ expect { promotion.update!(kind: :automatic) }.to change { promotion.coupon_codes.count }.from(1).to(0)+ end+ endenddescribe 'scopes' do