editoast: add simulation summary and simulation endpoints for paced t…

…rain Signed-off-by: Youness CHRIFI ALAOUI <[email protected]>
OpenRailAssociation · Mar 6, 2025 · 956a5d7 · 956a5d7
1 parent 164c697
commit 956a5d7
Show file tree

Hide file tree

Showing 9 changed files with 363 additions and 102 deletions.
diff --git a/editoast/openapi.yaml b/editoast/openapi.yaml
@@ -5140,9 +5140,10 @@ components:
       - $ref: '#/components/schemas/EditoastOperationErrorInvalidPatch'
       - $ref: '#/components/schemas/EditoastOperationErrorModifyId'
       - $ref: '#/components/schemas/EditoastOperationErrorObjectNotFound'
-      - $ref: '#/components/schemas/EditoastPacedTrainErrorBatchPacedTrainNotFound'
+      - $ref: '#/components/schemas/EditoastPacedTrainErrorBatchNotFound'
       - $ref: '#/components/schemas/EditoastPacedTrainErrorDatabase'
-      - $ref: '#/components/schemas/EditoastPacedTrainErrorPacedTrainNotFound'
+      - $ref: '#/components/schemas/EditoastPacedTrainErrorInfraNotFound'
+      - $ref: '#/components/schemas/EditoastPacedTrainErrorNotFound'
       - $ref: '#/components/schemas/EditoastPaginationErrorInvalidPage'
       - $ref: '#/components/schemas/EditoastPaginationErrorInvalidPageSize'
       - $ref: '#/components/schemas/EditoastPathfindingErrorInfraNotFound'
@@ -5637,7 +5638,7 @@ components:
           type: string
           enum:
           - editoast:operation:ObjectNotFound
-    EditoastPacedTrainErrorBatchPacedTrainNotFound:
+    EditoastPacedTrainErrorBatchNotFound:
       type: object
       required:
       - type
@@ -5660,7 +5661,7 @@ components:
         type:
           type: string
           enum:
-          - editoast:paced_train:BatchPacedTrainNotFound
+          - editoast:paced_train:BatchNotFound
     EditoastPacedTrainErrorDatabase:
       type: object
       required:
@@ -5680,7 +5681,31 @@ components:
           type: string
           enum:
           - editoast:paced_train:Database
-    EditoastPacedTrainErrorPacedTrainNotFound:
+    EditoastPacedTrainErrorInfraNotFound:
+      type: object
+      required:
+      - type
+      - status
+      - message
+      properties:
+        context:
+          type: object
+          required:
+          - infra_id
+          properties:
+            infra_id:
+              type: integer
+        message:
+          type: string
+        status:
+          type: integer
+          enum:
+          - 404
+        type:
+          type: string
+          enum:
+          - editoast:paced_train:InfraNotFound
+    EditoastPacedTrainErrorNotFound:
       type: object
       required:
       - type
@@ -5703,7 +5728,7 @@ components:
         type:
           type: string
           enum:
-          - editoast:paced_train:PacedTrainNotFound
+          - editoast:paced_train:NotFound
     EditoastPaginationErrorInvalidPage:
       type: object
       required:
@@ -8570,7 +8595,7 @@ components:
           timetable_id:
             type: integer
             format: int64
-            description: Timetable attached to the train schedule
+            description: Timetable attached to the paced train
             nullable: true
     PacedTrainResult:
       allOf:

diff --git a/editoast/src/models/paced_train.rs b/editoast/src/models/paced_train.rs
@@ -1,3 +1,4 @@
+use crate::models::train_schedule::TrainSchedule;
 use chrono::DateTime;
 use chrono::Duration as ChronoDuration;
 use chrono::Utc;
@@ -50,6 +51,28 @@ pub struct PacedTrain {
     pub step: ChronoDuration,
 }
 
+impl PacedTrain {
+    pub fn into_first_occurrence(self) -> TrainSchedule {
+        TrainSchedule {
+            id: self.id,
+            train_name: self.train_name,
+            labels: self.labels.into(),
+            rolling_stock_name: self.rolling_stock_name,
+            timetable_id: self.timetable_id,
+            path: self.path,
+            start_time: self.start_time,
+            schedule: self.schedule,
+            margins: self.margins,
+            initial_speed: self.initial_speed,
+            comfort: self.comfort,
+            constraint_distribution: self.constraint_distribution,
+            speed_limit_tag: self.speed_limit_tag,
+            power_restrictions: self.power_restrictions,
+            options: self.options,
+        }
+    }
+}
+
 impl From<PacedTrainBase> for PacedTrainChangeset {
     fn from(
         PacedTrainBase {

diff --git a/editoast/src/views/mod.rs b/editoast/src/views/mod.rs
@@ -170,9 +170,9 @@ pub struct InfraIdQueryParam {
     infra_id: i64,
 }
 
-#[derive(Debug, Serialize, ToSchema)]
+#[derive(Debug, PartialEq, Serialize, Deserialize, ToSchema)]
 #[serde(tag = "status", rename_all = "snake_case")]
-enum SimulationSummaryResult {
+pub enum SimulationSummaryResult {
     /// Minimal information on a simulation's result
     Success {
         /// Length of a path in mm