editoast: include train name in requirement endpoint

Signed-off-by: Eloi Charpentier <[email protected]>

Author: eckter

editoast/core_client/src/conflict_detection.rs

@@ -37,6 +37,7 @@ pub struct TrainRequirements {
 #[schema(as = core::TrainRequirementsById)]
 pub struct TrainRequirementsById {
     pub train_id: String,
+    pub train_name: String,
     pub start_time: DateTime<Utc>,
     pub spacing_requirements: Vec<SpacingRequirement>,
     pub routing_requirements: Vec<RoutingRequirement>,

editoast/openapi.yaml

@@ -778,8 +778,10 @@ pub(in crate::views) async fn requirements(
     .into_iter()
     .map(|(sim, _)| Arc::unwrap_or_clone(sim));
     let start_times = trains.iter().map(|ts| ts.start_time());
+    let train_names = trains.iter().map(|ts| ts.train_name.clone());
     let results =
-        build_trains_requirements(train_ids.into_iter(), start_times, simulations).collect();
+        build_trains_requirements(train_ids.into_iter(), start_times, simulations, train_names)
+            .collect();
 
     Ok(Json(TrainRequirementsPage { results, stats }))
 }
@@ -788,25 +790,29 @@ fn build_trains_requirements(
     train_ids: impl Iterator<Item = TrainId>,
     start_times: impl Iterator<Item = DateTime<Utc>>,
     simulations: impl Iterator<Item = simulation::Response>,
+    train_names: impl Iterator<Item = String>,
 ) -> impl Iterator<Item = TrainRequirementsById> {
-    izip!(train_ids, start_times, simulations).filter_map(|(train_id, start_time, sim)| {
-        let CompleteReportTrain {
-            spacing_requirements,
-            routing_requirements,
-            ..
-        } = match sim {
-            simulation::Response::Success(SimulationResponseSuccess { final_output, .. }) => {
-                Some(final_output)
-            }
-            _ => None,
-        }?;
-        Some(TrainRequirementsById {
-            train_id: train_id.to_string(),
-            start_time,
-            spacing_requirements,
-            routing_requirements,
-        })
-    })
+    izip!(train_ids, start_times, simulations, train_names).filter_map(
+        |(train_id, start_time, sim, train_name)| {
+            let CompleteReportTrain {
+                spacing_requirements,
+                routing_requirements,
+                ..
+            } = match sim {
+                simulation::Response::Success(SimulationResponseSuccess {
+                    final_output, ..
+                }) => Some(final_output),
+                _ => None,
+            }?;
+            Some(TrainRequirementsById {
+                train_id: train_id.to_string(),
+                start_time,
+                spacing_requirements,
+                routing_requirements,
+                train_name,
+            })
+        },
+    )
 }
 
 #[derive(Serialize, ToSchema)]

editoast/src/views/timetable.rs

@@ -4942,6 +4942,7 @@ export type CoreTrainRequirementsById = {
   spacing_requirements: CoreSpacingRequirement[];
   start_time: string;
   train_id: string;
+  train_name: string;
 };
 export type CoreStepTimingData = {
   /** Time the train should arrive at this point */