editoast: fix missing order by in paginated endpoints

Co-authored-by: Léo VALAIS <[email protected]>
Signed-off-by: Florian Amsallem <[email protected]>

Author: flomonster

editoast/src/models/round_trips.rs

@@ -38,7 +38,8 @@ impl TrainScheduleRoundTrips {
         let query = train_schedule_round_trips::table
             .inner_join(train_schedule::table)
             .select(train_schedule_round_trips::all_columns)
-            .filter(train_schedule::dsl::timetable_id.eq(timetable_id));
+            .filter(train_schedule::dsl::timetable_id.eq(timetable_id))
+            .order_by(train_schedule_round_trips::id.asc());
 
         let (results, count): (Vec<TrainScheduleRoundTripsRow>, _) =
             load_for_pagination(conn, query, page, page_size).await?;
@@ -109,7 +110,8 @@ impl PacedTrainRoundTrips {
         let query = paced_train_round_trips::table
             .inner_join(paced_train::table)
             .select(paced_train_round_trips::all_columns)
-            .filter(paced_train::dsl::timetable_id.eq(timetable_id));
+            .filter(paced_train::dsl::timetable_id.eq(timetable_id))
+            .order_by(paced_train_round_trips::id.asc());
 
         let (results, count): (Vec<PacedTrainRoundTripsRow>, _) =
             load_for_pagination(conn, query, page, page_size).await?;

editoast/src/views/infra/mod.rs

@@ -216,7 +216,8 @@ pub(in crate::views) async fn list(
         }
     };
 
-    let (infras, stats) = Infra::list_paginated(conn, settings).await?;
+    let (infras, stats) =
+        Infra::list_paginated(conn, settings.order_by(move || Infra::ID.asc())).await?;
 
     let response = InfraListResponse {
         stats,

editoast/src/views/scenario/macro_nodes.rs

@@ -171,7 +171,9 @@ pub(in crate::views) async fn list(
     let settings = pagination_params
         .into_selection_settings()
         .filter(move || MacroNode::SCENARIO_ID.eq(scenario_id));
-    let (result, stats) = MacroNode::list_paginated(&mut conn, settings).await?;
+    let (result, stats) =
+        MacroNode::list_paginated(&mut conn, settings.order_by(move || MacroNode::ID.asc()))
+            .await?;
 
     // Produce the response
     Ok(Json(MacroNodeListResponse {

editoast/src/views/sub_categories.rs

@@ -86,7 +86,9 @@ pub(in crate::views) async fn get_sub_categories(
 
     let (sub_categories, stats) = editoast_models::SubCategory::list_paginated(
         &mut conn,
-        pagination.into_selection_settings(),
+        pagination
+            .into_selection_settings()
+            .order_by(move || editoast_models::SubCategory::ID.asc()),
     )
     .await?;
 

editoast/src/views/timetable.rs

@@ -700,10 +700,12 @@ pub(in crate::views) async fn requirements(
         (
             page_settings
                 .into_selection_settings()
-                .filter(move || models::TrainSchedule::TIMETABLE_ID.eq(timetable_id)),
+                .filter(move || models::TrainSchedule::TIMETABLE_ID.eq(timetable_id))
+                .order_by(move || models::TrainSchedule::ID.asc()),
             page_settings
                 .into_selection_settings()
-                .filter(move || models::PacedTrain::TIMETABLE_ID.eq(timetable_id)),
+                .filter(move || models::PacedTrain::TIMETABLE_ID.eq(timetable_id))
+                .order_by(move || models::PacedTrain::ID.asc()),
         ),
     )
     .await?;