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
Remove deprecated/unused sorters
Damian Legawiecb9d33bbf9e89
diff --git a/spree/core/app/sorters/spree/base_sorter.rb b/spree/core/app/sorters/spree/base_sorter.rbdeleted file mode 100644index 67aebdc9fb..0000000000--- a/spree/core/app/sorters/spree/base_sorter.rb+++ /dev/null@@ -1,47 +0,0 @@-module Spree- class BaseSorter- def initialize(scope, params = {}, allowed_sort_attributes = [])- @scope = scope- @allowed_sort_attributes = allowed_sort_attributes- @sort = sort_fields(params[:sort])- end-- def call- by_param_attributes(scope)- end-- protected-- attr_reader :scope, :collection, :sort, :allowed_sort_attributes-- def by_param_attributes(scope)- return scope if sort.empty?-- sort.each do |value, order|- next if value.blank? || allowed_sort_attributes.exclude?(value.to_sym)-- scope = scope.order("#{value}": order)- end-- scope- end-- def sort_fields(sort)- return [] if sort.nil?-- sort.split(',').map { |field| [sort_field(field), order_direction(field)] }- end-- def desc_order(field)- String(field)[0] == '-'- end-- def sort_field(field)- desc_order(field) ? field[1..-1] : field- end-- def order_direction(field)- desc_order(field) ? :desc : :asc- end- end-enddiff --git a/spree/core/app/sorters/spree/classifications/sort.rb b/spree/core/app/sorters/spree/classifications/sort.rbdeleted file mode 100644index c768ac76ce..0000000000--- a/spree/core/app/sorters/spree/classifications/sort.rb+++ /dev/null@@ -1,68 +0,0 @@-module Spree- module Classifications- class Sort < ::Spree::BaseSorter- def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])- super(scope.reorder(''), params, allowed_sort_attributes)-- @currency = params[:currency] || current_currency- end-- def call- classifications = by_manual(scope)- classifications = by_best_selling(classifications)- classifications = by_param_attributes(classifications)- by_price(classifications)- end-- private-- attr_reader :sort, :scope, :currency, :allowed_sort_attributes-- def by_manual(scope)- return scope unless sort_by?('manual')-- scope.order(position: :asc)- end-- def by_best_selling(scope)- return scope unless (value = sort_by?('best_selling'))-- scope.by_best_selling(value[1])- end-- def by_param_attributes(scope)- return scope if sort.empty?-- sort.each do |value, order|- next if value.blank? || Spree::Product.column_names.exclude?(value)-- table_name = if Spree.use_translations?- translatable_fields = Spree::Product::TRANSLATABLE_FIELDS- value.to_sym.in?(translatable_fields) ? Spree::Product.translation_table_alias : Spree::Product.table_name- else- Spree::Product.table_name- end-- scope = scope.order("#{table_name}.#{value}": order)- end-- scope- end-- def by_price(scope)- return scope unless (value = sort_by?('price'))-- scope.joins(product: { variants: :prices }).- select("#{Spree::Classification.table_name}.*, min(#{Spree::Price.table_name}.amount)").- distinct.- where(spree_prices: { currency: currency }).- order("min(#{Spree::Price.table_name}.amount) #{value[1]}").- group("#{Spree::Classification.table_name}.id")- end-- def sort_by?(field)- sort.detect { |s| s[0] == field }- end- end- end-enddiff --git a/spree/core/app/sorters/spree/products/sort.rb b/spree/core/app/sorters/spree/products/sort.rbdeleted file mode 100644index 0d45c64c90..0000000000--- a/spree/core/app/sorters/spree/products/sort.rb+++ /dev/null@@ -1,73 +0,0 @@-module Spree- module Products- class Sort < ::Spree::BaseSorter- def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])- super(scope, params, allowed_sort_attributes)- @currency = params[:currency] || current_currency- end-- def call- products = by_param_attributes(scope)- products = by_price(products)- products = by_sku(products)-- products = select_translatable_fields(products) if Spree.use_translations?-- products.distinct- end-- private-- attr_reader :sort, :scope, :currency, :allowed_sort_attributes-- def by_price(scope)- return scope unless (value = sort_by?('price'))-- scope.joins(variants: :prices).- select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").- distinct.- where("#{Spree::Price.table_name}.currency": currency).- order("#{Spree::Price.table_name}.amount #{value[1]}")- end-- def by_sku(scope)- return scope unless (value = sort_by?('sku'))-- select_product_attributes = if scope.to_sql.include?("#{Spree::Product.table_name}.*")- ''- else- "#{Spree::Product.table_name}.*, "- end-- scope.joins(:default_variant).- select("#{select_product_attributes}#{Spree::Variant.table_name}.sku").- order("#{Spree::Variant.table_name}.sku #{value[1]}")- end-- def sort_by?(field)- sort.detect { |s| s[0] == field }- end-- # Add translatable fields to SELECT statement to avoid InvalidColumnReference error (workaround for Mobility issue #596)- def select_translatable_fields(scope)- translatable_fields = translatable_sortable_fields- return scope if translatable_fields.empty?-- # if sorting by 'sku' or 'price', spree_products.* is already included in SELECT statement- if sort_by?('sku') || sort_by?('price')- scope.i18n.select(*translatable_fields)- else- scope.i18n.select("#{Product.table_name}.*").select(*translatable_fields)- end- end-- def translatable_sortable_fields- fields = []- Product.translatable_fields.each do |field|- fields << field if sort_by?(field.to_s)- end- fields- end- end- end-end