editoast: move schema/operation to editoast::infra_cache

editoast/src/generated_data/buffer_stop.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_buffer_stop::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for BufferStopLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::BufferStop);

editoast/src/generated_data/detector.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_detector::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for DetectorLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::Detector);

editoast/src/generated_data/electrification.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_electrification::dsl;
@@ -39,8 +40,8 @@ impl GeneratedData for ElectrificationLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::Electrification);

editoast/src/generated_data/error/mod.rs

@@ -31,6 +31,7 @@ use tracing::warn;
 
 use super::GeneratedData;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::Graph;
 use crate::infra_cache::InfraCache;
 use crate::infra_cache::ObjectCache;
@@ -413,7 +414,7 @@ impl GeneratedData for ErrorLayer {
     async fn update(
         conn: &mut PgConnection,
         infra_id: i64,
-        _operations: &[crate::schema::operation::CacheOperation],
+        _operations: &[CacheOperation],
         infra_cache: &InfraCache,
     ) -> Result<()> {
         // Generate already act like an update

editoast/src/generated_data/mod.rs

@@ -35,8 +35,8 @@ use tracing::debug;
 use track_section::TrackSectionLayer;
 
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::schema::operation::CacheOperation;
 
 /// This trait define how a generated data table should be handled
 #[async_trait]

editoast/src/generated_data/neutral_section.rs

@@ -6,6 +6,7 @@ use diesel_async::RunQueryDsl;
 
 use super::GeneratedData;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 
 pub struct NeutralSectionLayer;
@@ -27,8 +28,8 @@ impl GeneratedData for NeutralSectionLayer {
     async fn update(
         _conn: &mut PgConnection,
         _infra: i64,
-        _operations: &[crate::schema::operation::CacheOperation],
-        _infra_cache: &crate::infra_cache::InfraCache,
+        _operations: &[CacheOperation],
+        _infra_cache: &InfraCache,
     ) -> Result<()> {
         // TODO: we don't manage the update of the neutral_section layer for the moment
         Ok(())

editoast/src/generated_data/neutral_sign.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_neutral_sign::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for NeutralSignLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::NeutralSection);

editoast/src/generated_data/operational_point.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_operational_point::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for OperationalPointLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::OperationalPoint);

editoast/src/generated_data/psl_sign.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_psl_sign::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for PSLSignLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::SpeedSection);

editoast/src/generated_data/signal.rs

@@ -16,6 +16,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::generated_data::sprite_config::SpriteConfig;
 use crate::generated_data::sprite_config::SpriteConfigs;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::LogicalSignal;
 use crate::schema::ObjectType;
@@ -108,8 +109,8 @@ impl GeneratedData for SignalLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         use diesel_async::RunQueryDsl;
 

editoast/src/generated_data/speed_section.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_speed_section::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for SpeedSectionLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::SpeedSection);

editoast/src/generated_data/switch.rs

@@ -9,6 +9,7 @@ use diesel_async::RunQueryDsl;
 use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 
@@ -31,8 +32,8 @@ impl GeneratedData for SwitchLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::Switch);

editoast/src/generated_data/track_section.rs

@@ -12,6 +12,7 @@ use super::utils::InvolvedObjects;
 use super::GeneratedData;
 use crate::diesel::ExpressionMethods;
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::schema::ObjectType;
 use crate::tables::infra_layer_track_section::dsl;
