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 core subscribers to use Prefixed IDs (#13699)
Damian Legawiec565306e889b4
diff --git a/spree/admin/app/subscribers/spree/admin/import_row_subscriber.rb b/spree/admin/app/subscribers/spree/admin/import_row_subscriber.rbindex 7ca11e6989..e729f81aad 100644--- a/spree/admin/app/subscribers/spree/admin/import_row_subscriber.rb+++ b/spree/admin/app/subscribers/spree/admin/import_row_subscriber.rb@@ -21,7 +21,7 @@ module Spreeimport_row_id = event.payload['id']return unless import_row_id- import_row = Spree::ImportRow.find_by(id: import_row_id)+ import_row = Spree::ImportRow.find_by_prefix_id(import_row_id)return unless import_rowadd_row_to_import_view(import_row)diff --git a/spree/admin/app/subscribers/spree/admin/import_subscriber.rb b/spree/admin/app/subscribers/spree/admin/import_subscriber.rbindex 25f5b71351..f88720d24e 100644--- a/spree/admin/app/subscribers/spree/admin/import_subscriber.rb+++ b/spree/admin/app/subscribers/spree/admin/import_subscriber.rb@@ -19,7 +19,7 @@ module Spreeimport_id = event.payload['id']return unless import_id- import = Spree::Import.find_by(id: import_id)+ import = Spree::Import.find_by_prefix_id(import_id)return unless importreturn unless import.respond_to?(:broadcast_update_to)diff --git a/spree/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb b/spree/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rbindex a375e778ba..f69240400d 100644--- a/spree/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb+++ b/spree/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb@@ -34,7 +34,7 @@ RSpec.describe Spree::Admin::ImportRowSubscriber dosubscriber = described_class.newevent = Spree::Event.new(name: 'import_row.completed',- payload: { 'id' => import_row.id }+ payload: { 'id' => import_row.prefixed_id })expect(subscriber).to receive(:add_row_to_import_view).with(kind_of(Spree::ImportRow))@@ -64,7 +64,7 @@ RSpec.describe Spree::Admin::ImportRowSubscriber dosubscriber = described_class.newevent = Spree::Event.new(name: 'import_row.completed',- payload: { 'id' => -999 }+ payload: { 'id' => 'ir_nonexistent' })expect(subscriber).not_to receive(:add_row_to_import_view)diff --git a/spree/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb b/spree/admin/spec/subscribers/spree/admin/import_subscriber_spec.rbindex 240b69386f..26a3328e18 100644--- a/spree/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb+++ b/spree/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb@@ -25,7 +25,7 @@ RSpec.describe Spree::Admin::ImportSubscriber dosubscriber = described_class.newevent = Spree::Event.new(name: 'import.completed',- payload: { 'id' => import.id }+ payload: { 'id' => import.prefixed_id })found_import = Spree::Import.find(import.id)@@ -62,11 +62,9 @@ RSpec.describe Spree::Admin::ImportSubscriber dosubscriber = described_class.newevent = Spree::Event.new(name: 'import.completed',- payload: { 'id' => -999 }+ payload: { 'id' => 'import_nonexistent' })- expect(Spree::Import).to receive(:find_by).with(id: -999).and_return(nil)-subscriber.update_loader_in_import_view(event)endenddiff --git a/spree/core/app/subscribers/spree/invitation_email_subscriber.rb b/spree/core/app/subscribers/spree/invitation_email_subscriber.rbindex d27d22e342..bc558d3463 100644--- a/spree/core/app/subscribers/spree/invitation_email_subscriber.rb+++ b/spree/core/app/subscribers/spree/invitation_email_subscriber.rb@@ -34,7 +34,7 @@ module Spreedef find_invitation(event)invitation_id = event.payload['id']- Spree::Invitation.find_by(id: invitation_id)+ Spree::Invitation.find_by_prefix_id(invitation_id)endendenddiff --git a/spree/core/spec/subscribers/spree/invitation_email_subscriber_spec.rb b/spree/core/spec/subscribers/spree/invitation_email_subscriber_spec.rbindex 0b49735840..f63bb090c6 100644--- a/spree/core/spec/subscribers/spree/invitation_email_subscriber_spec.rb+++ b/spree/core/spec/subscribers/spree/invitation_email_subscriber_spec.rb@@ -11,7 +11,7 @@ RSpec.describe Spree::InvitationEmailSubscriber dolet(:subscriber) { described_class.new }def mock_event(invitation)- double('Event', payload: { 'id' => invitation.id })+ double('Event', payload: { 'id' => invitation.prefixed_id })enddescribe 'invitation.created event' do@@ -23,10 +23,11 @@ RSpec.describe Spree::InvitationEmailSubscriber docontext 'when invitation not found' doit 'does not raise an error' do- invitation_id = invitation.id+ prefixed_id = invitation.prefixed_idinvitation.destroy- expect { subscriber.send(:send_invitation_email, mock_event(OpenStruct.new(id: invitation_id))) }.not_to raise_error+ event = double('Event', payload: { 'id' => prefixed_id })+ expect { subscriber.send(:send_invitation_email, event) }.not_to raise_errorendendend@@ -44,10 +45,11 @@ RSpec.describe Spree::InvitationEmailSubscriber docontext 'when invitation not found' doit 'does not raise an error' do- invitation_id = invitation.id+ prefixed_id = invitation.prefixed_idinvitation.destroy- expect { subscriber.send(:send_acceptance_notification, mock_event(OpenStruct.new(id: invitation_id))) }.not_to raise_error+ event = double('Event', payload: { 'id' => prefixed_id })+ expect { subscriber.send(:send_acceptance_notification, event) }.not_to raise_errorendendend@@ -98,10 +100,11 @@ RSpec.describe Spree::InvitationEmailSubscriber docontext 'when invitation not found' doit 'does not raise an error' do- invitation_id = invitation.id+ prefixed_id = invitation.prefixed_idinvitation.destroy!- expect { subscriber.send(:resend_invitation_email, mock_event(OpenStruct.new(id: invitation_id))) }.not_to raise_error+ event = double('Event', payload: { 'id' => prefixed_id })+ expect { subscriber.send(:resend_invitation_email, event) }.not_to raise_errorendendend