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.

Move delegate to stock_movement.

Sebastian Palma58eff8f7abc0
diff --git a/api/app/models/spree/api/webhooks/stock_movement_decorator.rb b/api/app/models/spree/api/webhooks/stock_movement_decorator.rb
index 141325d0bb..090f650411 100644
--- a/api/app/models/spree/api/webhooks/stock_movement_decorator.rb
+++ b/api/app/models/spree/api/webhooks/stock_movement_decorator.rb
@@ -10,9 +10,6 @@ module Spree
private
- delegate :variant, to: :stock_item
- delegate :product, to: :variant
-
def queue_webhooks_requests_for_variant_out_of_stock!
variant_in_stock_before_update = variant.in_stock_or_backorderable?
yield
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index aa113d4d1a..8ee0368b40 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -323,7 +323,7 @@ module Spree
end
def full_in_stock?
- variants.in_stock_or_backorderable.exists?(product_id: id)
+ variants.in_stock_or_backorderable.exists?
end
private
diff --git a/core/app/models/spree/stock_movement.rb b/core/app/models/spree/stock_movement.rb
index ffc0c98434..b0c475e204 100644
--- a/core/app/models/spree/stock_movement.rb
+++ b/core/app/models/spree/stock_movement.rb
@@ -21,6 +21,9 @@ module Spree
scope :recent, -> { order(created_at: :desc) }
+ delegate :variant, to: :stock_item
+ delegate :product, to: :variant
+
self.whitelisted_ransackable_attributes = ['quantity']
def readonly?
diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
index 00a8be00a0..301c9ee4cb 100644
--- a/core/app/models/spree/variant.rb
+++ b/core/app/models/spree/variant.rb
@@ -132,7 +132,6 @@ module Spree
!discontinued? && product.available?
end
- # [TODO]: test
def in_stock_or_backorderable?
self.class.in_stock_or_backorderable.exists?(id: id)
end
diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rb
index 193fe75f67..dc3553a193 100644
--- a/core/spec/models/spree/product_spec.rb
+++ b/core/spec/models/spree/product_spec.rb
@@ -831,6 +831,12 @@ describe Spree::Product, type: :model do
let!(:product) { create(:product, stores: [store]) }
let(:stock_item) { variant.stock_items.first }
+ context 'when in stock or backorderable variants belong to another product' do
+ let!(:another_product_variant) { create(:variant, product: create(:product, stores: [store])) }
+
+ it { expect(subject).to eq(false) }
+ end
+
context 'when product has no variants' do
it do
expect(product.variants).to eq([])
diff --git a/core/spec/models/spree/stock_movement_spec.rb b/core/spec/models/spree/stock_movement_spec.rb
index 0345c16096..84bd42318e 100644
--- a/core/spec/models/spree/stock_movement_spec.rb
+++ b/core/spec/models/spree/stock_movement_spec.rb
@@ -30,9 +30,18 @@ describe Spree::StockMovement, type: :model do
end
end
- describe 'Insatance Methods' do
+ describe 'Instance Methods' do
let(:stock_location) { create(:stock_location_with_items) }
let(:stock_item) { stock_location.stock_items.order(:id).first }
+ let(:stock_movement) { build(:stock_movement, stock_item: stock_item) }
+
+ describe '.product' do
+ it { expect(stock_movement.product).to eq(stock_item.variant.product) }
+ end
+
+ describe '.variant' do
+ it { expect(stock_movement.variant).to eq(stock_item.variant) }
+ end
describe '#readonly?' do
let(:stock_movement) { create(:stock_movement, stock_item: stock_item) }
@@ -43,8 +52,6 @@ describe Spree::StockMovement, type: :model do
end
describe '#update_stock_item_quantity' do
- let(:stock_movement) { build(:stock_movement, stock_item: stock_item) }
-
context 'when track inventory levels is false' do
before do
Spree::Config[:track_inventory_levels] = false