Ignore dependent records marked for destruction

When computing item totals after a line item benefit is removed, we need
to ensure we aren't using the marked for destruction items.

We also needed to make a change to the legacy promotion order updater
patch because it is incorrectly being used in our tests even when using
the new promotion system. It also did not have logic to ensure
adjustments that were marked for destruction were ignored in the
adjustment totals calculation.

Co-authored-by: Jared Norman <jared@super.gd>
Co-authored-by: Noah Silvera <noah@super.gd>
Co-authored-by: Alistair Norman <alistair@super.gd>

Author: 4 people

core/app/models/spree/order_updater.rb

@@ -168,7 +168,7 @@ def recalculate_order_total
     def update_adjustment_total
       update_adjustments
 
-      all_items = line_items + shipments
+      all_items = (line_items + shipments).reject(&:marked_for_destruction?)
       # Ignore any adjustments that have been marked for destruction in our
       # calculations. They'll get removed when/if we persist the order.
       valid_adjustments = adjustments.reject(&:marked_for_destruction?)

legacy_promotions/app/patches/models/solidus_legacy_promotions/spree_order_updater_patch.rb

@@ -5,7 +5,7 @@ module SpreeOrderUpdaterPatch
     def update_adjustment_total
       update_adjustments
 
-      all_items = line_items + shipments
+      all_items = (line_items + shipments).reject(&:marked_for_destruction?)
       order_tax_adjustments = adjustments.select(&:eligible?).select(&:tax?)
 
       order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.select(&:eligible?).sum(&:amount)
@@ -25,10 +25,11 @@ def recalculate_item_totals
         # Core doesn't have "eligible" adjustments anymore, so we need to
         # override the adjustment_total calculation to exclude them for legacy
         # promotions.
-        item.adjustment_total = item.adjustments.
-          select(&:eligible?).
-          reject(&:included?).
-          sum(&:amount)
+        item.adjustment_total = item.adjustments.select { |adjustment|
+          adjustment.eligible? &&
+            !adjustment.marked_for_destruction? &&
+            !adjustment.included?
+        }.sum(&:amount)
 
         if item.changed?
           item.update_columns(

promotions/app/models/solidus_promotions/order_adjuster.rb

@@ -25,10 +25,12 @@ def call
       order.reset_current_discounts
 
       unless dry_run
-        # Since automations might have added a line item, we need to recalculate item total and item count here.
-        order.item_total = order.line_items.sum(&:amount)
-        order.item_count = order.line_items.sum(&:quantity)
-        order.promo_total = (order.line_items + order.shipments).sum(&:promo_total)
+        # Since automations might have added a line item, we need to recalculate
+        # item total and item count here.
+        line_items = order.line_items.reject(&:marked_for_destruction?)
+        order.item_total = line_items.sum(&:amount)
+        order.item_count = line_items.sum(&:quantity)
+        order.promo_total = (line_items + order.shipments).sum(&:promo_total)
       end
       order
     end