diff options
| author | Zog | 2018-02-02 17:54:07 +0100 |
|---|---|---|
| committer | Zog | 2018-02-02 17:54:07 +0100 |
| commit | 126879438a1109623a8445754e864c7082ba1649 (patch) | |
| tree | 5e1a30656af12115bb2797cd3df8f626052e0e81 /app | |
| parent | 3f9329dffaf4a760adb128824b673c221c8320b8 (diff) | |
| download | chouette-core-5417-checksum-relationships.tar.bz2 | |
Refs #5417; Fix specs5417-checksum-relationships
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/chouette/time_table.rb | 8 | ||||
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb index 7b69aefb6..15b22b671 100644 --- a/app/models/chouette/time_table.rb +++ b/app/models/chouette/time_table.rb @@ -42,8 +42,12 @@ module Chouette def checksum_attributes [].tap do |attrs| attrs << self.int_day_types - attrs << self.dates.map(&:checksum).map(&:to_s).sort - attrs << self.periods.map(&:checksum).map(&:to_s).sort + dates = self.dates + dates += TimeTableDate.where(time_table_id: self.id) + attrs << dates.map(&:checksum).map(&:to_s).sort + periods = self.periods + periods += TimeTablePeriod.where(time_table_id: self.id) + attrs << periods.map(&:checksum).map(&:to_s).sort end end diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index 1971061a2..4a6ba3f75 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -104,7 +104,9 @@ module Chouette attrs << self.published_journey_identifier attrs << self.try(:company).try(:get_objectid).try(:local_id) attrs << self.footnotes.map(&:checksum).sort - attrs << self.vehicle_journey_at_stops.sort_by { |s| s.stop_point&.position }.map(&:checksum).sort + vjas = self.vehicle_journey_at_stops + vjas += VehicleJourneyAtStop.where(vehicle_journey_id: self.id) + attrs << vjas.uniq.sort_by { |s| s.stop_point&.position }.map(&:checksum).sort end end |
