editoast: use current timetable for conflicts

Author: Khoyo

editoast/src/core/conflicts.rs

@@ -10,6 +10,7 @@ use crate::models::SpacingRequirement;
 #[derive(Debug, Serialize)]
 pub struct ConflicDetectionRequest {
     pub trains_requirements: Vec<TrainRequirements>,
+    pub infra_id: i64,
 }
 
 #[derive(Debug, Serialize)]
@@ -40,6 +41,6 @@ impl AsCoreRequest<Json<ConflictDetectionResponse>> for ConflicDetectionRequest
     const URL_PATH: &'static str = "/detect_conflicts";
 
     fn infra_id(&self) -> Option<i64> {
-        None
+        Some(self.infra_id)
     }
 }

editoast/src/core/v2/conflict_detection.rs

@@ -19,6 +19,7 @@ editoast_common::schemas! {
 pub struct ConflictDetectionRequest {
     /// List of requirements for each train
     pub trains_requirements: HashMap<i64, TrainRequirements>,
+    pub infra_id: i64,
 }
 
 #[derive(Debug, Serialize)]
@@ -33,6 +34,7 @@ pub struct ConflictDetectionResponse {
     /// List of conflicts detected
     #[schema(inline)]
     pub conflicts: Vec<Conflict>,
+    pub infra_id: i64,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, ToSchema)]
@@ -62,6 +64,6 @@ impl AsCoreRequest<Json<ConflictDetectionResponse>> for ConflictDetectionRequest
     const URL_PATH: &'static str = "/v2/conflict_detection";
 
     fn infra_id(&self) -> Option<i64> {
-        None
+        Some(self.infra_id)
     }
 }

editoast/src/views/timetable.rs

@@ -145,10 +145,17 @@ async fn get_conflicts(
     timetable_id: Path<i64>,
     core_client: Data<CoreClient>,
 ) -> Result<Json<Vec<Conflict>>> {
+    let db_pool = db_pool.into_inner();
     let timetable_id = timetable_id.into_inner();
 
+    let timetable = Timetable::retrieve(db_pool.clone(), timetable_id)
+        .await?
+        .ok_or(TimetableError::NotFound { timetable_id })?;
+    let scenario = timetable.get_scenario(db_pool.clone()).await?;
+    let infra_id = scenario.infra_id.unwrap();
+
     let (schedules, simulations) =
-        get_simulated_schedules_from_timetable(timetable_id, db_pool.into_inner()).await?;
+        get_simulated_schedules_from_timetable(timetable_id, db_pool).await?;
 
     let mut id_to_name = HashMap::new();
     let mut trains_requirements = Vec::new();
@@ -194,6 +201,7 @@ async fn get_conflicts(
 
     let request = ConflicDetectionRequest {
         trains_requirements,
+        infra_id,
     };
     let response = request.fetch(&core_client).await?;
 

editoast/src/views/v2/timetable.rs

@@ -376,6 +376,7 @@ pub async fn conflicts(
     }
     let conflict_detection_request = ConflictDetectionRequest {
         trains_requirements,
+        infra_id,
     };
 
     // 3. Call core