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
Fix issues with Storefront Products API
Łukasz Adamczyk6fccbad672b8
diff --git a/api/spec/models/spree/stock_item_webhooks_spec.rb b/api/spec/models/spree/stock_item_webhooks_spec.rbindex 74188d61c1..6d1dafb4bd 100644--- a/api/spec/models/spree/stock_item_webhooks_spec.rb+++ b/api/spec/models/spree/stock_item_webhooks_spec.rb@@ -25,7 +25,10 @@ describe Spree::StockItem::Webhooks dolet!(:webhook_subscriber) { create(:webhook_subscriber, :active, subscriptions: [event_name]) }let!(:variant2) { create(:variant, product: product) }- before { Spree::StockItem.update_all(backorderable: false) }+ before do+ Spree::StockItem.update_all(backorderable: false)+ product.reload+ endcontext 'when product was out of stock' docontext 'when none of the product variants is backorderable' do@@ -94,7 +97,10 @@ describe Spree::StockItem::Webhooks doendcontext 'when variant was not backorderable' do- before { variant.stock_items.update_all(backorderable: false) }+ before do+ variant.stock_items.update_all(backorderable: false)+ variant.product.reload+ endcontext 'when variant is not set as backorderable' dobefore { stock_item.backorderable = false }diff --git a/api/spec/models/spree/stock_movement_webhooks_spec.rb b/api/spec/models/spree/stock_movement_webhooks_spec.rbindex 805a5ef305..9d311efe52 100644--- a/api/spec/models/spree/stock_movement_webhooks_spec.rb+++ b/api/spec/models/spree/stock_movement_webhooks_spec.rb@@ -30,7 +30,7 @@ describe Spree::StockMovement::Webhooks docontext 'when all product variants are in stock' dobefore do- product.variants.each do |variant|+ product.reload.variants.each do |variant|variant.stock_items.each do |stock_item|stock_item.set_count_on_hand(1)end@@ -86,7 +86,7 @@ describe Spree::StockMovement::Webhooks doRails.cache.clearend- before { product.variants[0].stock_items[0].set_count_on_hand(1) }+ before { product.reload.variants[0].stock_items[0].set_count_on_hand(1) }it { expect { subject }.to emit_webhook_event(event_name, product) }end@@ -103,7 +103,7 @@ describe Spree::StockMovement::Webhooks doendbefore do- product.variants.each do |variant|+ product.reload.variants.each do |variant|variant.stock_items.each do |stock_item|stock_item.set_count_on_hand(0)enddiff --git a/api/spec/requests/spree/api/v2/platform/products_spec.rb b/api/spec/requests/spree/api/v2/platform/products_spec.rbindex 784de6b99b..1c60f5601e 100644--- a/api/spec/requests/spree/api/v2/platform/products_spec.rb+++ b/api/spec/requests/spree/api/v2/platform/products_spec.rb@@ -79,7 +79,7 @@ describe 'API V2 Platform Products Spec' doit 'returns products sorted by price' doexpect(json_response['data'].count).to eq store.products.count- expect(json_response['data'].pluck(:id)).to eq store.products.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount").map(&:id).map(&:to_s)+ expect(json_response['data'].pluck(:id)).to eq store.products.joins(variants_including_master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount").map(&:id).map(&:to_s)endend@@ -88,7 +88,7 @@ describe 'API V2 Platform Products Spec' doit 'returns products sorted by price with descending order' doexpect(json_response['data'].count).to eq store.products.count- expect(json_response['data'].pluck(:id)).to eq store.products.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount DESC").map(&:id).map(&:to_s)+ expect(json_response['data'].pluck(:id)).to eq store.products.joins(variants_including_master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount DESC").map(&:id).map(&:to_s)endendenddiff --git a/api/spec/requests/spree/api/v2/platform/stock_items_spec.rb b/api/spec/requests/spree/api/v2/platform/stock_items_spec.rbindex 3c5d3f8792..a9eba46be1 100644--- a/api/spec/requests/spree/api/v2/platform/stock_items_spec.rb+++ b/api/spec/requests/spree/api/v2/platform/stock_items_spec.rb@@ -12,13 +12,12 @@ describe 'Platform API v2 Stock Items API' dodescribe 'stock_items#index' dolet!(:variants) { create_list(:variant, 2, product: product_1) }- let!(:variants) { create_list(:variant, 2, product: product_2) }context 'filtering by stock location id' dobefore { get "/api/v2/platform/stock_items?filter[stock_location_id_eq]=#{stock_location_1.id}", headers: bearer_token }it 'returns stock_items with matching stock location ids' do- expect(json_response['data'].count).to eq 3+ expect(json_response['data'].count).to eq(2)expect(json_response['data'].first).to have_type('stock_item')endend@@ -34,4 +33,3 @@ describe 'Platform API v2 Stock Items API' doendendend-diff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rbindex 2d8084ad06..4a4e6f9a46 100644--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb@@ -484,7 +484,7 @@ describe 'API V2 Storefront Products Spec', type: :request doit 'returns products sorted by price' doexpect(json_response['data'].count).to eq store.products.available.count- expect(json_response['data'].pluck(:id)).to eq store.products.available.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount").map(&:id).map(&:to_s)+ expect(json_response['data'].pluck(:id)).to eq store.products.available.joins(variants_including_master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount").map(&:id).map(&:to_s)endend@@ -493,7 +493,7 @@ describe 'API V2 Storefront Products Spec', type: :request doit 'returns products sorted by price with descending order' doexpect(json_response['data'].count).to eq store.products.available.count- expect(json_response['data'].pluck(:id)).to eq store.products.available.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount DESC").map(&:id).map(&:to_s)+ expect(json_response['data'].pluck(:id)).to eq store.products.available.joins(variants_including_master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount DESC").map(&:id).map(&:to_s)endendenddiff --git a/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rbindex c4e73aab94..696542e3aa 100644--- a/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb+++ b/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb@@ -9,16 +9,16 @@ describe Spree::Api::V2::Platform::ProductSerializer dolet(:taxonomy) { store.taxonomies.first }let!(:images) { create_list(:image, 2) }let(:product) do- create(:product_in_stock,- name: 'Test Product',- price: 10.00,- compare_at_price: 15.00,- variants_including_master: [create(:variant, images: images), create(:variant)],- option_types: create_list(:option_type, 2),- product_properties: create_list(:product_property, 2),- taxons: create_list(:taxon, 2, taxonomy: taxonomy),- tax_category: create(:tax_category),- stores: [store])+ create(+ :product_in_stock,+ name: 'Test Product',+ variants_including_master: [create(:variant, images: images), create(:variant)],+ option_types: create_list(:option_type, 2),+ product_properties: create_list(:product_property, 2),+ taxons: create_list(:taxon, 2, taxonomy: taxonomy),+ tax_category: create(:tax_category),+ stores: [store]+ )endlet(:serializable_hash) do{@@ -136,6 +136,10 @@ describe Spree::Api::V2::Platform::ProductSerializer do}end+ before do+ product.reload.default_variant.prices[0].update(amount: 10, compare_at_amount: 15)+ end+context 'without a store in the params' dosubject { described_class.new(product, params: serializer_params.merge(store: nil)).serializable_hash }diff --git a/core/app/sorters/spree/products/sort.rb b/core/app/sorters/spree/products/sort.rbindex e5a74224da..d6bd8eb9e4 100644--- a/core/app/sorters/spree/products/sort.rb+++ b/core/app/sorters/spree/products/sort.rb@@ -23,10 +23,10 @@ module Spreedef by_price(scope)return scope unless (value = sort_by?('price'))- scope.joins(master: :prices).+ scope.joins(variants_including_master: :prices).select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").distinct.- where(spree_prices: { currency: currency }).+ where("#{Spree::Price.table_name}.currency": currency).order("#{Spree::Price.table_name}.amount #{value[1]}")end@@ -41,7 +41,6 @@ module Spreescope.joins(:master).select("#{select_product_attributes}#{Spree::Variant.table_name}.sku").- where(Spree::Variant.table_name.to_s => { is_master: true }).order("#{Spree::Variant.table_name}.sku #{value[1]}")end