fixup! editoast: add train_schedule object to search endpoint

Author: EthanPERRUZZA

editoast/openapi.yaml

@@ -9000,16 +9000,13 @@ components:
       - comfort
       - path
       - constraint_distribution
-      - speed_limit_tag
       - power_restrictions
       - options
       properties:
         comfort:
-          type: integer
-          format: int32
+          $ref: '#/components/schemas/Comfort'
         constraint_distribution:
-          type: integer
-          format: int32
+          $ref: '#/components/schemas/Distribution'
         id:
           type: integer
           format: int64
@@ -9021,38 +9018,34 @@ components:
           type: array
           items:
             type: string
+            nullable: true
         margins:
-          type: array
-          items:
-            type: string
+          $ref: '#/components/schemas/Margins'
         options:
-          type: array
-          items:
-            type: string
+          $ref: '#/components/schemas/TrainScheduleOptions'
         path:
           type: array
           items:
-            type: string
+            $ref: '#/components/schemas/PathItem'
         power_restrictions:
           type: array
           items:
-            type: string
+            $ref: '#/components/schemas/PowerRestrictionItem'
         rolling_stock_name:
           type: string
         schedule:
           type: array
           items:
-            type: string
+            $ref: '#/components/schemas/ScheduleItem'
         speed_limit_tag:
-          type: array
-          items:
-            type: string
+          type: string
+          nullable: true
         start_time:
           type: string
+          format: date-time
         timetable_id:
           type: integer
           format: int64
-          minimum: 0
         train_name:
           type: string
     Side:

editoast/src/views/search.rs

@@ -203,7 +203,9 @@ use axum::extract::Json;
 use axum::extract::Query;
 use axum::extract::State;
 use axum::Extension;
+use chrono::DateTime;
 use chrono::NaiveDateTime;
+use chrono::Utc;
 use diesel::pg::Pg;
 use diesel::sql_query;
 use diesel::sql_types::Jsonb;
@@ -215,6 +217,13 @@ use editoast_common::geometry::GeoJsonPoint;
 use editoast_derive::EditoastError;
 use editoast_derive::Search;
 use editoast_derive::SearchConfigStore;
+use editoast_schemas::train_schedule::Comfort;
+use editoast_schemas::train_schedule::Distribution;
+use editoast_schemas::train_schedule::Margins;
+use editoast_schemas::train_schedule::PathItem;
+use editoast_schemas::train_schedule::PowerRestrictionItem;
+use editoast_schemas::train_schedule::ScheduleItem;
+use editoast_schemas::train_schedule::TrainScheduleOptions;
 use editoast_search::query_into_sql;
 use editoast_search::SearchConfigStore as _;
 use editoast_search::SearchError;
@@ -344,9 +353,8 @@ async fn search(
     Json(SearchPayload { object, query, dry }): Json<SearchPayload>,
 ) -> Result<Json<serde_json::Value>> {
     let roles: HashSet<BuiltinRole> = match object.as_str() {
-        "track" | "operationalpoint" | "signal" | "trainschedule" => {
-            HashSet::from([BuiltinRole::InfraRead])
-        }
+        "track" | "operationalpoint" | "signal" => HashSet::from([BuiltinRole::InfraRead]),
+        "trainschedule" => HashSet::from([BuiltinRole::TimetableRead]),
         "project" | "study" | "scenario" => HashSet::from([BuiltinRole::OpsRead]),
         _ => {
             return Err(SearchApiError::ObjectType {
@@ -697,33 +705,33 @@ pub(super) struct SearchResultItemTrainSchedule {
     #[search(sql = "train_schedule.id")]
     id: u64,
     #[search(sql = "train_schedule.train_name")]
-    train_name: String, // useless puisqu'on en a besoin pour la request?
+    train_name: String,
     #[search(sql = "train_schedule.labels")]
-    labels: Vec<String>,
+    labels: Vec<Option<String>>,
     #[search(sql = "train_schedule.rolling_stock_name")]
     rolling_stock_name: String,
     #[search(sql = "train_schedule.timetable_id")]
-    timetable_id: u64, // useless puisqu'on en a besoin pour la request?
+    timetable_id: i64,
     #[search(sql = "train_schedule.start_time")]
-    start_time: String,
+    start_time: DateTime<Utc>,
     #[search(sql = "train_schedule.schedule")]
-    schedule: Vec<String>,
+    schedule: Vec<ScheduleItem>,
     #[search(sql = "train_schedule.margins")]
-    margins: Vec<String>,
+    margins: Margins,
     #[search(sql = "train_schedule.initial_speed")]
     initial_speed: f64,
     #[search(sql = "train_schedule.comfort")]
-    comfort: i16,
+    comfort: Comfort,
     #[search(sql = "train_schedule.path")]
-    path: Vec<String>,
+    path: Vec<PathItem>,
     #[search(sql = "train_schedule.constraint_distribution")]
-    constraint_distribution: i16,
+    constraint_distribution: Distribution,
     #[search(sql = "train_schedule.speed_limit_tag")]
-    speed_limit_tag: Vec<String>,
+    speed_limit_tag: Option<String>,
     #[search(sql = "train_schedule.power_restrictions")]
-    power_restrictions: Vec<String>,
+    power_restrictions: Vec<PowerRestrictionItem>,
     #[search(sql = "train_schedule.options")]
-    options: Vec<String>,
+    options: TrainScheduleOptions,
 }
 
 /// See [editoast_search::SearchConfigStore::find]