Update vj time_tables association

refs #3121

2 files changed, 21 insertions, 2 deletions

diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 0fd2b6af6..27830490f 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -91,6 +91,14 @@ module Chouette
       (times.count == 1 && times[0] == '00:00') ? false : true
     end
 
+    def update_time_tables_from_state item
+      item['time_tables'].each do |tt|
+        unless self.time_tables.map(&:id).include?(tt['id'])
+          self.time_tables << Chouette::TimeTable.find(tt['id'])
+        end
+      end
+    end
+
     def self.state_update route, state
       transaction do
         state.each do |item|
@@ -103,6 +111,7 @@ module Chouette
           end
 
           vj.update_attributes(state_permited_attributes(item))
+          vj.update_time_tables_from_state(item)
           item['errors'] = vj.errors if vj.errors.any?
         end
 
diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb
index ac4d0b9ad..0208ac69b 100644
--- a/spec/models/chouette/vehicle_journey_spec.rb
+++ b/spec/models/chouette/vehicle_journey_spec.rb
@@ -20,6 +20,7 @@ describe Chouette::VehicleJourney, :type => :model do
     def vehicle_journey_to_state vj
       vj.attributes.slice('objectid', 'published_journey_name', 'journey_pattern_id', 'company_id').tap do |item|
         item['vehicle_journey_at_stops'] = []
+        item['time_tables'] = []
 
         vj.vehicle_journey_at_stops.each do |vjas|
           item['vehicle_journey_at_stops'] << vehicle_journey_at_stop_to_state(vjas)
@@ -59,7 +60,7 @@ describe Chouette::VehicleJourney, :type => :model do
       }.to change {Chouette::VehicleJourneyAtStop.count}.by(1)
     end
 
-    it 'should note save vehicle_journey_at_stops of newly created vj if all departure time is set to 00:00' do
+    it 'should not save vehicle_journey_at_stops of newly created vj if all departure time is set to 00:00' do
       new_vj = build(:vehicle_journey, objectid: nil, published_journey_name: 'dummy', route: route, journey_pattern: journey_pattern)
       2.times do
         new_vj.vehicle_journey_at_stops << build(:vehicle_journey_at_stop,
@@ -74,7 +75,7 @@ describe Chouette::VehicleJourney, :type => :model do
       }.not_to change {Chouette::VehicleJourneyAtStop.count}
     end
 
-    it 'should update vj journey_pattern' do
+    it 'should update vj journey_pattern association' do
       state['journey_pattern'] = create(:journey_pattern).attributes.slice('id', 'name', 'objectid')
       Chouette::VehicleJourney.state_update(route, collection)
 
@@ -82,6 +83,15 @@ describe Chouette::VehicleJourney, :type => :model do
       expect(vehicle_journey.reload.journey_pattern_id).to eq state['journey_pattern']['id']
     end
 
+    it 'should update vj time_tables association' do
+      state['time_tables'] = []
+      2.times{state['time_tables'] << create(:time_table).attributes.slice('id', 'comment', 'objectid')}
+      Chouette::VehicleJourney.state_update(route, collection)
+
+      expect(state['errors']).to be_nil
+      expect(vehicle_journey.reload.time_tables.map(&:id)).to eq(state['time_tables'].map{|tt| tt['id']})
+    end
+
     it 'should update vj company' do
       state['company'] = create(:company).attributes.slice('id', 'name', 'objectid')
       Chouette::VehicleJourney.state_update(route, collection)