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
Minimize N+1s for fetching Cart/Orders in Storefront API (#12137)
Damian Legawieca4201f0aeb75
diff --git a/core/app/finders/spree/orders/find_complete.rb b/core/app/finders/spree/orders/find_complete.rbindex 3e1f39787f..e4347efec4 100644--- a/core/app/finders/spree/orders/find_complete.rb+++ b/core/app/finders/spree/orders/find_complete.rb@@ -1,6 +1,8 @@module Spreemodule Ordersclass FindComplete+ include Spree::Orders::FinderHelper+attr_reader :user, :number, :token, :storedef initialize(user: nil, number: nil, token: nil, store: nil)@@ -22,7 +24,7 @@ module Spreeprivatedef scope- user? ? user.orders.complete.includes(scope_includes) : Spree::Order.complete.includes(scope_includes)+ user? ? user.orders.complete.includes(order_includes) : Spree::Order.complete.includes(order_includes)enddef user?@@ -64,18 +66,6 @@ module Spreeorders.where(store: store)end-- def scope_includes- {- line_items: [- variant: [- :images,- option_values: :option_type,- product: :product_properties,- ]- ]- }- endendendenddiff --git a/core/app/finders/spree/orders/find_current.rb b/core/app/finders/spree/orders/find_current.rbindex 376723f977..0e06ce2e58 100644--- a/core/app/finders/spree/orders/find_current.rb+++ b/core/app/finders/spree/orders/find_current.rb@@ -1,6 +1,8 @@module Spreemodule Ordersclass FindCurrent+ include Spree::Orders::FinderHelper+def execute(user:, store:, **params)params = params.merge(store_id: store.id)@@ -15,7 +17,7 @@ module Spreeprivatedef incomplete_orders- Spree::Order.incomplete.not_canceled+ Spree::Order.incomplete.not_canceled.includes(order_includes)endendenddiff --git a/core/app/finders/spree/orders/finder_helper.rb b/core/app/finders/spree/orders/finder_helper.rbnew file mode 100644index 0000000000..53e7e85225--- /dev/null+++ b/core/app/finders/spree/orders/finder_helper.rb@@ -0,0 +1,17 @@+module Spree+ module Orders+ module FinderHelper+ def order_includes+ {+ line_items: [+ variant: [+ :product,+ :images,+ { option_values: :option_type }+ ]+ ]+ }+ end+ end+ end+end