From 1e8767e8b522be2244db2480d09881727873e0bc Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Thu, 15 Dec 2016 16:47:35 +1100
Subject: [PATCH] StandingOrderForm: Small refactor, update initialised orders
 one-by-one

---
 app/forms/standing_order_form.rb | 53 ++++++++++++++------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/app/forms/standing_order_form.rb b/app/forms/standing_order_form.rb
index 23851e3f19..812e9a416b 100644
--- a/app/forms/standing_order_form.rb
+++ b/app/forms/standing_order_form.rb
@@ -24,28 +24,7 @@ class StandingOrderForm
       initialise_proxy_orders!
       remove_obsolete_proxy_orders!
 
-      orders.update_all(customer_id: customer_id, email: customer.andand.email, distributor_id: shop_id)
-
-      orders.each do |order|
-        update_shipment_for(order) if shipping_method_id_changed?
-        update_payment_for(order) if payment_method_id_changed?
-      end
-
-      changed_standing_line_items.each do |sli|
-        updateable_line_items(sli).each{ |li| li.update_attributes(quantity: sli.quantity, skip_stock_check: true)}
-      end
-
-      new_standing_line_items.each do |sli|
-        future_and_undated_orders.each do |order|
-          order.line_items.create(variant_id: sli.variant_id, quantity: sli.quantity, skip_stock_check: true)
-        end
-      end
-
-      standing_line_items.select(&:marked_for_destruction?).each do |sli|
-        updateable_line_items(sli).destroy_all
-      end
-
-      future_and_undated_orders.each(&:save)
+      update_initialised_orders
 
       raise ActiveRecord::Rollback unless standing_order.save
       true
@@ -61,6 +40,28 @@ class StandingOrderForm
 
   private
 
+  def update_initialised_orders
+    future_and_undated_orders.each do |order|
+      order.assign_attributes(customer_id: customer_id, email: customer.andand.email, distributor_id: shop_id)
+
+      update_shipment_for(order) if shipping_method_id_changed?
+      update_payment_for(order) if payment_method_id_changed?
+
+      changed_standing_line_items.each do |sli|
+        order.line_items.find_by_variant_id(sli.variant_id)
+        .update_attributes(quantity: sli.quantity, skip_stock_check: true)
+      end
+
+      new_standing_line_items.each do |sli|
+        order.line_items.create(variant_id: sli.variant_id, quantity: sli.quantity, skip_stock_check: true)
+      end
+
+      order.line_items.where(variant_id: standing_line_items.select(&:marked_for_destruction?).map(&:variant_id)).destroy_all
+
+      order.save
+    end
+  end
+
   def future_and_undated_orders
     return @future_and_undated_orders unless @future_and_undated_orders.nil?
     @future_and_undated_orders = orders.joins(:order_cycle).merge(OrderCycle.not_closed).readonly(false)
@@ -118,14 +119,6 @@ class StandingOrderForm
     standing_line_items.select(&:new_record?)
   end
 
-  def updateable_line_items(sli)
-    line_items_from_future_and_undated_orders(sli.variant_id).where(quantity: sli.quantity_was)
-  end
-
-  def line_items_from_future_and_undated_orders(variant_id)
-    Spree::LineItem.where(order_id: future_and_undated_orders, variant_id: variant_id)
-  end
-
   def validate_price_estimates
     item_attributes = params[:standing_line_items_attributes]
     return unless item_attributes.present?