editoast: move OperationalPoint 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 operational_point;
 mod route;
 mod side;
 mod sign;
@@ -34,6 +35,10 @@ 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;

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

@@ -5,6 +5,10 @@ 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;
@@ -14,6 +18,7 @@ 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;
@@ -24,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/infra_cache/mod.rs

@@ -26,6 +26,7 @@ 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;
@@ -56,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)]
@@ -863,14 +863,14 @@ 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 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;

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/operation/create.rs

@@ -12,12 +12,12 @@ use serde_json::Value;
 use super::OperationError;
 use crate::error::Result;
 use crate::modelsv2::get_table;
-use crate::schema::OperationalPoint;
 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;
@@ -250,11 +250,11 @@ 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::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;

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::OperationalPoint;
     use editoast_schemas::infra::Route;
     use editoast_schemas::infra::Signal;
     use editoast_schemas::infra::SpeedSection;

editoast/src/modelsv2/infra_objects.rs

@@ -166,7 +166,7 @@ infra_model!(
     OperationalPointModel,
     infra_object_operational_point,
     infra_layer_operational_point,
-    schema::OperationalPoint
+    editoast_schemas::infra::OperationalPoint
 );
 
 infra_model!(

editoast/src/schema/mod.rs

@@ -1,5 +1,4 @@
 mod errors;
-pub mod operational_point;
 mod railjson;
 pub mod track_section;
 pub mod utils;
@@ -9,10 +8,6 @@ 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 track_section::TrackSection;

editoast/src/schema/railjson.rs

@@ -2,12 +2,12 @@ use derivative::Derivative;
 use serde::Deserialize;
 use serde::Serialize;
 
-use super::OperationalPoint;
 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;

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

@@ -338,8 +338,6 @@ 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::Slope;
     use crate::schema::TrackSection;
     use crate::views::pagination::PaginatedResponse;
@@ -349,6 +347,8 @@ 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;

editoast/src/views/pathfinding/mod.rs

@@ -53,10 +53,10 @@ use crate::modelsv2::Infra;
 use crate::modelsv2::OperationalPointModel;
 use crate::modelsv2::Retrieve as RetrieveV2;
 use crate::modelsv2::RollingStockModel;
-use crate::schema::OperationalPoint;
 use crate::schema::TrackSection;
 use crate::DbPool;
 use editoast_schemas::infra::ApplicableDirectionsTrackRange;
+use editoast_schemas::infra::OperationalPoint;
 
 crate::routes! {
     "/pathfinding" => {

editoast/src/views/timetable/import.rs

@@ -34,7 +34,6 @@ use crate::modelsv2::Infra;
 use crate::modelsv2::OperationalPointModel;
 use crate::modelsv2::RetrieveBatch;
 use crate::modelsv2::RollingStockModel;
-use crate::schema::OperationalPointPart;
 use crate::views::infra::call_core_infra_state;
 use crate::views::infra::InfraApiError;
 use crate::views::infra::InfraState;
@@ -43,6 +42,7 @@ use crate::views::timetable::Path;
 use crate::views::timetable::TimetableError;
 use crate::views::train_schedule::process_simulation_response;
 use crate::DbPool;
+use editoast_schemas::infra::OperationalPointPart;
 
 crate::routes! {
     post_timetable,

editoast/src/views/v2/path/pathfinding.rs

@@ -28,11 +28,11 @@ use crate::modelsv2::RollingStockModel;
 use crate::modelsv2::TrackSectionModel;
 use crate::redis_utils::RedisClient;
 use crate::redis_utils::RedisConnection;
-use crate::schema::operational_point::OperationalPoint;
 use crate::views::get_app_version;
 use crate::views::v2::path::PathfindingError;
 use crate::views::v2::path::TrackRange;
 use crate::DbPool;
+use editoast_schemas::infra::OperationalPoint;
 
 type TrackOffsetResult = std::result::Result<Vec<Vec<TrackOffset>>, PathfindingResult>;
 

editoast/src/views/v2/path/properties.rs

@@ -25,15 +25,15 @@ use utoipa::ToSchema;
 use super::CACHE_PATH_EXPIRATION;
 use crate::client::get_app_version;
 use crate::error::Result;
-use crate::schema::OperationalPointExtensions;
-use crate::schema::OperationalPointPart;
 use crate::views::v2::path::retrieve_infra_version;
 use crate::views::v2::path::TrackRange;
 use crate::DbPool;
 use crate::RedisClient;
 use crate::RedisConnection;
 use editoast_common::geometry::GeoJsonLineString;
 use editoast_common::Identifier;
+use editoast_schemas::infra::OperationalPointExtensions;
+use editoast_schemas::infra::OperationalPointPart;
 
 crate::routes! {
     "/v2/infra/{infra_id}/path_properties" => {post},