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
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.rbindex 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 Spreeendendend++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.rbsimilarity index 76%rename from api/app/models/spree/api/webhooks/order.rbrename to api/app/models/spree/api/webhooks/order_decorator.rbindex 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 Spreemodule Apimodule Webhooks- module Order+ module OrderDecoratordef after_cancelsuperqueue_webhooks_requests!('order.cancel')@@ -15,3 +15,5 @@ module Spreeendendend++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.rbsimilarity index 65%rename from api/app/models/spree/api/webhooks/payment.rbrename to api/app/models/spree/api/webhooks/payment_decorator.rbindex 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 Spreemodule Apimodule Webhooks- module Payment+ module PaymentDecoratordef after_voidsuperqueue_webhooks_requests!('payment.void')@@ -10,3 +10,5 @@ module Spreeendendend++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.rbsimilarity index 64%rename from api/app/models/spree/api/webhooks/shipment.rbrename to api/app/models/spree/api/webhooks/shipment_decorator.rbindex 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 Spreemodule Apimodule Webhooks- module Shipment+ module ShipmentDecoratordef after_shipsuperqueue_webhooks_requests!('shipment.ship')@@ -10,3 +10,5 @@ module Spreeendendend++Spree::Shipment.prepend(Spree::Api::Webhooks::ShipmentDecorator)diff --git a/api/lib/spree/api/engine.rb b/api/lib/spree/api/engine.rbindex 6b7a1637b7..0f32b04e0f 100644--- a/api/lib/spree/api/engine.rb+++ b/api/lib/spree/api/engine.rb@@ -22,27 +22,19 @@ module Spreeendend- 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)endenddef self.root@root ||= Pathname.new(File.expand_path('../../..', __dir__))end++ config.to_prepare &method(:activate).to_procendendend