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
FIX: digital_link update cache after authorized download. (#11402)
Matthew Kennedye2f9521d14df
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rbindex 493277b47c..d08ef9b37c 100644--- a/core/app/models/spree/digital_link.rb+++ b/core/app/models/spree/digital_link.rb@@ -32,7 +32,7 @@ module Spree# This method should be called when a download is initiated.# It returns +true+ or +false+ depending on whether the authorization is granted.def authorize!- authorizable? && increment!(:access_counter) ? true : false+ authorizable? && increment!(:access_counter, touch: true) ? true : falseenddef reset!diff --git a/core/spec/models/spree/digital_link_spec.rb b/core/spec/models/spree/digital_link_spec.rbindex 39b3b0218d..ca7451164e 100644--- a/core/spec/models/spree/digital_link_spec.rb+++ b/core/spec/models/spree/digital_link_spec.rb@@ -35,8 +35,23 @@ describe Spree::DigitalLink, type: :model dodescribe '#reset!' dolet!(:digital_link) { create(:digital_link, access_counter: 5) }+ after do+ digital_link.update(access_counter: 5)+ digital_link.save!+ digital_link.reload+ end+it 'resets access_counter' do- expect { digital_link.reset! }.to change(digital_link, :access_counter)+ expect { digital_link.reset! }.to change(digital_link, :access_counter).from(5).to(0)+ end++ it 'resets created_at timestamp' do+ Timecop.travel Time.current + 1.day do+ expect do+ digital_link.reset!+ digital_link.reload+ end.to change { digital_link.created_at.to_s }+ endendend@@ -167,13 +182,35 @@ describe Spree::DigitalLink, type: :model doenddescribe 'authorize!' do- let(:digital_link) { create(:digital_link, access_counter: 2) }+ let!(:digital_link) { create(:digital_link, access_counter: 2) }+ let!(:digital_link_expired) { create(:digital_link, access_counter: 100) }++ after do+ digital_link.update(access_counter: 2)+ digital_link.save!+ digital_link.reload+ end- it 'resets the access counter' do- digital_link.authorize!- expect(digital_link.access_counter).to eq(3)- digital_link.reset!- expect(digital_link.access_counter).to eq(0)+ it 'increments the access counter' do+ expect { digital_link.authorize! }.to change(digital_link, :access_counter).from(2).to(3)+ end++ it 'touches the digital_link when autorized' do+ Timecop.travel Time.current + 1.day do+ expect do+ digital_link.authorize!+ digital_link.reload+ end.to change { digital_link.updated_at.to_s }+ end+ end++ it 'does not touch the digital_link if not authorized' do+ Timecop.travel Time.current + 1.day do+ expect do+ digital_link_expired.authorize!+ digital_link_expired.reload+ end.not_to change { digital_link_expired.updated_at.to_s }+ endendendenddiff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rbindex a1bd92e622..a85ae97ece 100644--- a/core/spec/models/spree/order/checkout_spec.rb+++ b/core/spec/models/spree/order/checkout_spec.rb@@ -93,6 +93,14 @@ describe Spree::Order, type: :model doendend+ context 'when delivery not required' do+ before { allow(order).to receive_messages delivery_required?: false }++ specify do+ expect(order.checkout_steps).to eq(%w(address complete))+ end+ end+context 'when payment not required' dobefore { allow(order).to receive_messages payment_required?: false }@@ -443,6 +451,8 @@ describe Spree::Order, type: :model doendcontext 'default credit card' do+ let(:digital) { create(:digital) }+before doorder.user = FactoryBot.create(:user)order.email = '[email protected]'@@ -450,7 +460,7 @@ describe Spree::Order, type: :model do# make sure we will actually capture a paymentallow(order).to receive_messages(payment_required?: true)- order.line_items << FactoryBot.create(:line_item)+ order.line_items << FactoryBot.create(:line_item, variant: digital.variant)Spree::OrderUpdater.new(order).updateorder.save!@@ -462,6 +472,12 @@ describe Spree::Order, type: :model doexpect(order.user.reload.default_credit_card.try(:id)).to eq(order.credit_cards.first.id)end+ it 'creates a digital_link for the digital line_item' do+ order.next!+ expect(order.state).to eq 'complete'+ expect(order.line_items.first.digital_links).not_to be_empty+ end+it 'does not assign a default credit card if temporary_credit_card is set' doorder.temporary_credit_card = trueorder.next!