editoast: define structs schemas! in editoast_schemas

Author: Wadjetz

editoast/Cargo.lock

@@ -8,6 +8,7 @@ license = "LGPL-3.0"
 members = [".", "editoast_common", "editoast_derive", "editoast_schemas"]
 
 [workspace.dependencies]
+editoast_common = { path = "./editoast_common" }
 rangemap = "1.5.1"
 serde = "1.0.197"
 serde_derive = "1.0.197"
@@ -39,7 +40,7 @@ diesel = { version = "2.1.5", features = [
 ] }
 diesel-async = { version = "0.4.1", features = ["deadpool", "postgres"] }
 diesel_json = "0.2.1"
-editoast_common = { path = "./editoast_common" }
+editoast_common = { workspace = true }
 editoast_derive = { path = "./editoast_derive" }
 editoast_schemas = { path = "./editoast_schemas" }
 enum-map = "2.7.3"

editoast/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 license = "LGPL-3.0"
 
 [dependencies]
+editoast_common.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true

editoast/editoast_schemas/Cargo.toml

@@ -17,3 +17,18 @@ pub use energy_source::EnergySource;
 pub use energy_source::EnergyStorage;
 pub use energy_source::RefillLaw;
 pub use energy_source::SpeedDependantPower;
+
+editoast_common::schemas! {
+    Gamma,
+    ConditionalEffortCurve,
+    EffortCurve,
+    EffortCurves,
+    EffortCurveConditions,
+    ModeEffortCurves,
+    RollingStockComfortType,
+    RollingResistance,
+    EnergySource,
+    EnergyStorage,
+    RefillLaw,
+    SpeedDependantPower,
+}

editoast/editoast_schemas/src/rolling_stock/mod.rs

@@ -4,18 +4,10 @@ pub mod rolling_stock_livery;
 use std::collections::HashMap;
 
 use derivative::Derivative;
-use editoast_schemas::rolling_stock::ConditionalEffortCurve;
-use editoast_schemas::rolling_stock::EffortCurve;
-use editoast_schemas::rolling_stock::EffortCurveConditions;
 use editoast_schemas::rolling_stock::EffortCurves;
 use editoast_schemas::rolling_stock::EnergySource;
-use editoast_schemas::rolling_stock::EnergyStorage;
 use editoast_schemas::rolling_stock::Gamma;
-use editoast_schemas::rolling_stock::ModeEffortCurves;
-use editoast_schemas::rolling_stock::RefillLaw;
 use editoast_schemas::rolling_stock::RollingResistance;
-use editoast_schemas::rolling_stock::RollingStockComfortType;
-use editoast_schemas::rolling_stock::SpeedDependantPower;
 use serde::Deserialize;
 use serde::Serialize;
 use utoipa::ToSchema;
@@ -26,23 +18,12 @@ use crate::schema::rolling_stock::rolling_stock_livery::RollingStockLiveryMetada
 use crate::schema::track_section::LoadingGaugeType;
 
 editoast_common::schemas! {
-    RollingStockComfortType,
     RollingStockCommon,
     RollingStockLivery,
     RollingStockLiveryMetadata,
     RollingStockWithLiveries,
-    RollingResistance,
     RollingStockMetadata,
-    Gamma,
-    EffortCurve,
-    EffortCurves,
-    EffortCurveConditions,
-    ConditionalEffortCurve,
-    ModeEffortCurves,
-    EnergySource,
-    SpeedDependantPower,
-    EnergyStorage,
-    RefillLaw,
+    editoast_schemas::rolling_stock::schemas(),
     light_rolling_stock::schemas(),
 }