aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2018-03-13 18:08:16 +0100
committerLuc Donnet2018-03-23 17:16:43 +0100
commit96d01a90977de5d94ab3f5c31e043579c86b150a (patch)
tree527636aef35d5547f80549bffb2b0f2ab73e59ee
parent6714744eccee994c955fc7bdf080229bf89088e1 (diff)
downloadchouette-core-96d01a90977de5d94ab3f5c31e043579c86b150a.tar.bz2
RouteWayCostWorker: Switch to referential in order to find Route
Just running `Chouette::Route.find(id)` doesn't give us anything if we don't have a `Referential` selected. In order to properly get the correct route, pass the referential ID to the worker and switch to that referential before trying to select the route. Refs #6095
-rw-r--r--app/models/chouette/route.rb2
-rw-r--r--app/workers/route_way_cost_worker.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index f0fe06a58..01358e8aa 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -191,7 +191,7 @@ module Chouette
end
def calculate_costs!
- RouteWayCostWorker.perform_async(id)
+ RouteWayCostWorker.perform_async(referential.id, id)
end
protected
diff --git a/app/workers/route_way_cost_worker.rb b/app/workers/route_way_cost_worker.rb
index adb10957b..fa5bd737d 100644
--- a/app/workers/route_way_cost_worker.rb
+++ b/app/workers/route_way_cost_worker.rb
@@ -1,7 +1,8 @@
class RouteWayCostWorker
include Sidekiq::Worker
- def perform(route_id)
+ def perform(referential_id, route_id)
+ Referential.find(referential_id).switch
route = Chouette::Route.find(route_id)
RouteWayCostCalculator.new(route).calculate!
end