editoast: move each function into the appropriate file

Author: hamz2a

editoast/src/modelsv2/rolling_stock_model.rs

@@ -1,10 +1,8 @@
-mod power_restriction;
-pub mod train_schedule_scenario_study_project;
+mod power_restrictions;
+mod rolling_stock_usage;
 
 use std::collections::HashMap;
 
-use diesel::sql_query;
-use diesel::sql_types::BigInt;
 use diesel::ExpressionMethods;
 use diesel::QueryDsl;
 use diesel::SelectableHelper;
@@ -18,11 +16,11 @@ use editoast_schemas::rolling_stock::RollingResistance;
 use editoast_schemas::rolling_stock::RollingStock;
 use editoast_schemas::rolling_stock::RollingStockMetadata;
 use editoast_schemas::rolling_stock::RollingStockSupportedSignalingSystems;
-use power_restriction::PowerRestriction;
+use power_restrictions::PowerRestriction;
+pub use rolling_stock_usage::TrainScheduleScenarioStudyProject;
 use serde::Deserialize;
 use serde::Serialize;
 use std::sync::Arc;
-use train_schedule_scenario_study_project::TrainScheduleScenarioStudyProject;
 use utoipa::ToSchema;
 use validator::Validate;
 use validator::ValidationError;
@@ -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

@@ -0,0 +1,29 @@
+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,
+}
+
+#[derive(QueryableByName, Debug, Clone, Serialize, Deserialize, ToSchema)]
+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/power_restrictions.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)
+    }
+}

editoast/src/modelsv2/rolling_stock_model/train_schedule_scenario_study_project.rs editoast/src/modelsv2/rolling_stock_model/rolling_stock_usage.rs

@@ -39,7 +39,7 @@ use crate::error::InternalError;
 use crate::error::Result;
 use crate::modelsv2::prelude::*;
 use crate::modelsv2::rolling_stock_livery::RollingStockLiveryModel;
-use crate::modelsv2::rolling_stock_model::train_schedule_scenario_study_project::TrainScheduleScenarioStudyProject;
+use crate::modelsv2::rolling_stock_model::TrainScheduleScenarioStudyProject;
 use crate::modelsv2::DbConnectionPool;
 use crate::modelsv2::Document;
 use crate::modelsv2::RollingStockModel;