editoast: move get_power_restrictions sql request from views to modelsv2

Author: hamz2a

editoast/src/modelsv2/rolling_stock_model.rs

@@ -1,5 +1,8 @@
+mod power_restriction;
+
 use std::collections::HashMap;
 
+use diesel::sql_query;
 use diesel::ExpressionMethods;
 use diesel::QueryDsl;
 use diesel::SelectableHelper;
@@ -13,6 +16,7 @@ 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 serde::Deserialize;
 use serde::Serialize;
 use std::sync::Arc;
@@ -24,11 +28,13 @@ 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;
 
 editoast_common::schemas! {
     RollingStockModel,
+    PowerRestriction,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, ModelV2, ToSchema)]
@@ -108,6 +114,15 @@ impl RollingStockModel {
             .map(|(key, _)| key.clone())
             .collect()
     }
+
+    pub async fn get_power_restrictions(conn: &mut DbConnection) -> Result<Vec<PowerRestriction>> {
+        let power_restrictions = sql_query(
+            "SELECT DISTINCT jsonb_object_keys(power_restrictions) AS power_restriction FROM rolling_stock",
+        )
+        .load::<PowerRestriction>(conn)
+        .await?;
+        Ok(power_restrictions)
+    }
 }
 
 impl RollingStockModelChangeset {

editoast/src/modelsv2/rolling_stock_model/power_restriction.rs

@@ -0,0 +1,14 @@
+use diesel::sql_types::Text;
+use serde::Deserialize;
+use serde::Serialize;
+use utoipa::ToSchema;
+
+editoast_common::schemas! {
+    PowerRestriction,
+}
+
+#[derive(QueryableByName, Debug, Clone, Serialize, Deserialize, ToSchema)]
+pub struct PowerRestriction {
+    #[diesel(sql_type = Text)]
+    pub power_restriction: String,
+}

editoast/src/views/rolling_stocks/mod.rs

@@ -76,7 +76,6 @@ editoast_common::schemas! {
     DeleteRollingStockQueryParams,
     RollingStockLockedUpdateForm,
     RollingStockLiveryCreateForm,
-    PowerRestriction,
     RollingStockError,
     RollingStockKey,
     TrainScheduleScenarioStudyProject,
@@ -194,12 +193,6 @@ async fn get_by_name(
     Ok(Json(rolling_stock_with_liveries))
 }
 
-#[derive(QueryableByName, Debug, Clone, Serialize, Deserialize, ToSchema)]
-struct PowerRestriction {
-    #[diesel(sql_type = SqlText)]
-    power_restriction: String,
-}
-
 /// Returns the set of power restrictions for all rolling_stocks modes.
 #[utoipa::path(tag = "rolling_stock",
     responses(
@@ -208,13 +201,8 @@ struct PowerRestriction {
 )]
 #[get("")]
 async fn get_power_restrictions(db_pool: Data<DbConnectionPool>) -> Result<Json<Vec<String>>> {
-    let mut conn = db_pool.get().await?;
-    let power_restrictions: Vec<PowerRestriction> = sql_query(
-        "SELECT DISTINCT jsonb_object_keys(power_restrictions) AS power_restriction
-        FROM rolling_stock",
-    )
-    .load(&mut conn)
-    .await?;
+    let conn = &mut db_pool.get().await?;
+    let power_restrictions = RollingStockModel::get_power_restrictions(conn).await?;
     Ok(Json(
         power_restrictions
             .into_iter()