diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index 323f0a817..450cd98bd 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -289,8 +289,11 @@ class Merge < ApplicationModel referential_vehicle_journeys.each do |vehicle_journey| # find parent journey pattern by checksum # TODO add line_id for security + associated_route_checksum = referential_routes_checksums[vehicle_journey.route_id] associated_journey_pattern_checksum = referential_journey_patterns_checksums[vehicle_journey.journey_pattern_id] - existing_associated_journey_pattern = new.journey_patterns.find_by checksum: associated_journey_pattern_checksum + + existing_associated_route = new.routes.find_by checksum: associated_route_checksum + existing_associated_journey_pattern = existing_associated_route.journey_patterns.find_by checksum: associated_journey_pattern_checksum existing_vehicle_journey = new.vehicle_journeys.find_by journey_pattern_id: existing_associated_journey_pattern.id, checksum: vehicle_journey.checksum |