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.

Speed up quick checkout checks for Order

Damian Legawiec0d1dbad9eb98
diff --git a/core/app/models/spree/order/digital.rb b/core/app/models/spree/order/digital.rb
index ee612e3463..cbd0bae5b0 100644
--- a/core/app/models/spree/order/digital.rb
+++ b/core/app/models/spree/order/digital.rb
@@ -5,10 +5,10 @@ module Spree
#
# @return [Boolean]
def digital?
- if line_items.empty?
+ if item_count.zero? || line_items.empty?
false
else
- line_items.all?(&:digital?)
+ line_items.includes(variant: :product).all?(&:digital?)
end
end
@@ -16,21 +16,29 @@ module Spree
#
# @return [Boolean]
def some_digital?
- line_items.any?(&:digital?)
+ if item_count.zero? || line_items.empty?
+ false
+ else
+ line_items.includes(variant: :product).any?(&:digital?)
+ end
end
# Returns true if any order line item has digital assets
#
# @return [Boolean]
def with_digital_assets?
- line_items.any?(&:with_digital_assets?)
+ if item_count.zero? || line_items.empty?
+ false
+ else
+ line_items.includes(:variant).any?(&:with_digital_assets?)
+ end
end
# Returns all line items with digital assets
#
# @return [Array<Spree::LineItem>]
def digital_line_items
- line_items.with_digital_assets.distinct
+ line_items.joins(:variant).with_digital_assets.distinct
end
# Returns all digital links for the order
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index d8d03fb104..235b658a8b 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -638,7 +638,7 @@ module Spree
#
# @return [Boolean]
def digital?
- @digital ||= shipping_methods&.digital&.exists?
+ @digital ||= shipping_category&.includes_digital_shipping_method?
end
def auto_match_taxons
diff --git a/core/app/models/spree/shipping_category.rb b/core/app/models/spree/shipping_category.rb
index 9015c531b3..749a7c3a99 100644
--- a/core/app/models/spree/shipping_category.rb
+++ b/core/app/models/spree/shipping_category.rb
@@ -16,5 +16,11 @@ module Spree
def self.digital
find_by(name: DIGITAL_NAME)
end
+
+ def includes_digital_shipping_method?
+ Rails.cache.fetch("#{cache_key_with_version}/includes-digital-shipping-method") do
+ shipping_methods.digital.exists?
+ end
+ end
end
end
diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb
index 3ef3a0451d..d492570bcf 100644
--- a/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/core/lib/spree/testing_support/factories/order_factory.rb
@@ -24,6 +24,9 @@ FactoryBot.define do
after(:create) do |order, evaluator|
create(:line_item, order: order, price: evaluator.line_items_price)
order.line_items.reload # to ensure order.line_items is accessible after
+
+ order.update_column(:item_count, order.line_items.count)
+ order.reload
end
end
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 44aebf0d2e..3e7789ab03 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -2314,14 +2314,14 @@ describe Spree::Order, type: :model do
describe '#quick_checkout_available?' do
it 'returns true if the order is fully digital' do
digital_line_item
- order.update_totals
+ order.update_with_updater!
expect(order.quick_checkout_available?).to be true
end
it 'returns true if the order has no digital products at all' do
physical_line_item
- order.update_totals
+ order.update_with_updater!
expect(order.quick_checkout_available?).to be true
end
@@ -2329,7 +2329,7 @@ describe Spree::Order, type: :model do
it 'returns false if the order has physical products and some digital products' do
physical_line_item
digital_line_item
- order.update_totals
+ order.update_with_updater!
expect(order.quick_checkout_available?).to be false
end
@@ -2337,7 +2337,7 @@ describe Spree::Order, type: :model do
it 'returns false if order has many shipments' do
physical_line_item
digital_line_item
- order.update_totals
+ order.update_with_updater!
order.create_proposed_shipments
expect(order.shipments.count).to eq(2)
@@ -2347,7 +2347,7 @@ describe Spree::Order, type: :model do
it 'returns false if order does not require payment' do
physical_line_item.update(price: 0)
- order.update_totals
+ order.update_with_updater!
expect(order.total).to eq(0)
expect(order.payment_required?).to be false
@@ -2365,7 +2365,7 @@ describe Spree::Order, type: :model do
it 'returns false if the order is digital' do
digital_line_item
- order.update_totals
+ order.update_with_updater!
expect(order.quick_checkout_require_address?).to be false
end
diff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rb
index cc1e69e80c..bb38ca843a 100644
--- a/core/spec/models/spree/shipment_spec.rb
+++ b/core/spec/models/spree/shipment_spec.rb
@@ -384,6 +384,7 @@ describe Spree::Shipment, type: :model do
it 'returns true if order is digital and it does not have a ship address' do
order.ship_address = nil
order.line_items = [digital_line_item]
+ order.update_with_updater!
expect(order.digital?).to eq(true)
expect(shipment.send(:can_get_rates?)).to be_truthy
end
diff --git a/core/spec/models/spree/shipping_category_spec.rb b/core/spec/models/spree/shipping_category_spec.rb
index 799d4e42d2..abf1df8eae 100644
--- a/core/spec/models/spree/shipping_category_spec.rb
+++ b/core/spec/models/spree/shipping_category_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::ShippingCategory, type: :model do
- describe '#validations' do
+ context 'Validations' do
it 'has a valid factory' do
expect(FactoryBot.build(:shipping_category)).to be_valid
end
@@ -15,4 +15,12 @@ describe Spree::ShippingCategory, type: :model do
expect(FactoryBot.build(:shipping_category, name: 'Test')).not_to be_valid
end
end
+
+ describe '#includes_digital_shipping_method?' do
+ it 'returns true if the shipping category includes a digital shipping method' do
+ shipping_category = create(:shipping_category)
+ create(:shipping_method, shipping_categories: [shipping_category], calculator: create(:digital_shipping_calculator))
+ expect(shipping_category.includes_digital_shipping_method?).to be_truthy
+ end
+ end
end