editoast: move Route to editoast_schemas

Author: hamz2a

editoast/editoast_schemas/src/infra.rs

@@ -8,6 +8,7 @@ mod electrical_profiles;
 mod electrification;
 mod endpoint;
 mod neutral_section;
+mod route;
 mod side;
 mod sign;
 mod signal;
@@ -33,6 +34,8 @@ pub use electrical_profiles::LevelValues;
 pub use electrification::Electrification;
 pub use endpoint::Endpoint;
 pub use neutral_section::NeutralSection;
+pub use route::Route;
+pub use route::RoutePath;
 pub use side::Side;
 pub use sign::Sign;
 pub use signal::LogicalSignal;

editoast/src/schema/route.rs editoast/editoast_schemas/src/infra/route.rs

@@ -1,16 +1,16 @@
 use std::collections::HashMap;
 
 use derivative::Derivative;
+use editoast_common::Identifier;
 use serde::Deserialize;
 use serde::Serialize;
 
-use super::OSRDIdentified;
-use super::ObjectType;
-use editoast_common::Identifier;
-use editoast_schemas::infra::Direction;
-use editoast_schemas::infra::DirectionalTrackRange;
-use editoast_schemas::infra::Waypoint;
-use editoast_schemas::primitives::OSRDTyped;
+use super::Direction;
+use super::DirectionalTrackRange;
+use super::Waypoint;
+use crate::primitives::OSRDIdentified;
+use crate::primitives::OSRDTyped;
+use crate::primitives::ObjectType;
 
 #[derive(Debug, Derivative, Clone, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(deny_unknown_fields)]

editoast/src/converters/generate_routes.rs

@@ -11,6 +11,7 @@ use editoast_common::Identifier;
 use editoast_schemas::infra::builtin_node_types_list;
 use editoast_schemas::infra::Direction;
 use editoast_schemas::infra::Endpoint;
+use editoast_schemas::infra::Route;
 use editoast_schemas::infra::TrackEndpoint;
 use editoast_schemas::infra::Waypoint;
 use editoast_schemas::primitives::OSRDIdentified;

editoast/src/infra_cache/mod.rs

@@ -27,6 +27,8 @@ use editoast_schemas::infra::Electrification;
 use editoast_schemas::infra::Endpoint;
 use editoast_schemas::infra::Link;
 use editoast_schemas::infra::PointSwitch;
+use editoast_schemas::infra::Route;
+use editoast_schemas::infra::RoutePath;
 use editoast_schemas::infra::SingleSlipSwitch;
 use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::SwitchType;
