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.

Use decorator pattern for loading Webhook decorators

Damian Legawiec5abc3ebc6679
diff --git a/api/app/models/concerns/spree/webhooks/has_webhooks.rb b/api/app/models/concerns/spree/webhooks/has_webhooks.rb
index 544c7aeba1..f78765011a 100644
--- a/api/app/models/concerns/spree/webhooks/has_webhooks.rb
+++ b/api/app/models/concerns/spree/webhooks/has_webhooks.rb
@@ -44,3 +44,5 @@ module Spree
end
end
end
+
+Spree::Base.include(Spree::Webhooks::HasWebhooks)
diff --git a/api/app/models/spree/api/webhooks/order.rb b/api/app/models/spree/api/webhooks/order_decorator.rb
similarity index 76%
rename from api/app/models/spree/api/webhooks/order.rb
rename to api/app/models/spree/api/webhooks/order_decorator.rb
index 2685ef94e0..824de71de6 100644
--- a/api/app/models/spree/api/webhooks/order.rb
+++ b/api/app/models/spree/api/webhooks/order_decorator.rb
@@ -1,7 +1,7 @@
module Spree
module Api
module Webhooks
- module Order
+ module OrderDecorator
def after_cancel
super
queue_webhooks_requests!('order.cancel')
@@ -15,3 +15,5 @@ module Spree
end
end
end
+
+Spree::Order.prepend(Spree::Api::Webhooks::OrderDecorator)
diff --git a/api/app/models/spree/api/webhooks/payment.rb b/api/app/models/spree/api/webhooks/payment_decorator.rb
similarity index 65%
rename from api/app/models/spree/api/webhooks/payment.rb
rename to api/app/models/spree/api/webhooks/payment_decorator.rb
index 0efcbd26db..44ef58cee6 100644
--- a/api/app/models/spree/api/webhooks/payment.rb
+++ b/api/app/models/spree/api/webhooks/payment_decorator.rb
@@ -1,7 +1,7 @@
module Spree
module Api
module Webhooks
- module Payment
+ module PaymentDecorator
def after_void
super
queue_webhooks_requests!('payment.void')
@@ -10,3 +10,5 @@ module Spree
end
end
end
+
+Spree::Payment.prepend(Spree::Api::Webhooks::PaymentDecorator)
diff --git a/api/app/models/spree/api/webhooks/shipment.rb b/api/app/models/spree/api/webhooks/shipment_decorator.rb
similarity index 64%
rename from api/app/models/spree/api/webhooks/shipment.rb
rename to api/app/models/spree/api/webhooks/shipment_decorator.rb
index 74cf7b1d78..4026696370 100644
--- a/api/app/models/spree/api/webhooks/shipment.rb
+++ b/api/app/models/spree/api/webhooks/shipment_decorator.rb
@@ -1,7 +1,7 @@
module Spree
module Api
module Webhooks
- module Shipment
+ module ShipmentDecorator
def after_ship
super
queue_webhooks_requests!('shipment.ship')
@@ -10,3 +10,5 @@ module Spree
end
end
end
+
+Spree::Shipment.prepend(Spree::Api::Webhooks::ShipmentDecorator)
diff --git a/api/lib/spree/api/engine.rb b/api/lib/spree/api/engine.rb
index 6b7a1637b7..0f32b04e0f 100644
--- a/api/lib/spree/api/engine.rb
+++ b/api/lib/spree/api/engine.rb
@@ -22,27 +22,19 @@ module Spree
end
end
- initializer 'Spree::Webhooks' do
- ActiveSupport.on_load(:spree_base) do
- include Spree::Webhooks::HasWebhooks
- end
-
- ActiveSupport.on_load(:spree_order) do
- prepend Spree::Api::Webhooks::Order
- end
+ def self.activate
+ Spree::Base.include(Spree::Webhooks::HasWebhooks)
- ActiveSupport.on_load(:spree_payment) do
- prepend Spree::Api::Webhooks::Payment
- end
-
- ActiveSupport.on_load(:spree_shipment) do
- prepend Spree::Api::Webhooks::Shipment
+ Dir.glob(File.join(File.dirname(__FILE__), '../../../app/models/spree/api/webhooks/*_decorator*.rb')) do |c|
+ Rails.application.config.cache_classes ? require(c) : load(c)
end
end
def self.root
@root ||= Pathname.new(File.expand_path('../../..', __dir__))
end
+
+ config.to_prepare &method(:activate).to_proc
end
end
end