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
rewrite OptionValues::FindAvailable to accept only a general Products scope
Łukasz Adamczyk44ee15bf363c
diff --git a/core/app/finders/spree/option_values/find_available.rb b/core/app/finders/spree/option_values/find_available.rbindex 7fd5dc48b2..5e4eea8920 100644--- a/core/app/finders/spree/option_values/find_available.rb+++ b/core/app/finders/spree/option_values/find_available.rb@@ -1,10 +1,9 @@module Spreemodule OptionValuesclass FindAvailable- def initialize(scope: OptionValue.spree_base_scopes, currency: nil, taxon: nil)+ def initialize(scope: OptionValue.spree_base_scopes, products_scope: Product.spree_base_scopes)@scope = scope- @currency = currency- @taxon = taxon+ @products_scope = products_scopeenddef execute@@ -14,22 +13,7 @@ module Spreeprivate- attr_reader :scope, :currency, :taxon-- def products_scope- products = products_by_currency(Product.spree_base_scopes)- products_by_taxon(products)- end-- def products_by_currency(products)- products.active(currency)- end-- def products_by_taxon(products)- return products if taxon.nil?-- products.in_taxon(taxon)- end+ attr_reader :scope, :products_scopeendendenddiff --git a/core/spec/finders/spree/option_values/find_available_spec.rb b/core/spec/finders/spree/option_values/find_available_spec.rbindex 662a1c6869..46da53466b 100644--- a/core/spec/finders/spree/option_values/find_available_spec.rb+++ b/core/spec/finders/spree/option_values/find_available_spec.rb@@ -2,8 +2,7 @@ require 'spec_helper'module SpreeRSpec.describe OptionValues::FindAvailable do- let(:taxon) { create(:taxon) }- let(:gbp) { 'GBP' }+ let(:finder) { described_class.new }let!(:size) { create(:option_type, :size) }let!(:s_size) { create(:option_value, option_type: size, name: 's') }@@ -19,25 +18,26 @@ module Spreelet!(:mini_length) { create(:option_value, option_type: length) }before do- product_1 = create(:product, option_types: [color, size], taxons: [taxon], currency: gbp)+ product_1 = create(:product, option_types: [color, size])create(:variant, option_values: [s_size, green_color], product: product_1)- product_2 = create(:product, option_types: [color, size], taxons: [taxon], currency: gbp)+ product_2 = create(:product, option_types: [color, size])create(:variant, option_values: [red_color, m_size], product: product_2)- product_3 = create(:product, option_types: [size, length], taxons: [taxon], currency: gbp)+ product_3 = create(:product, option_types: [size, length])create(:variant, option_values: [s_size, mini_length], product: product_3)-- product_4 = create(:product, option_types: [color], taxons: [create(:taxon)], currency: gbp)- create(:variant, option_values: [blue_color], product: product_4)-- product_5 = create(:product, option_types: [size], taxons: [taxon], currency: 'PLN')- create(:variant, option_values: [xl_size], product: product_5)enddescribe '#execute' dosubject(:available_options) { finder.execute }+ it 'finds available Option Values' do+ expect(available_options).to contain_exactly(+ s_size, m_size,+ red_color, green_color+ )+ end+context 'when given a predefined scope' dolet(:finder) { described_class.new(scope: scope) }let(:scope) { OptionValue.where(id: [s_size, green_color, mini_length]) }@@ -47,35 +47,24 @@ module Spreeendend- context 'when taxon and currency are given' do- let(:finder) { described_class.new(taxon: taxon, currency: gbp) }+ context 'when given a predefined products scope' do+ let(:finder) { described_class.new(products_scope: products_scope) }+ let(:products_scope) { Product.where(id: [product_1, product_2, product_3]) }- it 'finds available Option Values' do- expect(available_options).to contain_exactly(- s_size, m_size,- red_color, green_color- )- end- end-- context 'when no taxon is given' do- let(:finder) { described_class.new(currency: gbp) }+ let(:product_1) { create(:product, option_types: [size]) }+ let(:product_2) { create(:product, option_types: [color]) }+ let(:product_3) { create(:product, option_types: [size, color, length]) }- it 'finds available Option Values in all Taxons' do- expect(available_options).to contain_exactly(- s_size, m_size,- red_color, green_color, blue_color- )+ before do+ create(:variant, option_values: [xl_size], product: product_1)+ create(:variant, option_values: [red_color, blue_color], product: product_2)+ create(:variant, option_values: [m_size, red_color, mini_length], product: product_3)end- end-- context 'when no currency is given' do- let(:finder) { described_class.new(taxon: taxon) }- it 'finds available Option Values for all Currencies' do+ it 'finds filterable Option Values with respect to a predefined Products scope' doexpect(available_options).to contain_exactly(- s_size, m_size, xl_size,- red_color, green_color+ m_size, xl_size,+ red_color, blue_color)endenddiff --git a/frontend/app/helpers/spree/frontend_helper.rb b/frontend/app/helpers/spree/frontend_helper.rbindex d867606aa5..ac8f3e8df7 100644--- a/frontend/app/helpers/spree/frontend_helper.rb+++ b/frontend/app/helpers/spree/frontend_helper.rb@@ -299,7 +299,7 @@ module Spreedef available_option_types@available_option_types ||= Rails.cache.fetch("available-option-types/#{available_option_types_cache_key}") do- option_values = OptionValues::FindAvailable.new(taxon: @taxon, currency: current_currency).execute+ option_values = OptionValues::FindAvailable.new(products_scope: products_for_available_option_values).executeFilters::Options.new(option_values_scope: option_values).to_aendend@@ -364,5 +364,11 @@ module Spreeinline_svg_tag 'edit.svg'endend++ def products_for_available_option_values+ scope = Product.active(current_currency)+ scope = scope.in_taxon(@taxon) if @taxon.present?+ scope+ endendend