@@ -862,14 +864,14 @@ pub mod tests {
     use crate::map::BoundingBox;
     use crate::modelsv2::infra::tests::test_infra_transaction;
     use crate::schema::OperationalPoint;
-    use crate::schema::Route;
     use editoast_common::Identifier;
     use editoast_common::NonBlankString;
     use editoast_schemas::infra::ApplicableDirections;
     use editoast_schemas::infra::ApplicableDirectionsTrackRange;
     use editoast_schemas::infra::Direction;
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::Endpoint;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::SwitchPortConnection;

editoast/src/infra_cache/object_cache/route_cache.rs

@@ -1,6 +1,6 @@
 use crate::infra_cache::Cache;
 use crate::infra_cache::ObjectCache;
-use crate::schema::Route;
+use editoast_schemas::infra::Route;
 
 impl Cache for Route {
     fn get_track_referenced_id(&self) -> Vec<&String> {

editoast/src/infra_cache/operation/create.rs

@@ -13,12 +13,12 @@ use super::OperationError;
 use crate::error::Result;
 use crate::modelsv2::get_table;
 use crate::schema::OperationalPoint;
-use crate::schema::Route;
 use crate::schema::TrackSection;
 use editoast_schemas::infra::BufferStop;
 use editoast_schemas::infra::Detector;
 use editoast_schemas::infra::Electrification;
 use editoast_schemas::infra::NeutralSection;
+use editoast_schemas::infra::Route;
 use editoast_schemas::infra::Signal;
 use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;
@@ -251,11 +251,11 @@ pub mod tests {
     use crate::infra_cache::operation::create::RailjsonObject;
     use crate::modelsv2::infra::tests::test_infra_transaction;
     use crate::schema::OperationalPoint;
-    use crate::schema::Route;
     use crate::schema::TrackSection;
     use editoast_schemas::infra::BufferStop;
     use editoast_schemas::infra::Detector;
     use editoast_schemas::infra::Electrification;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
     use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;

editoast/src/modelsv2/infra.rs

@@ -250,6 +250,7 @@ pub mod tests {
     use editoast_schemas::infra::Detector;
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::NeutralSection;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
     use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;

editoast/src/modelsv2/infra_objects.rs

@@ -169,7 +169,11 @@ infra_model!(
     schema::OperationalPoint
 );
 
-infra_model!(RouteModel, infra_object_route, schema::Route);
+infra_model!(
+    RouteModel,
+    infra_object_route,
+    editoast_schemas::infra::Route
+);
 
 infra_model!(
     SignalModel,

editoast/src/schema/mod.rs

@@ -1,7 +1,6 @@
 mod errors;
 pub mod operational_point;
 mod railjson;
-mod route;
 pub mod track_section;
 pub mod utils;
 pub mod v2;
@@ -16,8 +15,6 @@ pub use operational_point::OperationalPointIdentifierExtension;
 pub use operational_point::OperationalPointPart;
 pub use railjson::RailJson;
 pub use railjson::RAILJSON_VERSION;
-pub use route::Route;
-pub use route::RoutePath;
 pub use track_section::TrackSection;
 
 cfg_if! {

editoast/src/schema/railjson.rs

@@ -3,12 +3,12 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use super::OperationalPoint;
-use super::Route;
 use super::TrackSection;
 use editoast_schemas::infra::BufferStop;
 use editoast_schemas::infra::Detector;
 use editoast_schemas::infra::Electrification;
 use editoast_schemas::infra::NeutralSection;
+use editoast_schemas::infra::Route;
 use editoast_schemas::infra::Signal;
 use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;

editoast/src/views/infra/auto_fixes/mod.rs

@@ -340,7 +340,6 @@ mod tests {
     use crate::infra_cache::InfraCacheEditoastError;
     use crate::schema::OperationalPoint;
     use crate::schema::OperationalPointPart;
-    use crate::schema::Route;
     use crate::schema::Slope;
     use crate::schema::TrackSection;
     use crate::views::pagination::PaginatedResponse;
@@ -350,6 +349,7 @@ mod tests {
     use editoast_schemas::infra::Detector;
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::Endpoint;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
     use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;

editoast/src/views/infra/auto_fixes/route.rs

@@ -6,7 +6,7 @@ use super::new_ref_fix_delete_pair;
 use super::Fix;
 use crate::schema::InfraError;
 use crate::schema::InfraErrorType;
-use crate::schema::Route;
+use editoast_schemas::infra::Route;
 use editoast_schemas::primitives::OSRDIdentified as _;
 use editoast_schemas::primitives::OSRDObject as _;
 use editoast_schemas::primitives::ObjectRef;

editoast/src/views/infra/routes.rs

@@ -237,13 +237,13 @@ mod tests {
     use crate::fixtures::tests::empty_infra;
     use crate::fixtures::tests::small_infra;
     use crate::infra_cache::operation::Operation;
-    use crate::schema::Route;
     use crate::schema::TrackSection;
     use crate::views::infra::routes::RoutesResponse;
     use crate::views::infra::routes::WaypointType;
     use crate::views::tests::create_test_service;
     use editoast_schemas::infra::BufferStop;
     use editoast_schemas::infra::Detector;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Waypoint;
 
     #[rstest]