@@ -35,8 +36,8 @@ impl GeneratedData for TrackSectionLayer {
     async fn update(
         conn: &mut PgConnection,
         infra: i64,
-        operations: &[crate::schema::operation::CacheOperation],
-        infra_cache: &crate::infra_cache::InfraCache,
+        operations: &[CacheOperation],
+        infra_cache: &InfraCache,
     ) -> Result<()> {
         let involved_objects =
             InvolvedObjects::from_operations(operations, infra_cache, ObjectType::TrackSection);

editoast/src/generated_data/utils.rs

@@ -1,8 +1,8 @@
 use std::collections::HashSet;
 
+use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
 use crate::infra_cache::ObjectCache;
-use crate::schema::operation::CacheOperation;
 use crate::schema::OSRDIdentified;
 use crate::schema::OSRDObject;
 use crate::schema::ObjectType;
@@ -63,9 +63,9 @@ mod test {
     use std::collections::HashSet;
 
     use super::InvolvedObjects;
+    use crate::infra_cache::operation::CacheOperation;
     use crate::infra_cache::tests::create_small_infra_cache;
     use crate::infra_cache::ObjectCache;
-    use crate::schema::operation::CacheOperation;
     use crate::schema::DetectorCache;
     use crate::schema::ObjectRef;
     use crate::schema::ObjectType;

editoast/src/infra_cache/mod.rs

@@ -1,4 +1,5 @@
 mod graph;
+pub mod operation;
 
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
@@ -24,11 +25,11 @@ use itertools::Itertools as _;
 use thiserror::Error;
 
 use crate::error::Result;
+use crate::infra_cache::operation::CacheOperation;
+use crate::infra_cache::operation::RailjsonObject;
 use crate::map::BoundingBox;
 use crate::modelsv2::railjson::find_all_schemas;
 use crate::modelsv2::Infra;
-use crate::schema::operation::CacheOperation;
-use crate::schema::operation::RailjsonObject;
 use crate::schema::*;
 
 /// Contains infra cached data used to generate layers and errors
@@ -729,20 +730,20 @@ pub mod tests {
     use super::OperationalPointCache;
     use super::SignalCache;
     use super::TrackSectionCache;
+    use crate::infra_cache::operation::create::tests::create_buffer_stop;
+    use crate::infra_cache::operation::create::tests::create_detector;
+    use crate::infra_cache::operation::create::tests::create_electrification;
+    use crate::infra_cache::operation::create::tests::create_op;
+    use crate::infra_cache::operation::create::tests::create_route;
+    use crate::infra_cache::operation::create::tests::create_signal;
+    use crate::infra_cache::operation::create::tests::create_speed;
+    use crate::infra_cache::operation::create::tests::create_switch;
+    use crate::infra_cache::operation::create::tests::create_switch_type;
+    use crate::infra_cache::operation::create::tests::create_track;
     use crate::infra_cache::InfraCache;
     use crate::infra_cache::SwitchCache;
     use crate::map::BoundingBox;
     use crate::modelsv2::infra::tests::test_infra_transaction;
-    use crate::schema::operation::create::tests::create_buffer_stop;
-    use crate::schema::operation::create::tests::create_detector;
-    use crate::schema::operation::create::tests::create_electrification;
-    use crate::schema::operation::create::tests::create_op;
-    use crate::schema::operation::create::tests::create_route;
-    use crate::schema::operation::create::tests::create_signal;
-    use crate::schema::operation::create::tests::create_speed;
-    use crate::schema::operation::create::tests::create_switch;
-    use crate::schema::operation::create::tests::create_switch_type;
-    use crate::schema::operation::create::tests::create_track;
     use crate::schema::utils::Identifier;
     use crate::schema::utils::NonBlankString;
     use crate::schema::ApplicableDirections;

editoast/src/schema/operation/create.rs → editoast/src/infra_cache/operation/create.rs

@@ -247,9 +247,9 @@ pub mod tests {
     use diesel_async::scoped_futures::ScopedFutureExt;
     use diesel_async::AsyncPgConnection as PgConnection;
 
+    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::operation::create::apply_create_operation;
-    use crate::schema::operation::create::RailjsonObject;
     use crate::schema::BufferStop;
     use crate::schema::Detector;
     use crate::schema::Electrification;

editoast/src/schema/operation/delete.rs → editoast/src/infra_cache/operation/delete.rs

@@ -68,17 +68,17 @@ mod tests {
     use diesel_async::scoped_futures::ScopedFutureExt;
     use diesel_async::RunQueryDsl;
 
+    use crate::infra_cache::operation::create::tests::create_buffer_stop;
+    use crate::infra_cache::operation::create::tests::create_detector;
+    use crate::infra_cache::operation::create::tests::create_electrification;
+    use crate::infra_cache::operation::create::tests::create_op;
+    use crate::infra_cache::operation::create::tests::create_route;
+    use crate::infra_cache::operation::create::tests::create_signal;
+    use crate::infra_cache::operation::create::tests::create_speed;
+    use crate::infra_cache::operation::create::tests::create_switch;
+    use crate::infra_cache::operation::create::tests::create_track;
+    use crate::infra_cache::operation::delete::DeleteOperation;
     use crate::modelsv2::infra::tests::test_infra_transaction;
-    use crate::schema::operation::create::tests::create_buffer_stop;
-    use crate::schema::operation::create::tests::create_detector;
-    use crate::schema::operation::create::tests::create_electrification;
-    use crate::schema::operation::create::tests::create_op;
-    use crate::schema::operation::create::tests::create_route;
-    use crate::schema::operation::create::tests::create_signal;
-    use crate::schema::operation::create::tests::create_speed;
-    use crate::schema::operation::create::tests::create_switch;
-    use crate::schema::operation::create::tests::create_track;
-    use crate::schema::operation::delete::DeleteOperation;
     use crate::schema::OSRDIdentified;
     use crate::schema::OSRDObject;
 

editoast/src/schema/operation/update.rs → editoast/src/infra_cache/operation/update.rs

@@ -16,8 +16,8 @@ use serde_json::Value;
 
 use super::OperationError;
 use crate::error::Result;
+use crate::infra_cache::operation::RailjsonObject;
 use crate::modelsv2::get_table;
-use crate::schema::operation::RailjsonObject;
 use crate::schema::OSRDIdentified;
 use crate::schema::ObjectType;
 
@@ -129,12 +129,12 @@ mod tests {
 
     use super::UpdateOperation;
     use crate::error::EditoastError;
+    use crate::infra_cache::operation::create::tests::create_signal;
+    use crate::infra_cache::operation::create::tests::create_speed;
+    use crate::infra_cache::operation::create::tests::create_switch;
+    use crate::infra_cache::operation::create::tests::create_track;
+    use crate::infra_cache::operation::OperationError;
     use crate::modelsv2::infra::tests::test_infra_transaction;
-    use crate::schema::operation::create::tests::create_signal;
-    use crate::schema::operation::create::tests::create_speed;
-    use crate::schema::operation::create::tests::create_switch;
-    use crate::schema::operation::create::tests::create_track;
-    use crate::schema::operation::OperationError;
     use crate::schema::OSRDIdentified;
     use crate::schema::ObjectType;
 

editoast/src/schema/mod.rs

@@ -5,7 +5,6 @@ mod electrification;
 mod errors;
 mod geo_json;
 mod neutral_section;
-pub mod operation;
 pub mod operational_point;
 mod railjson;
 pub mod rolling_stock;
@@ -63,6 +62,7 @@ cfg_if! {
     }
 }
 
+use crate::infra_cache::operation;
 use derivative::Derivative;
 use enum_map::Enum;
 use serde::Deserialize;