editoast: move infra items to editoast_schemas part 2

editoast/editoast_schemas/src/infra.rs

@@ -8,9 +8,12 @@ mod electrical_profiles;
 mod electrification;
 mod endpoint;
 mod neutral_section;
+mod operational_point;
+mod route;
 mod side;
 mod sign;
 mod signal;
+mod speed_section;
 mod switch;
 mod switch_type;
 mod track_endpoint;
@@ -32,12 +35,20 @@ pub use electrical_profiles::LevelValues;
 pub use electrification::Electrification;
 pub use endpoint::Endpoint;
 pub use neutral_section::NeutralSection;
+pub use operational_point::OperationalPoint;
+pub use operational_point::OperationalPointExtensions;
+pub use operational_point::OperationalPointIdentifierExtension;
+pub use operational_point::OperationalPointPart;
+pub use route::Route;
+pub use route::RoutePath;
 pub use side::Side;
 pub use sign::Sign;
 pub use signal::LogicalSignal;
 pub use signal::Signal;
 pub use signal::SignalExtensions;
 pub use signal::SignalSncfExtension;
+pub use speed_section::Speed;
+pub use speed_section::SpeedSection;
 pub use switch::Switch;
 pub use switch_type::builtin_node_types_list;
 pub use switch_type::Crossing;

editoast/src/schema/operational_point.rs → editoast/editoast_schemas/src/infra/operational_point.rs

@@ -1,14 +1,14 @@
 use derivative::Derivative;
-use editoast_schemas::infra::TrackOffset;
+use editoast_common::Identifier;
+use editoast_common::NonBlankString;
 use serde::Deserialize;
 use serde::Serialize;
 use utoipa::ToSchema;
 
-use super::OSRDIdentified;
-use super::ObjectType;
-use editoast_common::Identifier;
-use editoast_common::NonBlankString;
-use editoast_schemas::primitives::OSRDTyped;
+use super::TrackOffset;
+use crate::primitives::OSRDIdentified;
+use crate::primitives::OSRDTyped;
+use crate::primitives::ObjectType;
 
 #[derive(Debug, Derivative, Clone, Deserialize, Serialize, PartialEq, ToSchema)]
 #[serde(deny_unknown_fields)]

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/schema/speed_section.rs → editoast/editoast_schemas/src/infra/speed_section.rs

@@ -1,16 +1,16 @@
 use std::collections::HashMap;
 
 use derivative::Derivative;
+use editoast_common::Identifier;
+use editoast_common::NonBlankString;
 use serde::Deserialize;
 use serde::Serialize;
 
-use super::OSRDIdentified;
-use super::ObjectType;
-use editoast_common::Identifier;
-use editoast_common::NonBlankString;
-use editoast_schemas::infra::ApplicableDirectionsTrackRange;
-use editoast_schemas::infra::Sign;
-use editoast_schemas::primitives::OSRDTyped;
+use super::ApplicableDirectionsTrackRange;
+use super::Sign;
+use crate::primitives::OSRDIdentified;
+use crate::primitives::OSRDTyped;
+use crate::primitives::ObjectType;
 
 #[derive(Debug, Derivative, Clone, Serialize, PartialEq, Copy)]
 pub struct Speed(pub f64);

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/converters/utils.rs

@@ -5,13 +5,20 @@ use editoast_schemas::infra::Detector;
 use editoast_schemas::infra::Direction;
 use editoast_schemas::infra::Electrification;
 use editoast_schemas::infra::LogicalSignal;
+use editoast_schemas::infra::OperationalPoint;
+use editoast_schemas::infra::OperationalPointExtensions;
+use editoast_schemas::infra::OperationalPointIdentifierExtension;
+use editoast_schemas::infra::OperationalPointPart;
 use editoast_schemas::infra::Signal;
 use editoast_schemas::infra::SignalExtensions;
 use editoast_schemas::infra::SignalSncfExtension;
+use editoast_schemas::infra::Speed;
+use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;
 use std::collections::HashMap;
 use std::str::FromStr;
 
