Promotions: Specify inverse_of/dependent options

Author: mamhoff

promotions/app/models/solidus_promotions/benefit.rb

@@ -16,8 +16,8 @@ class Benefit < Spree::Base
 
     belongs_to :promotion, inverse_of: :benefits
     belongs_to :original_promotion_action, class_name: "Spree::PromotionAction", optional: true
-    has_many :adjustments, class_name: "Spree::Adjustment", as: :source
-    has_many :shipping_rate_discounts, class_name: "SolidusPromotions::ShippingRateDiscount", inverse_of: :benefit
+    has_many :adjustments, class_name: "Spree::Adjustment", as: :source, dependent: :restrict_with_error
+    has_many :shipping_rate_discounts, class_name: "SolidusPromotions::ShippingRateDiscount", inverse_of: :benefit, dependent: :restrict_with_error
     has_many :conditions, class_name: "SolidusPromotions::Condition", inverse_of: :benefit, dependent: :destroy
 
     scope :of_type, ->(type) { where(type: Array.wrap(type).map(&:to_s)) }

promotions/app/models/solidus_promotions/conditions/line_item_product.rb

@@ -11,7 +11,8 @@ class LineItemProduct < Condition
       has_many :condition_products,
         dependent: :destroy,
         foreign_key: :condition_id,
-        class_name: "SolidusPromotions::ConditionProduct"
+        class_name: "SolidusPromotions::ConditionProduct",
+        inverse_of: :condition
       has_many :products,
         class_name: "Spree::Product",
         through: :condition_products

promotions/app/models/solidus_promotions/conditions/line_item_taxon.rb

@@ -5,8 +5,11 @@ module Conditions
     class LineItemTaxon < Condition
       include LineItemLevelCondition
 
-      has_many :condition_taxons, class_name: "SolidusPromotions::ConditionTaxon", foreign_key: :condition_id,
-        dependent: :destroy
+      has_many :condition_taxons,
+        class_name: "SolidusPromotions::ConditionTaxon",
+        foreign_key: :condition_id,
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :taxons, through: :condition_taxons, class_name: "Spree::Taxon"
 
       MATCH_POLICIES = %w[include exclude].freeze

promotions/app/models/solidus_promotions/conditions/product.rb

@@ -12,7 +12,8 @@ class Product < Condition
       has_many :condition_products,
         dependent: :destroy,
         foreign_key: :condition_id,
-        class_name: "SolidusPromotions::ConditionProduct"
+        class_name: "SolidusPromotions::ConditionProduct",
+        inverse_of: :condition
       has_many :products, class_name: "Spree::Product", through: :condition_products
 
       def preload_relations

promotions/app/models/solidus_promotions/conditions/store.rb

@@ -5,9 +5,11 @@ module Conditions
     class Store < Condition
       include OrderLevelCondition
 
-      has_many :condition_stores, class_name: "SolidusPromotions::ConditionStore",
+      has_many :condition_stores,
+        class_name: "SolidusPromotions::ConditionStore",
         foreign_key: :condition_id,
-        dependent: :destroy
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :stores, through: :condition_stores, class_name: "Spree::Store"
 
       def preload_relations

promotions/app/models/solidus_promotions/conditions/taxon.rb

@@ -5,8 +5,11 @@ module Conditions
     class Taxon < Condition
       include LineItemApplicableOrderLevelCondition
 
-      has_many :condition_taxons, class_name: "SolidusPromotions::ConditionTaxon", foreign_key: :condition_id,
-        dependent: :destroy
+      has_many :condition_taxons,
+        class_name: "SolidusPromotions::ConditionTaxon",
+        foreign_key: :condition_id,
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :taxons, through: :condition_taxons, class_name: "Spree::Taxon"
 
       def preload_relations

promotions/app/models/solidus_promotions/order_promotion.rb

@@ -7,7 +7,7 @@ module SolidusPromotions
   # 2. The specific code that they used
   class OrderPromotion < Spree::Base
     belongs_to :order, class_name: "Spree::Order"
-    belongs_to :promotion, -> { with_discarded }, class_name: "SolidusPromotions::Promotion"
+    belongs_to :promotion, -> { with_discarded }, class_name: "SolidusPromotions::Promotion", inverse_of: :order_promotions
     belongs_to :promotion_code, class_name: "SolidusPromotions::PromotionCode", optional: true
 
     validates :promotion_code, presence: true, if: :require_promotion_code?

promotions/app/models/solidus_promotions/promotion.rb

@@ -6,8 +6,11 @@ class Promotion < Spree::Base
 
     include Spree::SoftDeletable
 
-    belongs_to :category, class_name: "SolidusPromotions::PromotionCategory",
-      foreign_key: :promotion_category_id, optional: true
+    belongs_to :category,
+      class_name: "SolidusPromotions::PromotionCategory",
+      foreign_key: :promotion_category_id,
+      optional: true,
+      inverse_of: :promotions
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
     has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy
     has_many :conditions, through: :benefits