From 9687e8867e4ce12f092666179e3e76f287e8fe33 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 2 Apr 2014 11:38:59 +1100
Subject: [PATCH] Fix order cycle failing to save after a failing submit to
 server

---
 .../admin/order_cycle.js.erb.coffee           | 17 ++++-
 .../unit/order_cycle_spec.js.coffee           | 65 +++++++++++++------
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycle.js.erb.coffee b/app/assets/javascripts/admin/order_cycle.js.erb.coffee
index 807f0184b7..5b018e6548 100644
--- a/app/assets/javascripts/admin/order_cycle.js.erb.coffee
+++ b/app/assets/javascripts/admin/order_cycle.js.erb.coffee
@@ -286,12 +286,27 @@ angular.module('order_cycle', ['ngResource'])
             console.log('Failed to update order cycle')
 
       dataForSubmit: ->
-        data = angular.extend({}, this.order_cycle)
+        data = this.deepCopy()
         data = this.removeInactiveExchanges(data)
         data = this.translateCoordinatorFees(data)
         data = this.translateExchangeFees(data)
         data
 
+      deepCopy: ->
+        data = angular.extend({}, this.order_cycle)
+
+        # Copy exchanges
+        data.incoming_exchanges = (angular.extend {}, exchange for exchange in this.order_cycle.incoming_exchanges) if this.order_cycle.incoming_exchanges?
+        data.outgoing_exchanges = (angular.extend {}, exchange for exchange in this.order_cycle.outgoing_exchanges) if this.order_cycle.outgoing_exchanges?
+
+        # Copy exchange fees
+        all_exchanges = (data.incoming_exchanges || []) + (data.outgoing_exchanges || [])
+        for exchange in all_exchanges
+          if exchange.enterprise_fees?
+            exchange.enterprise_fees = (angular.extend {}, fee for fee in exchange.enterprise_fees)
+
+        data
+
       removeInactiveExchanges: (order_cycle) ->
         order_cycle.incoming_exchanges =
           (exchange for exchange in order_cycle.incoming_exchanges when exchange.active)
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 5441d5c0b0..d6d0ac882b 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -770,35 +770,62 @@ describe 'OrderCycle services', ->
           ]
 
       it 'converts coordinator fees into a list of ids', ->
-        data =
+        order_cycle =
           coordinator_fees: [
             {id: 1}
             {id: 2}
             ]
 
-        data = OrderCycle.translateCoordinatorFees(data)
+        data = OrderCycle.translateCoordinatorFees(order_cycle)
 
         expect(data.coordinator_fees).toBeUndefined()
         expect(data.coordinator_fee_ids).toEqual [1, 2]
 
-      it 'converts exchange fees into a list of ids', ->
-        data =
-          incoming_exchanges: [
-            enterprise_fees: [
-              {id: 1}
-              {id: 2}
+      it "preserves original data when converting coordinator fees", ->
+       OrderCycle.order_cycle =
+          coordinator_fees: [
+            {id: 1}
+            {id: 2}
             ]
-          ]
-          outgoing_exchanges: [
-            enterprise_fees: [
-              {id: 3}
-              {id: 4}
+
+        data = OrderCycle.deepCopy()
+        data = OrderCycle.translateCoordinatorFees(data)
+
+        expect(OrderCycle.order_cycle.coordinator_fees).toEqual [{id: 1}, {id: 2}]
+        expect(OrderCycle.order_cycle.coordinator_fee_ids).toBeUndefined()
+
+      describe "converting exchange fees into a list of ids", ->
+        order_cycle = null
+        data = null
+
+        beforeEach ->
+          order_cycle =
+            incoming_exchanges: [
+              enterprise_fees: [
+                {id: 1}
+                {id: 2}
+              ]
             ]
-          ]
+            outgoing_exchanges: [
+              enterprise_fees: [
+                {id: 3}
+                {id: 4}
+              ]
+            ]
+          OrderCycle.order_cycle = order_cycle
 
-        data = OrderCycle.translateExchangeFees(data)
+          data = OrderCycle.deepCopy()
+          data = OrderCycle.translateExchangeFees(data)
 
-        expect(data.incoming_exchanges[0].enterprise_fees).toBeUndefined()
-        expect(data.outgoing_exchanges[0].enterprise_fees).toBeUndefined()
-        expect(data.incoming_exchanges[0].enterprise_fee_ids).toEqual [1, 2]
-        expect(data.outgoing_exchanges[0].enterprise_fee_ids).toEqual [3, 4]
+        it 'converts exchange fees into a list of ids', ->
+          expect(data.incoming_exchanges[0].enterprise_fees).toBeUndefined()
+          expect(data.outgoing_exchanges[0].enterprise_fees).toBeUndefined()
+          expect(data.incoming_exchanges[0].enterprise_fee_ids).toEqual [1, 2]
+          expect(data.outgoing_exchanges[0].enterprise_fee_ids).toEqual [3, 4]
+
+        it "preserves original data when converting exchange fees", ->
+          expect(order_cycle.incoming_exchanges[0].enterprise_fees).toEqual [{id: 1}, {id: 2}]
+          expect(order_cycle.outgoing_exchanges[0].enterprise_fees).toEqual [{id: 3}, {id: 4}]
+          expect(order_cycle.incoming_exchanges[0].enterprise_fee_ids).toBeUndefined()
+          expect(order_cycle.outgoing_exchanges[0].enterprise_fee_ids).toBeUndefined()
+  
\ No newline at end of file