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
Move prefixed-ID decoder into Store::SearchProviderSupport concern
Damian Legawiec1f01c6afbef6
diff --git a/spree/api/app/controllers/concerns/spree/api/v3/store/search_provider_support.rb b/spree/api/app/controllers/concerns/spree/api/v3/store/search_provider_support.rbindex 12fdbe447b..2285e6f2dd 100644--- a/spree/api/app/controllers/concerns/spree/api/v3/store/search_provider_support.rb+++ b/spree/api/app/controllers/concerns/spree/api/v3/store/search_provider_support.rb@@ -5,6 +5,13 @@ module Spreemodule SearchProviderSupportextend ActiveSupport::Concern+ # Matches `*_id_in`/`id_eq`/etc. and the bare `id_in`/`id_eq` on+ # the resource's primary key. Mirrors the regex on+ # `ResourceController` — duplicated here because `FiltersController`+ # extends `Store::BaseController`, not `ResourceController`, and+ # would otherwise NoMethodError on `decode_prefixed_id_predicates`.+ RANSACK_ID_PREDICATE_RE = /(?:\A|_)id(?:s)?(?:_(?:eq|not_eq|in|not_in|lt|lteq|gt|gteq))?\z/.freeze+privatedef search_query@@ -24,6 +31,26 @@ module Spreedef search_provider@search_provider ||= Spree.search_provider.constantize.new(current_store)end++ def decode_prefixed_id_predicates(hash)+ return hash unless hash.is_a?(Hash)++ hash.each_with_object({}) do |(key, value), result|+ result[key] = if ransack_id_predicate?(key)+ Array(value).map { |v| Spree::PrefixedId.prefixed_id?(v) ? Spree::PrefixedId.decode_prefixed_id(v) || v : v }.then { |arr|+ value.is_a?(Array) ? arr : arr.first+ }+ elsif value.is_a?(Hash)+ decode_prefixed_id_predicates(value)+ else+ value+ end+ end+ end++ def ransack_id_predicate?(key)+ RANSACK_ID_PREDICATE_RE.match?(key.to_s)+ endendendend