Move decorators to patches/, configure Flickwerk

This stops us from loading line item, order, adjustment, shipment, shipping rate, and the order recalculator on app startup.
solidusio · Jan 3, 2025 · d1f57b6 · d1f57b6
1 parent 3764d58
commit d1f57b6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/...olidus_promotions/adjustment_decorator.rb → ...ls/solidus_promotions/adjustment_patch.rb b/...olidus_promotions/adjustment_decorator.rb → ...ls/solidus_promotions/adjustment_patch.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module AdjustmentDecorator
+  module AdjustmentPatch
     def self.prepended(base)
       base.scope :solidus_promotion, -> { where(source_type: "SolidusPromotions::Benefit") }
     end

diff --git a/...solidus_promotions/line_item_decorator.rb → ...els/solidus_promotions/line_item_patch.rb b/...solidus_promotions/line_item_decorator.rb → ...els/solidus_promotions/line_item_patch.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module LineItemDecorator
+  module LineItemPatch
     def self.prepended(base)
       base.attr_accessor :quantity_setter
       base.belongs_to :managed_by_order_benefit, class_name: "SolidusPromotions::Benefit", optional: true

diff --git a/...els/solidus_promotions/order_decorator.rb → .../models/solidus_promotions/order_patch.rb b/...els/solidus_promotions/order_decorator.rb → .../models/solidus_promotions/order_patch.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module OrderDecorator
+  module OrderPatch
     module ClassMethods
       def allowed_ransackable_associations
         super + ["solidus_promotions", "solidus_order_promotions"]

diff --git a/...romotions/order_recalculator_decorator.rb → ...us_promotions/order_recalculator_patch.rb b/...romotions/order_recalculator_decorator.rb → ...us_promotions/order_recalculator_patch.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module OrderRecalculatorDecorator
+  module OrderRecalculatorPatch
     # This is only needed for stores upgrading from the legacy promotion system.
     # Once we've removed support for the legacy promotion system, we can remove this.
     def recalculate

diff --git a/.../solidus_promotions/shipment_decorator.rb → ...dels/solidus_promotions/shipment_patch.rb b/.../solidus_promotions/shipment_decorator.rb → ...dels/solidus_promotions/shipment_patch.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module ShipmentDecorator
+  module ShipmentPatch
     Spree::Shipment.prepend SolidusPromotions::DiscountableAmount
 
     def reset_current_discounts

diff --git a/...dus_promotions/shipping_rate_decorator.rb → ...solidus_promotions/shipping_rate_patch.rb b/...dus_promotions/shipping_rate_decorator.rb → ...solidus_promotions/shipping_rate_patch.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module ShippingRateDecorator
+  module ShippingRatePatch
     def self.prepended(base)
       base.class_eval do
         has_many :discounts,

diff --git a/promotions/lib/solidus_promotions/engine.rb b/promotions/lib/solidus_promotions/engine.rb
@@ -2,10 +2,13 @@
 
 require "solidus_core"
 require "solidus_support"
+require "flickwerk"
 
 module SolidusPromotions
   class Engine < Rails::Engine
     include SolidusSupport::EngineExtensions
+    include Flickwerk
+    Flickwerk.aliases["Spree::Config.order_recalculator_class"] = Spree::Config.order_recalculator_class_name
 
     isolate_namespace ::SolidusPromotions