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
Reduce N+1s during Orders CSV export
Damian Legawiec9b333d28b7f8
diff --git a/core/app/models/spree/exports/orders.rb b/core/app/models/spree/exports/orders.rbindex 2d6ad1a258..dd14bf617c 100644--- a/core/app/models/spree/exports/orders.rb+++ b/core/app/models/spree/exports/orders.rb@@ -3,10 +3,11 @@ module Spreeclass Orders < Spree::Exportdef scope_includes[+ :store,:payments,:shipments,- { bill_address: :state },- { ship_address: :state },+ { bill_address: [:state, :country] },+ { ship_address: [:state, :country] },{ line_items: { variant: { product: [:taxons] } } },{ metafields: :metafield_definition }]diff --git a/core/app/presenters/spree/csv/order_line_item_presenter.rb b/core/app/presenters/spree/csv/order_line_item_presenter.rbindex 43561f9a4c..3d2151df05 100644--- a/core/app/presenters/spree/csv/order_line_item_presenter.rb+++ b/core/app/presenters/spree/csv/order_line_item_presenter.rb@@ -86,7 +86,7 @@ module Spreeindex.zero? ? order.total.to_f : nil,index.zero? ? order.shipping_method&.name : nil,index.zero? ? order.total_weight.to_f : nil,- index.zero? && order.payments.valid.any? ? order.payments.valid.first.display_source_name : nil,+ index.zero? ? order.payments.valid&.first&.display_source_name : nil,line_item.product_id,line_item.quantity,line_item.sku,@@ -95,7 +95,7 @@ module Spreeline_item.promo_total.abs,line_item.total,!line_item.product.digital?,- line_item.product.tax_category.present?,+ line_item.product.tax_category_id.present?,line_item.product.try(:vendor_name),taxon_dict(line_item.product.main_taxon)[0],taxon_dict(line_item.product.main_taxon)[1],diff --git a/core/spec/models/spree/exports/customers_spec.rb b/core/spec/models/spree/exports/customers_spec.rbindex 07e6f0071a..29909ea9fc 100644--- a/core/spec/models/spree/exports/customers_spec.rb+++ b/core/spec/models/spree/exports/customers_spec.rb@@ -63,15 +63,4 @@ RSpec.describe Spree::Exports::Customers, type: :model doendendend-- describe '#scope_includes' do- it 'includes metafields' do- expect(export.scope_includes).to include({ metafields: :metafield_definition })- end-- it 'includes bill_address and ship_address' do- expect(export.scope_includes).to include({ bill_address: :state })- expect(export.scope_includes).to include({ ship_address: :state })- end- endenddiff --git a/core/spec/models/spree/exports/gift_cards_spec.rb b/core/spec/models/spree/exports/gift_cards_spec.rbindex 7a92df26e4..19e427248b 100644--- a/core/spec/models/spree/exports/gift_cards_spec.rb+++ b/core/spec/models/spree/exports/gift_cards_spec.rb@@ -77,14 +77,4 @@ RSpec.describe Spree::Exports::GiftCards, type: :model doendendend-- describe '#scope_includes' do- it 'includes metafields' do- expect(export.scope_includes).to include({ metafields: :metafield_definition })- end-- it 'includes user' do- expect(export.scope_includes).to include(:user)- end- endenddiff --git a/core/spec/models/spree/exports/newsletter_subscribers_spec.rb b/core/spec/models/spree/exports/newsletter_subscribers_spec.rbindex 2fe0d87a30..d9f697f8fb 100644--- a/core/spec/models/spree/exports/newsletter_subscribers_spec.rb+++ b/core/spec/models/spree/exports/newsletter_subscribers_spec.rb@@ -43,14 +43,4 @@ RSpec.describe Spree::Exports::NewsletterSubscribers, type: :model doendendend-- describe '#scope_includes' do- it 'includes metafields' do- expect(export.scope_includes).to include({ metafields: :metafield_definition })- end-- it 'includes user' do- expect(export.scope_includes).to include(:user)- end- endenddiff --git a/core/spec/models/spree/exports/orders_spec.rb b/core/spec/models/spree/exports/orders_spec.rbindex 7848aac931..ff2a3e1905 100644--- a/core/spec/models/spree/exports/orders_spec.rb+++ b/core/spec/models/spree/exports/orders_spec.rb@@ -140,20 +140,6 @@ RSpec.describe Spree::Exports::Orders, type: :model doendend- describe '#scope_includes' do- it 'includes metafields' do- expect(export.scope_includes).to include({ metafields: :metafield_definition })- end-- it 'includes order associations' do- expect(export.scope_includes).to include(:payments)- expect(export.scope_includes).to include(:shipments)- expect(export.scope_includes).to include({ bill_address: :state })- expect(export.scope_includes).to include({ ship_address: :state })- expect(export.scope_includes).to include({ line_items: { variant: { product: [:taxons] } } })- end- end-describe '#multi_line_csv?' doit 'returns true' doexpect(export.multi_line_csv?).to be truediff --git a/core/spec/models/spree/exports/products_spec.rb b/core/spec/models/spree/exports/products_spec.rbindex 3545164991..2deacc53aa 100644--- a/core/spec/models/spree/exports/products_spec.rb+++ b/core/spec/models/spree/exports/products_spec.rb@@ -191,30 +191,4 @@ RSpec.describe Spree::Exports::Products, type: :model doendendend-- describe '#scope_includes' do- it 'includes metafields' do- expect(export.scope_includes).to include({ metafields: :metafield_definition })- end-- context 'when product_properties_enabled is true' do- before do- allow(Spree::Config).to receive(:[]).with(:product_properties_enabled).and_return(true)- end-- it 'includes product_properties' do- expect(export.scope_includes).to include({ product_properties: [:property] })- end- end-- context 'when product_properties_enabled is false' do- before do- allow(Spree::Config).to receive(:[]).with(:product_properties_enabled).and_return(false)- end-- it 'does not include product_properties' do- expect(export.scope_includes).not_to include({ product_properties: [:property] })- end- end- endend