editoast: move each function into the appropriate file

Author: hamz2a

editoast/src/modelsv2/rolling_stock_model.rs

@@ -3,8 +3,6 @@ pub mod train_schedule_scenario_study_project;
 
 use std::collections::HashMap;
 
-use diesel::sql_query;
-use diesel::sql_types::BigInt;
 use diesel::ExpressionMethods;
 use diesel::QueryDsl;
 use diesel::SelectableHelper;
@@ -31,7 +29,6 @@ use validator::ValidationErrors;
 use crate::error::Result;
 use crate::modelsv2::prelude::*;
 use crate::modelsv2::rolling_stock_livery::RollingStockLiveryMetadataModel;
-use crate::modelsv2::DbConnection;
 use crate::modelsv2::DbConnectionPool;
 use crate::views::rolling_stocks::RollingStockWithLiveries;
 
@@ -118,28 +115,6 @@ impl RollingStockModel {
             .map(|(key, _)| key.clone())
             .collect()
     }
-
-    pub async fn get_power_restrictions(conn: &mut DbConnection) -> Result<Vec<PowerRestriction>> {
-        let power_restrictions = sql_query(include_str!(
-            "rolling_stock_model/sql/get_power_restrictions.sql"
-        ))
-        .load::<PowerRestriction>(conn)
-        .await?;
-        Ok(power_restrictions)
-    }
-
-    pub async fn get_rolling_stock_usage(
-        &self,
-        conn: &mut DbConnection,
-    ) -> Result<Vec<TrainScheduleScenarioStudyProject>> {
-        let result = sql_query(include_str!(
-            "rolling_stock_model/sql/get_train_schedules_with_scenario.sql"
-        ))
-        .bind::<BigInt, _>(self.id)
-        .load::<TrainScheduleScenarioStudyProject>(conn)
-        .await?;
-        Ok(result)
-    }
 }
 
 impl RollingStockModelChangeset {

editoast/src/modelsv2/rolling_stock_model/power_restriction.rs

@@ -1,8 +1,14 @@
+use diesel::sql_query;
 use diesel::sql_types::Text;
+use diesel_async::RunQueryDsl;
 use serde::Deserialize;
 use serde::Serialize;
 use utoipa::ToSchema;
 
+use super::RollingStockModel;
+use crate::error::Result;
+use crate::modelsv2::DbConnection;
+
 editoast_common::schemas! {
     PowerRestriction,
 }
@@ -12,3 +18,12 @@ pub struct PowerRestriction {
     #[diesel(sql_type = Text)]
     pub power_restriction: String,
 }
+
+impl RollingStockModel {
+    pub async fn get_power_restrictions(conn: &mut DbConnection) -> Result<Vec<PowerRestriction>> {
+        let power_restrictions = sql_query(include_str!("sql/get_power_restrictions.sql"))
+            .load::<PowerRestriction>(conn)
+            .await?;
+        Ok(power_restrictions)
+    }
+}

editoast/src/modelsv2/rolling_stock_model/train_schedule_scenario_study_project.rs

@@ -1,9 +1,15 @@
+use diesel::sql_query;
 use diesel::sql_types::BigInt;
 use diesel::sql_types::Text;
+use diesel_async::RunQueryDsl;
 use serde::Deserialize;
 use serde::Serialize;
 use utoipa::ToSchema;
 
+use super::RollingStockModel;
+use crate::error::Result;
+use crate::modelsv2::DbConnection;
+
 editoast_common::schemas! {
     TrainScheduleScenarioStudyProject,
 }
@@ -27,3 +33,16 @@ pub struct TrainScheduleScenarioStudyProject {
     #[diesel(sql_type = Text)]
     pub scenario_name: String,
 }
+
+impl RollingStockModel {
+    pub async fn get_rolling_stock_usage(
+        &self,
+        conn: &mut DbConnection,
+    ) -> Result<Vec<TrainScheduleScenarioStudyProject>> {
+        let result = sql_query(include_str!("sql/get_train_schedules_with_scenario.sql"))
+            .bind::<BigInt, _>(self.id)
+            .load::<TrainScheduleScenarioStudyProject>(conn)
+            .await?;
+        Ok(result)
+    }
+}