editoast: move SpeedSection to editoast_schemas

Author: hamz2a

editoast/editoast_schemas/src/infra.rs

@@ -11,6 +11,7 @@ mod neutral_section;
 mod side;
 mod sign;
 mod signal;
+mod speed_section;
 mod switch;
 mod switch_type;
 mod track_endpoint;
@@ -38,6 +39,8 @@ 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/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/utils.rs

@@ -8,6 +8,8 @@ use editoast_schemas::infra::LogicalSignal;
 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;

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

@@ -28,6 +28,7 @@ use editoast_schemas::infra::Endpoint;
 use editoast_schemas::infra::Link;
 use editoast_schemas::infra::PointSwitch;
 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;
@@ -862,14 +863,14 @@ pub mod tests {
     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::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::SwitchPortConnection;
     use editoast_schemas::infra::SwitchType;

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

@@ -14,13 +14,13 @@ 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::Signal;
+use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;
 use editoast_schemas::infra::SwitchType;
 use editoast_schemas::primitives::OSRDIdentified;
@@ -252,12 +252,12 @@ pub mod tests {
     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::Signal;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::Switch;
     use editoast_schemas::infra::SwitchType;
 

editoast/src/modelsv2/infra.rs

@@ -251,6 +251,7 @@ pub mod tests {
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::NeutralSection;
     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

@@ -189,7 +189,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

@@ -2,7 +2,6 @@ mod errors;
 pub mod operational_point;
 mod railjson;
 mod route;
-mod speed_section;
 pub mod track_section;
 pub mod utils;
 pub mod v2;
@@ -19,8 +18,6 @@ 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

@@ -4,13 +4,13 @@ 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::Signal;
+use editoast_schemas::infra::SpeedSection;
 use editoast_schemas::infra::Switch;
 use editoast_schemas::infra::SwitchType;
 

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

@@ -342,7 +342,6 @@ mod tests {
     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;
@@ -352,6 +351,7 @@ mod tests {
     use editoast_schemas::infra::Electrification;
     use editoast_schemas::infra::Endpoint;
     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/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;

editoast/src/views/infra/mod.rs

@@ -571,11 +571,11 @@ pub mod tests {
     use crate::modelsv2::get_geometry_layer_table;
     use crate::modelsv2::get_table;
     use crate::modelsv2::infra::DEFAULT_INFRA_VERSION;
-    use crate::schema::SpeedSection;
     use crate::schema::RAILJSON_VERSION;
     use crate::views::tests::create_test_service;
     use crate::views::tests::create_test_service_with_core_client;
     use editoast_schemas::infra::Electrification;
+    use editoast_schemas::infra::SpeedSection;
     use editoast_schemas::infra::SwitchType;
     use editoast_schemas::primitives::ObjectType;