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.

Make WebhooksSubscriber Vendorized and extract QueueRequests method for override (#11620)

Aleksandar Petrushev4d2c15cdc202
diff --git a/api/app/models/spree/webhooks/subscriber.rb b/api/app/models/spree/webhooks/subscriber.rb
index f75e642a55..b4ddabc54b 100644
--- a/api/app/models/spree/webhooks/subscriber.rb
+++ b/api/app/models/spree/webhooks/subscriber.rb
@@ -1,6 +1,10 @@
module Spree
module Webhooks
class Subscriber < Spree::Webhooks::Base
+ if defined?(Spree::VendorConcern)
+ include Spree::VendorConcern
+ end
+
has_many :events, inverse_of: :subscriber
validates :url, 'spree/url': true, presence: true
diff --git a/api/app/services/spree/webhooks/subscribers/queue_requests.rb b/api/app/services/spree/webhooks/subscribers/queue_requests.rb
index ccdecfac1c..00598a2ae5 100644
--- a/api/app/services/spree/webhooks/subscribers/queue_requests.rb
+++ b/api/app/services/spree/webhooks/subscribers/queue_requests.rb
@@ -5,12 +5,18 @@ module Spree
prepend Spree::ServiceModule::Base
def call(event_name:, webhook_payload_body:)
- Spree::Webhooks::Subscriber.active.with_urls_for(event_name).each do |subscriber|
+ filtered_subscribers(event_name, webhook_payload_body).each do |subscriber|
Spree::Webhooks::Subscribers::MakeRequestJob.perform_later(
webhook_payload_body, event_name, subscriber
)
end
end
+
+ private
+
+ def filtered_subscribers(event_name, _)
+ Spree::Webhooks::Subscriber.active.with_urls_for(event_name)
+ end
end
end
end