editoast: move waypoint to editoast_schemas

Author: hamz2a

editoast/editoast_schemas/src/infra.rs

@@ -1,9 +1,10 @@
 mod direction;
 mod track_offset;
+mod waypoint;
 
 pub use direction::Direction;
-
 pub use track_offset::TrackOffset;
+pub use waypoint::Waypoint;
 
 editoast_common::schemas! {
     track_offset::schemas(),

editoast/editoast_schemas/src/infra/waypoint.rs

@@ -0,0 +1,66 @@
+use editoast_common::Identifier;
+use serde::Deserialize;
+use serde::Serialize;
+
+use crate::primitives::OSRDIdentified;
+use crate::primitives::OSRDObject;
+use crate::primitives::ObjectType;
+
+#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq, Hash)]
+#[serde(tag = "type", deny_unknown_fields)]
+pub enum Waypoint {
+    BufferStop { id: Identifier },
+    Detector { id: Identifier },
+}
+
+impl Waypoint {
+    /// Create a new detector stop waypoint
+    pub fn new_detector<T: AsRef<str>>(detector: T) -> Self {
+        Self::Detector {
+            id: detector.as_ref().into(),
+        }
+    }
+
+    /// Create a new buffer stop waypoint
+    pub fn new_buffer_stop<T: AsRef<str>>(bf: T) -> Self {
+        Self::BufferStop {
+            id: bf.as_ref().into(),
+        }
+    }
+
+    /// Return whether the waypoint is a detector
+    pub fn is_detector(&self) -> bool {
+        matches!(self, Waypoint::Detector { .. })
+    }
+
+    // Return whether the waypoint is a buffer stop
+    pub fn is_buffer_stop(&self) -> bool {
+        matches!(self, Waypoint::BufferStop { .. })
+    }
+}
+
+impl Default for Waypoint {
+    fn default() -> Self {
+        Self::Detector {
+            id: "InvalidRef".into(),
+        }
+    }
+}
+
+impl OSRDIdentified for Waypoint {
+    fn get_id(&self) -> &String {
+        match self {
+            Waypoint::BufferStop { id } => id,
+            Waypoint::Detector { id } => id,
+        }
+    }
+}
+
+impl OSRDObject for Waypoint {
+    fn get_type(&self) -> ObjectType {
+        match self {
+            Waypoint::BufferStop { .. } => ObjectType::BufferStop,
+            Waypoint::Detector { .. } => ObjectType::Detector,
+        }
+    }
+}

editoast/src/converters/generate_routes.rs

@@ -9,6 +9,7 @@ use std::collections::HashMap;
 use crate::schema::*;
 use editoast_common::Identifier;
 use editoast_schemas::infra::Direction;
+use editoast_schemas::infra::Waypoint;
 use editoast_schemas::primitives::OSRDIdentified;
 
 /* Part 1: type definitions */

editoast/src/generated_data/error/routes.rs

@@ -7,7 +7,7 @@ use crate::infra_cache::Graph;
 use crate::infra_cache::InfraCache;
 use crate::infra_cache::ObjectCache;
 use crate::schema::InfraError;
-use crate::schema::Waypoint;
+use editoast_schemas::infra::Waypoint;
 use editoast_schemas::primitives::OSRDIdentified;
 use editoast_schemas::primitives::OSRDObject;
 use editoast_schemas::primitives::ObjectRef;
@@ -224,8 +224,8 @@ mod tests {
     use crate::infra_cache::tests::create_route_cache;
     use crate::infra_cache::tests::create_small_infra_cache;
     use crate::infra_cache::Graph;
-    use crate::schema::Waypoint;
     use editoast_schemas::infra::Direction;
+    use editoast_schemas::infra::Waypoint;
     use editoast_schemas::primitives::OSRDObject;
     use editoast_schemas::primitives::ObjectRef;
     use editoast_schemas::primitives::ObjectType;

editoast/src/infra_cache/mod.rs

@@ -728,6 +728,7 @@ pub mod tests {
     use actix_web::test as actix_test;
     use chashmap::CHashMap;
     use diesel_async::scoped_futures::ScopedFutureExt;
+    use editoast_schemas::infra::Waypoint;
 
     use super::BufferStopCache;
     use super::DetectorCache;
@@ -760,7 +761,6 @@ pub mod tests {
     use crate::schema::SwitchPortConnection;
     use crate::schema::SwitchType;
     use crate::schema::TrackEndpoint;
-    use crate::schema::Waypoint;
     use editoast_common::Identifier;
     use editoast_common::NonBlankString;
     use editoast_schemas::infra::Direction;
@@ -1288,9 +1288,9 @@ pub mod tests {
         use crate::infra_cache::InfraCache;
         use crate::infra_cache::InfraCacheEditoastError;
         use crate::schema::TrackEndpoint;
-        use crate::schema::Waypoint::BufferStop;
         use editoast_common::Identifier;
         use editoast_schemas::infra::Direction::StartToStop;
+        use editoast_schemas::infra::Waypoint::BufferStop;
         use editoast_schemas::primitives::ObjectType;
 
         #[test]

editoast/src/schema/mod.rs

@@ -21,7 +21,6 @@ pub use detector::Detector;
 pub use detector::DetectorCache;
 use editoast_schemas::infra::Direction;
 use editoast_schemas::primitives::OSRDIdentified;
-use editoast_schemas::primitives::OSRDObject;
 use editoast_schemas::primitives::ObjectType;
 pub use electrification::Electrification;
 pub use errors::InfraError;
@@ -80,65 +79,6 @@ editoast_common::schemas! {
     operation::schemas(),
 }
 
-#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq, Hash)]
-#[serde(tag = "type", deny_unknown_fields)]
-pub enum Waypoint {
-    BufferStop { id: Identifier },
-    Detector { id: Identifier },
-}
-
-impl Waypoint {
-    /// Create a new detector stop waypoint
-    pub fn new_detector<T: AsRef<str>>(detector: T) -> Self {
-        Self::Detector {
-            id: detector.as_ref().into(),
-        }
-    }
-
-    /// Create a new buffer stop waypoint
-    pub fn new_buffer_stop<T: AsRef<str>>(bf: T) -> Self {
-        Self::BufferStop {
-            id: bf.as_ref().into(),
-        }
-    }
-
-    /// Return whether the waypoint is a detector
-    pub fn is_detector(&self) -> bool {
-        matches!(self, Waypoint::Detector { .. })
-    }
-
-    // Return whether the waypoint is a buffer stop
-    pub fn is_buffer_stop(&self) -> bool {
-        matches!(self, Waypoint::BufferStop { .. })
-    }
-}
-
-impl Default for Waypoint {
-    fn default() -> Self {
-        Self::Detector {
-            id: "InvalidRef".into(),
-        }
-    }
-}
-
-impl OSRDIdentified for Waypoint {
-    fn get_id(&self) -> &String {
-        match self {
-            Waypoint::BufferStop { id } => id,
-            Waypoint::Detector { id } => id,
-        }
-    }
-}
-
-impl OSRDObject for Waypoint {
-    fn get_type(&self) -> ObjectType {
-        match self {
-            Waypoint::BufferStop { .. } => ObjectType::BufferStop,
-            Waypoint::Detector { .. } => ObjectType::Detector,
-        }
-    }
-}
-
 #[derive(Debug, Derivative, Clone, Deserialize, Serialize, PartialEq, ToSchema)]
 #[serde(deny_unknown_fields)]
 #[derivative(Default)]

editoast/src/schema/route.rs

@@ -9,13 +9,13 @@ use super::Endpoint;
 use super::OSRDIdentified;
 use super::ObjectType;
 use super::TrackEndpoint;
-use super::Waypoint;
 use crate::infra_cache::Cache;
 use crate::infra_cache::Graph;
 use crate::infra_cache::InfraCache;
 use crate::infra_cache::ObjectCache;
 use editoast_common::Identifier;
 use editoast_schemas::infra::Direction;
+use editoast_schemas::infra::Waypoint;
 use editoast_schemas::primitives::OSRDTyped;
 
 #[derive(Debug, Derivative, Clone, Deserialize, Serialize, PartialEq, Eq)]

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

@@ -351,10 +351,10 @@ mod tests {
     use crate::schema::Switch;
     use crate::schema::TrackEndpoint;
     use crate::schema::TrackSection;
-    use crate::schema::Waypoint;
     use crate::views::pagination::PaginatedResponse;
     use crate::views::tests::create_test_service;
     use editoast_common::Identifier;
+    use editoast_schemas::infra::Waypoint;
     use editoast_schemas::primitives::ObjectRef;
     use editoast_schemas::primitives::ObjectType;
 

editoast/src/views/infra/routes.rs

@@ -241,10 +241,10 @@ mod tests {
     use crate::schema::Detector;
     use crate::schema::Route;
     use crate::schema::TrackSection;
-    use crate::schema::Waypoint;
     use crate::views::infra::routes::RoutesResponse;
     use crate::views::infra::routes::WaypointType;
     use crate::views::tests::create_test_service;
+    use editoast_schemas::infra::Waypoint;
 
     #[rstest]
     async fn get_routes_nodes() {