From 3ecdfca9cf6467d591778201eb7bb3437c0a0000 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 28 Jan 2021 01:25:36 +0000
Subject: [PATCH] Rename fee adjustment clear-all method

---
 app/models/enterprise_fee.rb       | 4 ++--
 app/models/spree/order.rb          | 2 +-
 spec/models/enterprise_fee_spec.rb | 6 +++---
 spec/models/spree/order_spec.rb    | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
index f1161bb8ab..b7a3eeb6e2 100644
--- a/app/models/enterprise_fee.rb
+++ b/app/models/enterprise_fee.rb
@@ -40,8 +40,8 @@ class EnterpriseFee < ActiveRecord::Base
     joins(:calculator).where('spree_calculators.type IN (?)', PER_ORDER_CALCULATORS)
   }
 
-  def self.clear_all_adjustments_on_order(order)
-    order.adjustments.where(originator_type: 'EnterpriseFee').destroy_all
+  def self.clear_all_adjustments(order)
+    order.adjustments.enterprise_fee.destroy_all
   end
 
   private
diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 3b54897af2..4dd471b5c7 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -667,7 +667,7 @@ module Spree
       # See https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/locking/pessimistic.rb#L69
       # and https://www.postgresql.org/docs/current/static/sql-select.html#SQL-FOR-UPDATE-SHARE
       with_lock do
-        EnterpriseFee.clear_all_adjustments_on_order self
+        EnterpriseFee.clear_all_adjustments self
 
         fee_handler = OrderFeesHandler.new(self)
         fee_handler.create_line_item_fees!
diff --git a/spec/models/enterprise_fee_spec.rb b/spec/models/enterprise_fee_spec.rb
index b5065ecee7..9cf76958d5 100644
--- a/spec/models/enterprise_fee_spec.rb
+++ b/spec/models/enterprise_fee_spec.rb
@@ -110,7 +110,7 @@ describe EnterpriseFee do
       order_cycle.exchanges[0].enterprise_fees[0].create_adjustment('foo4', line_item2.order, line_item2, true)
 
       expect do
-        EnterpriseFee.clear_all_adjustments_on_order order
+        EnterpriseFee.clear_all_adjustments order
       end.to change(order.adjustments, :count).by(-4)
     end
 
@@ -121,7 +121,7 @@ describe EnterpriseFee do
       enterprise_fee_aplicator.create_order_adjustment(order)
 
       expect do
-        EnterpriseFee.clear_all_adjustments_on_order order
+        EnterpriseFee.clear_all_adjustments order
       end.to change(order.adjustments, :count).by(-1)
     end
 
@@ -135,7 +135,7 @@ describe EnterpriseFee do
                                  label: 'hello' })
 
       expect do
-        EnterpriseFee.clear_all_adjustments_on_order order
+        EnterpriseFee.clear_all_adjustments order
       end.to change(order.adjustments, :count).by(0)
     end
   end
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index c18deed302..0a495e6bf6 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -541,7 +541,7 @@ describe Spree::Order do
     end
 
     it "clears all enterprise fee adjustments on the order" do
-      expect(EnterpriseFee).to receive(:clear_all_adjustments_on_order).with(subject)
+      expect(EnterpriseFee).to receive(:clear_all_adjustments).with(subject)
       subject.recreate_all_fees!
     end
 
@@ -552,7 +552,7 @@ describe Spree::Order do
     end
 
     it "skips order cycle per-order adjustments for orders that don't have an order cycle" do
-      allow(EnterpriseFee).to receive(:clear_all_adjustments_on_order)
+      allow(EnterpriseFee).to receive(:clear_all_adjustments)
 
       allow(subject).to receive(:order_cycle) { nil }
 
@@ -560,7 +560,7 @@ describe Spree::Order do
     end
 
     it "ensures the correct adjustment(s) are created for order cycles" do
-      allow(EnterpriseFee).to receive(:clear_all_adjustments_on_order)
+      allow(EnterpriseFee).to receive(:clear_all_adjustments)
       line_item = create(:line_item, order: subject)
       allow(fee_handler).to receive(:provided_by_order_cycle?) { true }
 
@@ -575,7 +575,7 @@ describe Spree::Order do
     end
 
     it "ensures the correct per-order adjustment(s) are created for order cycles" do
-      allow(EnterpriseFee).to receive(:clear_all_adjustments_on_order)
+      allow(EnterpriseFee).to receive(:clear_all_adjustments)
 
       order_cycle = double(:order_cycle)
       expect_any_instance_of(OpenFoodNetwork::EnterpriseFeeCalculator).