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.

remove OptionValues::FindFilterable and move its functionality to OptionValues::FindAvailable

Łukasz Adamczyka51ed00ce359
diff --git a/core/app/finders/spree/option_values/find_available.rb b/core/app/finders/spree/option_values/find_available.rb
index 8f20edd91c..7fd5dc48b2 100644
--- a/core/app/finders/spree/option_values/find_available.rb
+++ b/core/app/finders/spree/option_values/find_available.rb
@@ -8,27 +8,24 @@ module Spree
end
def execute
- filterable_finder.execute
+ filterable_options = scope.filterable
+ filterable_options.for_products(products_scope)
end
private
attr_reader :scope, :currency, :taxon
- def filterable_finder
- FindFilterable.new(scope: scope, products_scope: products_scope)
- end
-
def products_scope
- products = by_currency(Product.spree_base_scopes)
- by_taxon(products)
+ products = products_by_currency(Product.spree_base_scopes)
+ products_by_taxon(products)
end
- def by_currency(products)
+ def products_by_currency(products)
products.active(currency)
end
- def by_taxon(products)
+ def products_by_taxon(products)
return products if taxon.nil?
products.in_taxon(taxon)
diff --git a/core/app/finders/spree/option_values/find_filterable.rb b/core/app/finders/spree/option_values/find_filterable.rb
deleted file mode 100644
index 4a33213ffa..0000000000
--- a/core/app/finders/spree/option_values/find_filterable.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Spree
- module OptionValues
- class FindFilterable
- def initialize(scope: OptionValue.spree_base_scopes, products_scope: Product.spree_base_scopes)
- @scope = scope
- @products_scope = products_scope
- end
-
- def execute
- scope.
- filterable.
- where(Variant.table_name => { product_id: products_ids })
- end
-
- private
-
- attr_reader :scope, :products_scope
-
- def products_ids
- products_scope.map(&:id)
- end
- end
- end
-end
diff --git a/core/app/models/spree/option_value.rb b/core/app/models/spree/option_value.rb
index ebb5a37775..398b9d9251 100644
--- a/core/app/models/spree/option_value.rb
+++ b/core/app/models/spree/option_value.rb
@@ -17,6 +17,8 @@ module Spree
distinct
}
+ scope :for_products, ->(products) { where(Variant.table_name => { product_id: products.map(&:id) }) }
+
after_touch :touch_all_variants
delegate :name, :presentation, to: :option_type, prefix: true, allow_nil: true
diff --git a/core/spec/finders/spree/option_values/find_available_spec.rb b/core/spec/finders/spree/option_values/find_available_spec.rb
index 347faa60c2..662a1c6869 100644
--- a/core/spec/finders/spree/option_values/find_available_spec.rb
+++ b/core/spec/finders/spree/option_values/find_available_spec.rb
@@ -16,7 +16,7 @@ module Spree
let!(:blue_color) { create(:option_value, option_type: color, name: 'blue') }
let!(:length) { create(:option_type, filterable: false) }
- let!(:mini) { create(:option_value, option_type: length) }
+ let!(:mini_length) { create(:option_value, option_type: length) }
before do
product_1 = create(:product, option_types: [color, size], taxons: [taxon], currency: gbp)
@@ -26,7 +26,7 @@ module Spree
create(:variant, option_values: [red_color, m_size], product: product_2)
product_3 = create(:product, option_types: [size, length], taxons: [taxon], currency: gbp)
- create(:variant, option_values: [s_size, mini], product: product_3)
+ 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)
@@ -38,6 +38,15 @@ module Spree
describe '#execute' do
subject(:available_options) { finder.execute }
+ context 'when given a predefined scope' do
+ let(:finder) { described_class.new(scope: scope) }
+ let(:scope) { OptionValue.where(id: [s_size, green_color, mini_length]) }
+
+ it 'finds available Option Values with respect to a predefined scope' do
+ expect(available_options).to contain_exactly(s_size, green_color)
+ end
+ end
+
context 'when taxon and currency are given' do
let(:finder) { described_class.new(taxon: taxon, currency: gbp) }
diff --git a/core/spec/finders/spree/option_values/find_filterable_spec.rb b/core/spec/finders/spree/option_values/find_filterable_spec.rb
deleted file mode 100644
index 4014007880..0000000000
--- a/core/spec/finders/spree/option_values/find_filterable_spec.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'spec_helper'
-
-module Spree
- RSpec.describe OptionValues::FindFilterable do
- let(:finder) { described_class.new }
-
- describe '#execute' do
- let(:filterable_option_values) { finder.execute }
-
- 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!(:xl_size) { create(:option_value, option_type: size, name: 'xl') }
-
- let!(:color) { create(:option_type, :color) }
- let!(:red_color) { create(:option_value, option_type: color, name: 'red') }
- let!(:green_color) { create(:option_value, option_type: color, name: 'green') }
- let!(:blue_color) { create(:option_value, option_type: color, name: 'blue') }
- let!(:purple_color) { create(:option_value, option_type: color, name: 'purple') }
-
- let!(:non_filterable_option) { create(:option_type, filterable: false) }
- let!(:non_filterable_value) { create(:option_value, option_type: non_filterable_option) }
-
- before do
- create(
- :variant,
- option_values: [m_size, red_color],
- product: create(:product, option_types: [color, size])
- )
-
- create(
- :variant,
- option_values: [s_size, green_color, blue_color],
- product: create(:product, option_types: [color, size])
- )
-
- create(
- :variant,
- option_values: [s_size, green_color],
- product: create(:product, option_types: [color])
- )
-
- create(
- :variant,
- option_values: [non_filterable_value],
- product: create(:product, option_types: [non_filterable_option])
- )
- end
-
- it 'finds filterable Option Values' do
- expect(filterable_option_values).to contain_exactly(
- s_size, m_size,
- red_color, green_color, blue_color
- )
- end
-
- context 'when given a predefined scope' do
- let(:finder) { described_class.new(scope: scope) }
- let(:scope) { OptionValue.where(id: [s_size, green_color, purple_color, non_filterable_value]) }
-
- it 'finds filterable Option Values with respect to a predefined scope' do
- expect(filterable_option_values).to contain_exactly(s_size, green_color)
- end
- end
-
- 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]) }
-
- 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, non_filterable_option]) }
-
- before do
- create(:variant, option_values: [xl_size], product: product_1)
- create(:variant, option_values: [red_color, purple_color], product: product_2)
- create(:variant, option_values: [m_size, green_color, non_filterable_value], product: product_3)
- end
-
- it 'finds filterable Option Values with respect to a predefined Products scope' do
- expect(filterable_option_values).to contain_exactly(
- m_size, xl_size,
- red_color, green_color, purple_color,
- )
- end
- end
- end
- end
-end