fixup! editoast: stdcm: add arrival time parameters

Author: eckter

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/stdcm/STDCMRequestV2.kt

@@ -60,9 +60,13 @@ class STDCMRequestV2(
 class STDCMPathItem(
     val locations: List<TrackLocation>,
     @Json(name = "stop_duration") val stopDuration: Duration?,
-    @Json(name = "arrival_time") val arrivalTime: ZonedDateTime?,
-    @Json(name = "arrival_time_tolerance_before") val arrivalTimeToleranceBefore: Duration?,
-    @Json(name = "arrival_time_tolerance_after") val arrivalTimeToleranceAfter: Duration?,
+    @Json(name = "step_timing_data") val stepTimingData: StepTimingData?,
+)
+
+data class StepTimingData(
+    @Json(name = "arrival_time") val arrivalTime: ZonedDateTime,
+    @Json(name = "arrival_time_tolerance_before") val arrivalTimeToleranceBefore: Duration,
+    @Json(name = "arrival_time_tolerance_after") val arrivalTimeToleranceAfter: Duration,
 )
 
 class TrackOffset(val track: String, val offset: Offset<TrackSection>)

editoast/openapi.yaml

@@ -5202,23 +5202,6 @@ components:
       type: object
     PathfindingItem:
       properties:
-        arrival_time:
-          description: Time at which the train should arrive at the location, if specified
-          format: date-time
-          nullable: true
-          type: string
-        arrival_time_tolerance_after:
-          description: The train may arrive up to this duration after the expected arrival time
-          format: int64
-          minimum: 0
-          nullable: true
-          type: integer
-        arrival_time_tolerance_before:
-          description: The train may arrive up to this duration before the expected arrival time
-          format: int64
-          minimum: 0
-          nullable: true
-          type: integer
         duration:
           description: The stop duration in milliseconds, None if the train does not stop.
           format: int64
@@ -5227,6 +5210,10 @@ components:
           type: integer
         location:
           $ref: '#/components/schemas/PathItemLocation'
+        timing_data:
+          allOf:
+          - $ref: '#/components/schemas/StepTimingData'
+          nullable: true
       required:
       - location
       type: object
@@ -6893,7 +6880,9 @@ components:
           type: string
         maximum_departure_delay:
           default: 432000
-          description: By how long we can shift the departure time in milliseconds
+          description: |-
+            By how long we can shift the departure time in milliseconds
+            Deprecated, first step data should be used instead
           format: int64
           minimum: 0
           type: integer
@@ -12451,7 +12440,9 @@ paths:
                   type: string
                 maximum_departure_delay:
                   default: 432000
-                  description: By how long we can shift the departure time in milliseconds
+                  description: |-
+                    By how long we can shift the departure time in milliseconds
+                    Deprecated, first step data should be used instead
                   format: int64
                   minimum: 0
                   type: integer

editoast/src/core/v2/stdcm.rs

@@ -64,12 +64,19 @@ pub struct STDCMPathItem {
     pub locations: Vec<TrackOffset>,
     /// Stop duration in milliseconds. None if the train does not stop at this path item.
     pub stop_duration: Option<u64>,
-    /// Time the train should arrive at this point, if specified
-    pub arrival_time: Option<DateTime<Utc>>,
+    /// If specified, describes when the train may arrive at the location
+    pub step_timing_data: Option<STDCMStepTimingData>,
+}
+
+/// Contains the data of a step timing, when it is specified
+#[derive(Debug, Serialize)]
+pub struct STDCMStepTimingData {
+    /// Time the train should arrive at this point
+    pub arrival_time: DateTime<Utc>,
     /// Tolerance for the arrival time, when it arrives before the expected time, in ms
-    pub arrival_time_tolerance_before: Option<u64>,
+    pub arrival_time_tolerance_before: u64,
     /// Tolerance for the arrival time, when it arrives after the expected time, in ms
-    pub arrival_time_tolerance_after: Option<u64>,
+    pub arrival_time_tolerance_after: u64,
 }
 
 /// Lighter description of a work schedule, only contains what's relevant

editoast/src/views/v2/timetable/stdcm.rs

@@ -19,10 +19,10 @@ use utoipa::IntoParams;
 use utoipa::ToSchema;
 
 use crate::core::v2::simulation::SimulationResponse;
-use crate::core::v2::stdcm::STDCMRequest;
 use crate::core::v2::stdcm::STDCMResponse;
 use crate::core::v2::stdcm::TrainRequirement;
 use crate::core::v2::stdcm::{STDCMPathItem, STDCMWorkSchedule, UndirectedTrackRange};
+use crate::core::v2::stdcm::{STDCMRequest, STDCMStepTimingData};
 use crate::core::AsCoreRequest;
 use crate::core::CoreClient;
 use crate::error::Result;
@@ -76,6 +76,7 @@ pub struct STDCMRequestPayload {
     rolling_stock_id: i64,
     comfort: Comfort,
     /// By how long we can shift the departure time in milliseconds
+    /// Deprecated, first step data should be used instead
     #[serde(default = "default_maximum_departure_delay")]
     #[schema(default = default_maximum_departure_delay)]
     maximum_departure_delay: u64,
@@ -108,11 +109,17 @@ struct PathfindingItem {
     /// The associated location
     location: PathItemLocation,
     /// Time at which the train should arrive at the location, if specified
-    arrival_time: Option<DateTime<Utc>>,
+    timing_data: Option<StepTimingData>,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, ToSchema)]
+struct StepTimingData {
+    /// Time at which the train should arrive at the location
+    arrival_time: DateTime<Utc>,
     /// The train may arrive up to this duration before the expected arrival time
-    arrival_time_tolerance_before: Option<u64>,
+    arrival_time_tolerance_before: u64,
     /// The train may arrive up to this duration after the expected arrival time
-    arrival_time_tolerance_after: Option<u64>,
+    arrival_time_tolerance_after: u64,
 }
 
 const TWO_HOURS_IN_MILLISECONDS: u64 = 2 * 60 * 60 * 60;
@@ -261,7 +268,8 @@ fn get_earliest_departure_time(data: &STDCMRequestPayload, maximum_run_time: u64
     data.start_time.unwrap_or(
         data.steps
             .first()
-            .and_then(|step| step.arrival_time)
+            .and_then(|step| step.timing_data.clone())
+            .and_then(|data| Option::from(data.arrival_time))
             .unwrap_or(
                 get_earliest_step_time(data) - Duration::milliseconds(maximum_run_time as i64),
             ),
@@ -271,13 +279,12 @@ fn get_earliest_departure_time(data: &STDCMRequestPayload, maximum_run_time: u64
 /// Returns the earliest time that has been set on any step
 fn get_earliest_step_time(data: &STDCMRequestPayload) -> DateTime<Utc> {
     // Get the earliest time that has been specified for any step
-    *data
-        .start_time
-        .as_ref()
+    data.start_time
         .or_else(|| {
             data.steps
                 .iter()
-                .flat_map(|step| step.arrival_time.iter())
+                .flat_map(|step| step.timing_data.iter())
+                .map(|data| data.arrival_time)
                 .next()
         })
         .expect("No time specified for stdcm request")
@@ -425,9 +432,13 @@ async fn parse_stdcm_steps(
         .map(|(track_offset, path_item)| STDCMPathItem {
             stop_duration: path_item.duration,
             locations: track_offset.to_vec(),
-            arrival_time: path_item.arrival_time,
-            arrival_time_tolerance_before: path_item.arrival_time_tolerance_before,
-            arrival_time_tolerance_after: path_item.arrival_time_tolerance_after,
+            step_timing_data: path_item.timing_data.as_ref().map(|timing_data| {
+                STDCMStepTimingData {
+                    arrival_time: timing_data.arrival_time,
+                    arrival_time_tolerance_before: timing_data.arrival_time_tolerance_before,
+                    arrival_time_tolerance_after: timing_data.arrival_time_tolerance_after,
+                }
+            }),
         })
         .collect())
 }