editoast: resolve rebase issues

Author: hamz2a

editoast/src/generated_data/mod.rs

@@ -172,6 +172,7 @@ pub mod tests {
     use crate::modelsv2::DbConnectionPoolV2;
 
     #[rstest] // Slow test
+    #[serial_test::serial]
     async fn refresh_all_test() {
         let db_pool = DbConnectionPoolV2::for_tests();
         let infra = create_empty_infra(db_pool.get_ok().deref_mut()).await;

editoast/src/main.rs

@@ -592,7 +592,9 @@ async fn clone_infra(
     let new_name = infra_args
         .new_name
         .unwrap_or_else(|| format!("{} (clone)", infra.name));
-    let cloned_infra = infra.clone(conn, new_name).await?;
+    let cloned_infra = infra
+        .clone(db_pool.get().await?.deref_mut(), new_name)
+        .await?;
     println!(
         "✅ Infra {} (ID: {}) was successfully cloned",
         cloned_infra.name.bold(),

editoast/src/modelsv2/infra.rs

@@ -7,7 +7,6 @@ mod splited_track_section_with_data;
 mod voltage;
 
 use std::ops::DerefMut;
-use std::pin::Pin;
 
 use chrono::NaiveDateTime;
 use chrono::Utc;
@@ -17,6 +16,7 @@ use diesel::sql_query;
 use diesel::sql_types::BigInt;
 use diesel::ExpressionMethods;
 use diesel::QueryDsl;
+use diesel_async::AsyncConnection;
 use diesel_async::RunQueryDsl;
 use editoast_derive::ModelV2;
 use serde::Deserialize;
@@ -144,8 +144,8 @@ impl Infra {
         self.save(conn).await
     }
 
-    pub async fn clone(&self, conn: &mut DbConnection, new_name: String) -> Result<Infra> {
-        conn.build_transaction().run(|conn| Box::pin(async {
+    pub async fn clone(&self, connection: &mut DbConnection, new_name: String) -> Result<Infra> {
+        connection.transaction(|conn| { Box::pin(async {
             // Duplicate infra shell
             let cloned_infra = <Self as Clone>::clone(self)
                 .into_changeset()
@@ -229,7 +229,8 @@ impl Infra {
             }
 
             Ok(cloned_infra)
-        })).await
+            })}
+        ).await
     }
 
     /// Refreshes generated data if not up to date and returns whether they were refreshed.
@@ -359,6 +360,7 @@ pub mod tests {
     }
 
     #[rstest]
+    #[serial_test::serial]
     async fn clone_infra_with_new_name_returns_new_cloned_infra() {
         // GIVEN
         let db_pool = DbConnectionPoolV2::for_tests();
@@ -367,7 +369,7 @@ pub mod tests {
 
         // WHEN
         let result = empty_infra
-            .clone(db_pool.into(), infra_new_name.clone())
+            .clone(db_pool.get_ok().deref_mut(), infra_new_name.clone())
             .await
             .expect("could not clone infra");
 

editoast/src/views/infra/mod.rs

@@ -341,7 +341,7 @@ async fn clone(
         }
     })
     .await?;
-    let cloned_infra = infra.clone(conn, name).await?;
+    let cloned_infra = infra.clone(db_pool.get().await?.deref_mut(), name).await?;
     Ok(Json(cloned_infra.id))
 }
 
@@ -658,6 +658,7 @@ pub mod tests {
     }
 
     #[rstest]
+    #[serial_test::serial]
     async fn infra_clone_empty() {
         let app = TestAppBuilder::default_app();
         let db_pool = app.db_pool();
@@ -682,6 +683,7 @@ pub mod tests {
     }
 
     #[rstest] // Slow test
+    #[serial_test::serial]
     async fn infra_clone() {
         let app = TestAppBuilder::default_app();
         let db_pool = app.db_pool();