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.

Fix: Stock reservation crashing when a stock level is deleted mid-checkout (#15054)

Damian Legawiec7e7f5bc9831c
diff --git a/spree/core/app/services/spree/stock_reservations/reserve.rb b/spree/core/app/services/spree/stock_reservations/reserve.rb
index 91a6996f61..32cc84c3f1 100644
--- a/spree/core/app/services/spree/stock_reservations/reserve.rb
+++ b/spree/core/app/services/spree/stock_reservations/reserve.rb
@@ -33,8 +33,12 @@ module Spree
this_order_used = Hash.new(0)
- reservations = targets.map do |line_item, stock_level, quantity|
- stock_level = locked_stock_levels.fetch(stock_level.id)
+ reservations = targets.filter_map do |line_item, stock_level, quantity|
+ # A shelf deleted since the allocation was read (a variant being
+ # discontinued removes its stock) has nothing left to hold.
+ stock_level = locked_stock_levels[stock_level.id]
+ next if stock_level.nil?
+
available = stock_level.available_count - held.fetch(stock_level.id, 0) - this_order_used[stock_level.id]
raise_insufficient_stock(line_item, available) if available < quantity
diff --git a/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb b/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb
index 14939dc093..1154dd8743 100644
--- a/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb
+++ b/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb
@@ -29,6 +29,18 @@ describe Spree::StockReservations::Reserve do
expect(reservation.quantity).to eq(3)
end
+ it 'skips a stock level deleted after the allocation was read' do
+ allow_any_instance_of(described_class).to receive(:build_targets) do
+ stale = [line_item, stock_level, 3]
+ stock_level.delete
+ [stale]
+ end
+
+ expect { result }.not_to raise_error
+ expect(result).to be_success
+ expect(Spree::StockReservation.count).to eq(0)
+ end
+
it 'sets expires_at according to the store TTL' do
store.update!(preferred_stock_reservation_ttl_minutes: 7)
freeze_time do