editoast: refactor simulations to use SimulationResponse without PathfindingResult

Signed-off-by: hamz2a <[email protected]>

Author: hamz2a

editoast/src/views/timetable/path_not_found_handler.rs

@@ -21,7 +21,7 @@ pub struct PathNotFoundHandler {
     pub infra_id: i64,
     pub infra_version: String,
     pub train_schedules: Vec<TrainSchedule>,
-    pub simulations: Vec<(SimulationResponse, PathfindingResult)>,
+    pub simulations: Vec<SimulationResponse>,
     pub work_schedules: Vec<WorkSchedule>,
     pub virtual_train_schedule: TrainSchedule,
     pub virtual_train_sim_result: SimulationResponse,
@@ -67,10 +67,7 @@ impl PathNotFoundHandler {
         // Combine the original simulations with the virtual train's simulation results.
         let simulations = [
             self.simulations.clone(),
-            vec![(
-                self.virtual_train_sim_result.clone(),
-                self.virtual_train_pathfinding_result.clone(),
-            )],
+            vec![self.virtual_train_sim_result.clone()],
         ]
         .concat();
 

editoast/src/views/timetable/stdcm.rs

@@ -198,15 +198,18 @@ async fn stdcm(
     let latest_simulation_end = stdcm_request.get_latest_simulation_end(simulation_run_time);
 
     // 3. Get scheduled train requirements
-    let simulations = train_simulation_batch(
+    let simulations: Vec<_> = train_simulation_batch(
         conn,
         valkey_client.clone(),
         core_client.clone(),
         &train_schedules,
         &infra,
         stdcm_request.electrical_profile_set_id,
     )
-    .await?;
+    .await?
+    .into_iter()
+    .map(|(sim, _)| sim)
+    .collect();
 
     let trains_requirements = build_train_requirements(
         train_schedules.clone(),
@@ -297,12 +300,12 @@ async fn stdcm(
 /// that overlap with the possible simulation times.
 pub fn build_train_requirements(
     train_schedules: Vec<TrainSchedule>,
-    simulation_responses: Vec<(SimulationResponse, PathfindingResult)>,
+    simulation_responses: Vec<SimulationResponse>,
     departure_time: DateTime<Utc>,
     latest_simulation_end: DateTime<Utc>,
 ) -> HashMap<i64, TrainRequirements> {
     let mut trains_requirements = HashMap::new();
-    for (train, (sim, _)) in train_schedules.iter().zip(simulation_responses) {
+    for (train, sim) in train_schedules.iter().zip(simulation_responses) {
         let final_output = match sim {
             SimulationResponse::Success { final_output, .. } => final_output,
             _ => continue,