Allow subsequent detailed_solutions

cartoway · Sep 11, 2024 · cd06637 · cd06637
1 parent 0376e23
commit cd06637
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api/v01/vrp.rb b/api/v01/vrp.rb
@@ -235,7 +235,7 @@ class Vrp < APIBase
                   graph: result_object[:graph]
                 },
                 geojsons: OutputHelper::Result.generate_geometry(result_object)
-              }, with: VrpResult, detailed_solutions: job&.status&.to_sym == :completed || result_object.dig(:configuration, :intermediate_solutions))
+              }, with: VrpResult, detailed_solutions: job.nil? || job.status&.to_sym == :completed || result_object.dig(:configuration, :intermediate_solutions))
             end
             # set nil to release memory because puma keeps the grape api endpoint object alive
             stored_result = nil # rubocop:disable Lint/UselessAssignment

diff --git a/models/vrp.rb b/models/vrp.rb
@@ -309,7 +309,9 @@ def self.convert_position_relations(hash)
 
         r[:linked_service_ids]&.each{ |id|
           to_modify = hash[:services].find{ |s| s[:id] == id }
-          raise OptimizerWrapper::DiscordantProblemError.new(r[:type].to_s + error_msg) unless to_modify[:activity]
+          if to_modify.nil? || !to_modify.key?(:activity)
+            raise OptimizerWrapper::DiscordantProblemError.new(r[:type].to_s + error_msg)
+          end
 
           to_modify[:activity][:position] = type_conversion[r[:type]]
         }