+use editoast_common::Identifier;
 use editoast_schemas::infra::Endpoint;
 use editoast_schemas::infra::Side;
 use editoast_schemas::infra::TrackEndpoint;
@@ -22,9 +29,6 @@ use osmpbfreader::Node;
 use tracing::error;
 use tracing::warn;
 
-use crate::schema::*;
-use editoast_common::Identifier;
-
 // Given an edge and a coordinate, returns the coordinates used to compute the angle
 // It uses the nearest OpenStreetMap node, and the other as the the rails might do a loop
 // that would result in a bad angle

editoast/src/generated_data/error/speed_sections.rs

@@ -150,7 +150,7 @@ mod tests {
     use crate::infra_cache::tests::create_small_infra_cache;
     use crate::infra_cache::tests::create_speed_section_cache;
     use crate::infra_cache::Graph;
-    use crate::schema::Speed;
+    use editoast_schemas::infra::Speed;
     use editoast_schemas::primitives::ObjectRef;
     use editoast_schemas::primitives::ObjectType;
 

editoast/src/infra_cache/mod.rs

@@ -26,8 +26,12 @@ use editoast_schemas::infra::DoubleSlipSwitch;
 use editoast_schemas::infra::Electrification;
 use editoast_schemas::infra::Endpoint;
 use editoast_schemas::infra::Link;
+use editoast_schemas::infra::OperationalPointPart;
 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;
 use editoast_schemas::infra::TrackEndpoint;
 use editoast_schemas::infra::Waypoint;
@@ -53,7 +57,6 @@ use crate::infra_cache::operation::RailjsonObject;
 use crate::map::BoundingBox;
 use crate::modelsv2::railjson::find_all_schemas;
 use crate::modelsv2::Infra;
-use crate::schema::*;
 
 /// Contains infra cached data used to generate layers and errors
 #[derive(Debug, Default, Clone)]
@@ -860,16 +863,16 @@ pub mod tests {
     use crate::infra_cache::SwitchCache;
     use crate::map::BoundingBox;
     use crate::modelsv2::infra::tests::test_infra_transaction;
-    use crate::schema::OperationalPoint;
-    use crate::schema::Route;
-    use crate::schema::SpeedSection;
     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::OperationalPoint;
+    use editoast_schemas::infra::Route;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::SwitchPortConnection;
     use editoast_schemas::infra::SwitchType;

editoast/src/infra_cache/object_cache/operational_point_cache.rs

@@ -8,8 +8,8 @@ use serde::Serialize;
 
 use crate::infra_cache::Cache;
 use crate::infra_cache::ObjectCache;
-use crate::schema::OperationalPoint;
-use crate::schema::OperationalPointPart;
+use editoast_schemas::infra::OperationalPoint;
+use editoast_schemas::infra::OperationalPointPart;
 
 #[derive(Debug, Clone, Derivative)]
 #[derivative(Hash, PartialEq)]

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/object_cache/speed_section_cache.rs

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

editoast/src/infra_cache/operation/create.rs

@@ -12,15 +12,15 @@ use serde_json::Value;
 use super::OperationError;
 use crate::error::Result;
 use crate::modelsv2::get_table;
-use crate::schema::OperationalPoint;
-use crate::schema::Route;
-use crate::schema::SpeedSection;
 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::OperationalPoint;
+use editoast_schemas::infra::Route;
 use editoast_schemas::infra::Signal;
+use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;
 use editoast_schemas::infra::SwitchType;
 use editoast_schemas::primitives::OSRDIdentified;
@@ -250,14 +250,14 @@ pub mod tests {
     use crate::infra_cache::operation::create::apply_create_operation;
     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::SpeedSection;
     use crate::schema::TrackSection;
     use editoast_schemas::infra::BufferStop;
     use editoast_schemas::infra::Detector;
     use editoast_schemas::infra::Electrification;
+    use editoast_schemas::infra::OperationalPoint;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::SwitchType;
 

editoast/src/modelsv2/infra.rs

@@ -250,7 +250,10 @@ pub mod tests {
     use editoast_schemas::infra::Detector;
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::NeutralSection;
+    use editoast_schemas::infra::OperationalPoint;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::SwitchType;
     use editoast_schemas::primitives::OSRDIdentified;

editoast/src/modelsv2/infra_objects.rs

@@ -166,10 +166,14 @@ infra_model!(
     OperationalPointModel,
     infra_object_operational_point,
     infra_layer_operational_point,
-    schema::OperationalPoint
+    editoast_schemas::infra::OperationalPoint
 );
 
-infra_model!(RouteModel, infra_object_route, schema::Route);
+infra_model!(
+    RouteModel,
+    infra_object_route,
+    editoast_schemas::infra::Route
+);
 
 infra_model!(
     SignalModel,
@@ -189,7 +193,7 @@ infra_model!(
     SpeedSectionModel,
     infra_object_speed_section,
     infra_layer_speed_section,
-    schema::SpeedSection
+    editoast_schemas::infra::SpeedSection
 );
 
 infra_model!(

editoast/src/schema/mod.rs

@@ -1,8 +1,5 @@
 mod errors;
-pub mod operational_point;
 mod railjson;
-mod route;
-mod speed_section;
 pub mod track_section;
 pub mod utils;
 pub mod v2;
@@ -11,16 +8,8 @@ use editoast_schemas::primitives::OSRDIdentified;
 use editoast_schemas::primitives::ObjectType;
 pub use errors::InfraError;
 pub use errors::InfraErrorType;
-pub use operational_point::OperationalPoint;
-pub use operational_point::OperationalPointExtensions;
-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 speed_section::Speed;
-pub use speed_section::SpeedSection;
 pub use track_section::TrackSection;
 
 cfg_if! {

editoast/src/schema/railjson.rs

@@ -2,15 +2,15 @@ use derivative::Derivative;
 use serde::Deserialize;
 use serde::Serialize;
 
-use super::OperationalPoint;
-use super::Route;
-use super::SpeedSection;
 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::OperationalPoint;
+use editoast_schemas::infra::Route;
 use editoast_schemas::infra::Signal;
+use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;
 use editoast_schemas::infra::SwitchType;
 

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

@@ -338,11 +338,7 @@ mod tests {
     use crate::infra_cache::operation::Operation;
     use crate::infra_cache::operation::RailjsonObject;
     use crate::infra_cache::InfraCacheEditoastError;
-    use crate::schema::OperationalPoint;
-    use crate::schema::OperationalPointPart;
-    use crate::schema::Route;
     use crate::schema::Slope;
-    use crate::schema::SpeedSection;
     use crate::schema::TrackSection;
     use crate::views::pagination::PaginatedResponse;
     use crate::views::tests::create_test_service;
@@ -351,7 +347,11 @@ mod tests {
     use editoast_schemas::infra::Detector;
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::Endpoint;
+    use editoast_schemas::infra::OperationalPoint;
+    use editoast_schemas::infra::OperationalPointPart;
+    use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::TrackEndpoint;
     use editoast_schemas::infra::Waypoint;

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/auto_fixes/speed_section.rs

@@ -16,7 +16,7 @@ use crate::infra_cache::operation::RailjsonObject;
 use crate::infra_cache::operation::UpdateOperation;
 use crate::schema::InfraError;
 use crate::schema::InfraErrorType;
-use crate::schema::SpeedSection;
+use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::primitives::OSRDIdentified as _;
 use editoast_schemas::primitives::OSRDObject as _;
 use editoast_schemas::primitives::ObjectRef;
@@ -95,10 +95,10 @@ mod tests {
     use crate::infra_cache::operation::Operation;
     use crate::infra_cache::ObjectCache;
     use crate::schema::InfraError;
-    use crate::schema::SpeedSection;
     use editoast_common::Identifier;
     use editoast_schemas::infra::ApplicableDirections;
     use editoast_schemas::infra::ApplicableDirectionsTrackRange;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::primitives::OSRDObject as _;
     use editoast_schemas::primitives::ObjectRef;
     use editoast_schemas::primitives::ObjectType;