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 filtering Products by options
Łukasz Adamczykefe7ea6d29f2
diff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rbindex 04a45cdde4..9506caa18a 100644--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb@@ -99,6 +99,64 @@ describe 'API V2 Storefront Products Spec', type: :request doendend+ context 'with multiple specified options' do+ let!(:color) { create(:option_type, :color) }+ let!(:green_color) { create(:option_value, option_type: color, name: 'green') }+ let!(:white_color) { create(:option_value, option_type: color, name: 'white') }++ let!(:size) { create(:option_type, :size) }+ let!(:s_size) { create(:option_value, option_type: size, name: 's') }+ let!(:m_size) { create(:option_value, option_type: size, name: 'm') }++ let(:product_1) { create(:product, option_types: [color, size]) }+ let!(:variant_1) { create(:variant, product: product_1, option_values: [white_color, m_size]) }++ let(:product_2) { create(:product, option_types: [color, size]) }+ let!(:variant_2_1) { create(:variant, product: product_2, option_values: [green_color, s_size]) }+ let!(:variant_2_2) { create(:variant, product: product_2, option_values: [white_color, s_size]) }++ context 'for filters with products' do+ let(:options_filter) do+ [+ "filter[options][#{color.name}]=#{white_color.name}",+ "filter[options][#{size.name}]=#{m_size.name}"+ ].join('&')+ end++ before { get "/api/v2/storefront/products?#{options_filter}&include=option_types,variants.option_values" }++ it_behaves_like 'returns 200 HTTP status'++ it 'returns products with specified options' do+ expect(json_response['data']).to include(have_id(product_1.id.to_s))+ expect(json_response['data']).not_to include(have_id(product_2.id.to_s))++ expect(json_response['included']).to include(have_type('option_type').and(have_attribute(:name).with_value(color.name)))+ expect(json_response['included']).to include(have_type('option_value').and(have_attribute(:name).with_value(white_color.name)))++ expect(json_response['included']).to include(have_type('option_type').and(have_attribute(:name).with_value(size.name)))+ expect(json_response['included']).to include(have_type('option_value').and(have_attribute(:name).with_value(m_size.name)))+ end+ end++ context 'for excluding filters' do+ let(:options_filter) do+ [+ "filter[options][#{color.name}]=#{green_color.name}",+ "filter[options][#{size.name}]=#{m_size.name}"+ ].join('&')+ end++ before { get "/api/v2/storefront/products?#{options_filter}&include=option_types,variants.option_values" }++ it_behaves_like 'returns 200 HTTP status'++ it 'returns no products' do+ expect(json_response['data']).to be_empty+ end+ end+ end+context 'with specified properties' docontext 'using proper filter params' dobefore { get "/api/v2/storefront/products?filter[properties][#{property.filter_param}]=#{product_property.filter_param}&include=product_properties" }diff --git a/core/app/finders/spree/products/find.rb b/core/app/finders/spree/products/find.rbindex 0870847e1e..d71895e04c 100644--- a/core/app/finders/spree/products/find.rb+++ b/core/app/finders/spree/products/find.rb@@ -142,11 +142,8 @@ module Spreedef by_options(products)return products unless options?- products.where(- id: options.map do |key, value|- products.with_option_value(key, value).ids- end.flatten.compact.uniq- )+ products_ids = options.map { |key, value| products.with_option_value(key, value).ids }+ products.where(id: products_ids.reduce(&:intersection))enddef by_option_value_ids(products)diff --git a/core/spec/finders/spree/products/find_spec.rb b/core/spec/finders/spree/products/find_spec.rbindex f19a77e87d..6102c68240 100644--- a/core/spec/finders/spree/products/find_spec.rb+++ b/core/spec/finders/spree/products/find_spec.rb@@ -92,7 +92,7 @@ module Spreeendend- describe 'filter by option values' do+ describe 'filter by options and option values' dosubject(:products) dodescribed_class.new(scope: Spree::Product.all,@@ -117,28 +117,47 @@ module Spreelet!(:variant_2) { create :variant, product: product_2, option_values: [option_value_1_2, option_value_2_2] }let!(:variant_3) { create :variant, product: product_3, option_values: [option_value_1_1, option_value_2_2] }- let(:option_value_ids) { [] }- let(:params) do- {- filter: {- option_value_ids: option_value_ids+ context 'for options' do+ let(:params) do+ {+ filter: {+ options: ActionController::Parameters.new(+ size: 's',+ state: 'old'+ )+ }}- }+ end++ it 'returns products matching all given options' do+ expect(products).to contain_exactly(product_1)+ endend- context 'filtering by one option' do- let(:option_value_ids) { [option_value_1_1.id] }+ context 'for option values' do+ let(:option_value_ids) { [] }+ let(:params) do+ {+ filter: {+ option_value_ids: option_value_ids+ }+ }+ end++ context 'filtering by one option' do+ let(:option_value_ids) { [option_value_1_1.id] }- it 'returns products with proper option values' do- expect(products).to match_array([product_1, product_3])+ it 'returns products with proper option values' do+ expect(products).to match_array([product_1, product_3])+ endend- end- context 'filtering by several options' do- let(:option_value_ids) { [option_value_1_1.id, option_value_2_2.id] }+ context 'filtering by several options' do+ let(:option_value_ids) { [option_value_1_1.id, option_value_2_2.id] }- it 'returns products that have both options' do- expect(products).to match_array([product_3])+ it 'returns products that have both options' do+ expect(products).to match_array([product_3])+ endendendend