From d83281ade8176ab9b410a2d5a081ff950c84dc67 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Sun, 22 Apr 2018 22:46:01 +0200
Subject: Use both JourneyPattern and Route checksum to manage VehicleJourney
 merges. Refs #6646

---
 app/models/merge.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
 
-- 
cgit v1.2.3