editoast: move tables.rs into editoast_models

Author: leovalais

editoast/Cargo.lock

@@ -2,7 +2,7 @@
 # see https://diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
-file = "src/tables.rs"
+file = "editoast_models/src/tables.rs"
 generate_missing_sql_type_definitions = false
 filter = { except_tables = ["spatial_ref_sys"] }
 import_types = ["diesel::sql_types::*", "postgis_diesel::sql_types::*"]

editoast/diesel.toml

@@ -51,7 +51,7 @@ pub fn error(input: TokenStream) -> TokenStream {
 /// ## Usage
 ///
 /// You should provide a diesel table path, like so
-/// ```#[model(table = "crate::tables::project")]```
+/// ```#[model(table = "editoast_models::tables::project")]```
 ///
 /// Then you can enable implementations like so:
 /// ```#[model(retrieve, create, delete)]```
@@ -185,7 +185,7 @@ pub fn search_config_store(input: proc_macro::TokenStream) -> proc_macro::TokenS
 ///
 /// ```ignore
 /// #[derive(Debug, Default, Clone, ModelV2)]
-/// #[model(table = crate::tables::osrd_infra_document)]
+/// #[model(table = editoast_models::tables::osrd_infra_document)]
 /// pub struct Document {
 ///     pub id: i64,
 ///     pub content_type: String,

editoast/editoast_derive/src/lib.rs

@@ -90,7 +90,7 @@ pub fn model(input: &DeriveInput) -> Result<TokenStream> {
 fn test_construction() {
     let input = syn::parse_quote! {
         #[derive(Clone, Model)]
-        #[model(table = crate::tables::osrd_infra_document)]
+        #[model(table = editoast_models::tables::osrd_infra_document)]
         #[model(row(type_name = "DocumentRow", derive(Debug)))]
         #[model(changeset(type_name = "DocumentChangeset", public, derive(Debug)))] // fields are public
         struct Document {

editoast/editoast_derive/src/modelv2.rs

@@ -14,6 +14,7 @@ editoast_derive.workspace = true
 futures.workspace = true
 futures-util.workspace = true
 openssl.workspace = true
+postgis_diesel.workspace = true
 postgres-openssl.workspace = true
 thiserror.workspace = true
 tokio.workspace = true

editoast/editoast_models/Cargo.toml

@@ -1,6 +1,7 @@
 use diesel_async::{pooled_connection::deadpool::Pool, AsyncPgConnection};
 
 pub mod db_connection_pool;
+pub mod tables;
 
 pub use db_connection_pool::DbConnectionPoolV2;
 

editoast/editoast_models/src/lib.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_buffer_stop::dsl;
+use editoast_models::tables::infra_layer_buffer_stop::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/tables.rs editoast/editoast_models/src/tables.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_detector::dsl;
+use editoast_models::tables::infra_layer_detector::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/buffer_stop.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_electrification::dsl;
+use editoast_models::tables::infra_layer_electrification::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/detector.rs

@@ -304,7 +304,7 @@ async fn retrieve_current_errors_hash(
     conn: &mut DbConnection,
     infra_id: i64,
 ) -> Result<Vec<ErrorHash>> {
-    use crate::tables::infra_layer_error::dsl;
+    use editoast_models::tables::infra_layer_error::dsl;
     Ok(dsl::infra_layer_error
         .filter(dsl::infra_id.eq(infra_id))
         .select(dsl::info_hash)
@@ -318,7 +318,7 @@ async fn remove_errors_from_hashes(
     infra_id: i64,
     errors_hash: &Vec<&ErrorHash>,
 ) -> Result<()> {
-    use crate::tables::infra_layer_error::dsl;
+    use editoast_models::tables::infra_layer_error::dsl;
     let nb_deleted = diesel::delete(
         dsl::infra_layer_error
             .filter(dsl::infra_id.eq(infra_id))

editoast/src/generated_data/electrification.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_neutral_sign::dsl;
+use editoast_models::tables::infra_layer_neutral_sign::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/error/mod.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_operational_point::dsl;
+use editoast_models::tables::infra_layer_operational_point::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/neutral_sign.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_psl_sign::dsl;
+use editoast_models::tables::infra_layer_psl_sign::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/operational_point.rs

@@ -17,7 +17,7 @@ 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::tables::infra_layer_signal::dsl;
+use editoast_models::tables::infra_layer_signal::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::infra::LogicalSignal;
 use editoast_schemas::primitives::ObjectType;

editoast/src/generated_data/psl_sign.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_speed_section::dsl;
+use editoast_models::tables::infra_layer_speed_section::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/signal.rs

@@ -13,7 +13,7 @@ use crate::diesel::ExpressionMethods;
 use crate::error::Result;
 use crate::infra_cache::operation::CacheOperation;
 use crate::infra_cache::InfraCache;
-use crate::tables::infra_layer_track_section::dsl;
+use editoast_models::tables::infra_layer_track_section::dsl;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/generated_data/speed_section.rs

@@ -11,7 +11,6 @@ mod map;
 mod models;
 mod modelsv2;
 mod redis_utils;
-mod tables;
 mod views;
 
 use crate::core::CoreClient;

editoast/src/generated_data/track_section.rs

@@ -9,7 +9,7 @@ use editoast_authz::{
 use editoast_models::DbConnectionPoolV2;
 use itertools::Itertools;
 
-use crate::tables::*;
+use editoast_models::tables::*;
 
 pub struct PgAuthDriver<B: BuiltinRoleSet + Send + Sync> {
     pool: Arc<DbConnectionPoolV2>,

editoast/src/main.rs

@@ -5,7 +5,7 @@
 use editoast_derive::ModelV2;
 
 #[derive(Debug, Default, Clone, ModelV2)]
-#[model(table = crate::tables::document)]
+#[model(table = editoast_models::tables::document)]
 pub struct Document {
     pub id: i64,
     pub content_type: String,

editoast/src/modelsv2/auth.rs

@@ -6,12 +6,12 @@ use utoipa::ToSchema;
 
 use crate::diesel::QueryDsl;
 use crate::error::Result;
-use crate::tables::electrical_profile_set;
+use editoast_models::tables::electrical_profile_set;
 use editoast_models::DbConnection;
 use editoast_schemas::infra::ElectricalProfileSetData;
 
 #[derive(Clone, Debug, Serialize, Deserialize, ModelV2, ToSchema)]
-#[model(table = crate::tables::electrical_profile_set)]
+#[model(table = editoast_models::tables::electrical_profile_set)]
 #[model(changeset(derive(Deserialize)))]
 pub struct ElectricalProfileSet {
     pub id: i64,
@@ -22,7 +22,7 @@ pub struct ElectricalProfileSet {
 
 impl ElectricalProfileSet {
     pub async fn list_light(conn: &mut DbConnection) -> Result<Vec<LightElectricalProfileSet>> {
-        use crate::tables::electrical_profile_set::dsl::*;
+        use editoast_models::tables::electrical_profile_set::dsl::*;
         let result = electrical_profile_set.select((id, name)).load(conn).await?;
         Ok(result)
     }

editoast/src/modelsv2/documents.rs

@@ -37,7 +37,7 @@ use crate::modelsv2::get_table;
 use crate::modelsv2::prelude::*;
 use crate::modelsv2::railjson::persist_railjson;
 use crate::modelsv2::Create;
-use crate::tables::infra::dsl;
+use editoast_models::tables::infra::dsl;
 use editoast_models::DbConnection;
 use editoast_models::DbConnectionPoolV2;
 use editoast_schemas::infra::RailJson;
@@ -57,7 +57,7 @@ editoast_common::schemas! {
 pub const DEFAULT_INFRA_VERSION: &str = "0";
 
 #[derive(Debug, Clone, Derivative, Serialize, Deserialize, ModelV2, utoipa::ToSchema)]
-#[model(table = crate::tables::infra)]
+#[model(table = editoast_models::tables::infra)]
 #[derivative(Default)]
 pub struct Infra {
     pub id: i64,
@@ -151,7 +151,7 @@ impl Infra {
                     let sql = if object != ObjectType::Signal {
                         format!("INSERT INTO {layer_table}(obj_id,geographic,infra_id) SELECT obj_id,geographic,$1 FROM {layer_table} WHERE infra_id=$2")
                     } else {
-                        format!("INSERT INTO {layer_table}(obj_id,geographic,infra_id, angle_geo, signaling_system, sprite) 
+                        format!("INSERT INTO {layer_table}(obj_id,geographic,infra_id, angle_geo, signaling_system, sprite)
                                     SELECT obj_id,geographic,$1,angle_geo, signaling_system, sprite FROM {layer_table} WHERE infra_id = $2")
                     };
 
@@ -169,8 +169,8 @@ impl Infra {
             sql_query("ALTER TABLE infra_object_operational_point ENABLE TRIGGER search_operational_point__ins_trig").execute(conn).await?;
 
             // Fill search tables
-            sql_query("INSERT INTO search_signal(id, label, line_name, infra_id, obj_id, signaling_systems, settings, line_code) 
-                        SELECT signal.id, label, line_name, $1, search_signal.obj_id, signaling_systems, settings, line_code FROM search_signal 
+            sql_query("INSERT INTO search_signal(id, label, line_name, infra_id, obj_id, signaling_systems, settings, line_code)
+                        SELECT signal.id, label, line_name, $1, search_signal.obj_id, signaling_systems, settings, line_code FROM search_signal
                         JOIN infra_object_signal AS signal ON search_signal.obj_id = signal.obj_id and signal.infra_id = $1
                         WHERE search_signal.infra_id = $2")
                 .bind::<BigInt, _>(cloned_infra.id)
@@ -182,8 +182,8 @@ impl Infra {
                 .bind::<BigInt, _>(self.id)
                 .execute(conn).await?;
 
-            sql_query("INSERT INTO search_operational_point(id, infra_id, obj_id, uic, trigram, ci, ch, name) 
-                        SELECT op.id, $1, op.obj_id, uic, trigram, ci, ch, name FROM search_operational_point 
+            sql_query("INSERT INTO search_operational_point(id, infra_id, obj_id, uic, trigram, ci, ch, name)
+                        SELECT op.id, $1, op.obj_id, uic, trigram, ci, ch, name FROM search_operational_point
                         JOIN infra_object_operational_point AS op ON search_operational_point.obj_id = op.obj_id and op.infra_id = $1
                         WHERE search_operational_point.infra_id = $2")
                 .bind::<BigInt, _>(cloned_infra.id)
@@ -252,8 +252,8 @@ impl Infra {
     ///
     /// Note: Everything is done in one transaction for consistency.
     pub async fn fast_delete_static(conn: &mut DbConnection, infra_id: i64) -> Result<bool> {
-        use crate::tables::infra_object_track_section::dsl as track_section_dsl;
-        use crate::tables::search_track::dsl as search_track_dsl;
+        use editoast_models::tables::infra_object_track_section::dsl as track_section_dsl;
+        use editoast_models::tables::search_track::dsl as search_track_dsl;
 
         conn.build_transaction()
             .run(|conn| Box::pin(async {

editoast/src/modelsv2/electrical_profiles.rs

@@ -27,11 +27,11 @@ impl Infra {
         page: u64,
         page_size: u64,
     ) -> Result<(Vec<InfraError>, u64)> {
-        use crate::tables::infra_layer_error::dsl;
-        use crate::tables::infra_layer_error::table;
         use diesel::dsl::sql;
         use diesel::prelude::*;
         use diesel::sql_types::*;
+        use editoast_models::tables::infra_layer_error::dsl;
+        use editoast_models::tables::infra_layer_error::table;
 
         type Filter = Box<dyn BoxableExpression<table, Pg, SqlType = Bool>>;
         fn sql_true() -> Filter {

editoast/src/modelsv2/infra.rs

@@ -6,7 +6,7 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::modelsv2::prelude::*;
-use crate::tables::*;
+use editoast_models::tables::*;
 use editoast_models::DbConnection;
 use editoast_schemas::primitives::ObjectType;
 

editoast/src/modelsv2/infra/errors.rs

@@ -13,7 +13,7 @@ use utoipa::ToSchema;
 use crate::views::rolling_stocks::light_rolling_stock::LightEffortCurves;
 
 #[derive(Debug, Clone, ModelV2, Serialize, ToSchema)]
-#[model(table = crate::tables::rolling_stock)]
+#[model(table = editoast_models::tables::rolling_stock)]
 pub struct LightRollingStockModel {
     pub id: i64,
     pub railjson_version: String,

editoast/src/modelsv2/infra_objects.rs

@@ -58,7 +58,7 @@ mod tests {
     use super::prelude::*;
 
     #[derive(Debug, Default, Clone, ModelV2, PartialEq, Eq)]
-    #[model(table = crate::tables::document)]
+    #[model(table = editoast_models::tables::document)]
     struct Document {
         id: i64,
         content_type: String,
@@ -165,7 +165,7 @@ mod tests {
         }
 
         #[derive(Debug, Clone, ModelV2)]
-        #[model(table = crate::tables::document)]
+        #[model(table = editoast_models::tables::document)]
         struct Document {
             id: i64,
             content_type: String,

editoast/src/modelsv2/light_rolling_stock.rs

@@ -19,7 +19,7 @@ editoast_common::schemas! {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, ModelV2, ToSchema, PartialEq)]
-#[model(table = crate::tables::project)]
+#[model(table = editoast_models::tables::project)]
 pub struct Project {
     pub id: i64,
     pub name: String,
@@ -31,7 +31,7 @@ pub struct Project {
     pub last_modification: NaiveDateTime,
     #[model(remote = "Vec<Option<String>>")]
     pub tags: Tags,
-    #[model(column = crate::tables::project::image_id)]
+    #[model(column = editoast_models::tables::project::image_id)]
     pub image: Option<i64>,
 }
 

editoast/src/modelsv2/mod.rs

@@ -7,7 +7,7 @@ use editoast_derive::ModelV2;
 use serde::Serialize;
 
 #[derive(Debug, Clone, Serialize, ModelV2)]
-#[model(table = crate::tables::rolling_stock_separate_image)]
+#[model(table = editoast_models::tables::rolling_stock_separate_image)]
 pub struct RollingStockSeparatedImageModel {
     pub id: i64,
     pub order: i32,

editoast/src/modelsv2/projects.rs

@@ -22,7 +22,7 @@ use serde::Deserialize;
 ///
 #[derive(Debug, Clone, Derivative, ModelV2)]
 #[derivative(Default)]
-#[model(table = crate::tables::rolling_stock_livery)]
+#[model(table = editoast_models::tables::rolling_stock_livery)]
 #[cfg_attr(test, derive(Deserialize))]
 pub struct RollingStockLiveryModel {
     pub id: i64,

editoast/src/modelsv2/rolling_stock_image.rs

@@ -30,7 +30,7 @@ editoast_common::schemas! {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, ModelV2, ToSchema)]
-#[model(table = crate::tables::rolling_stock)]
+#[model(table = editoast_models::tables::rolling_stock)]
 #[model(changeset(derive(Validate), public))]
 #[schema(as = RollingStock)]
 pub struct RollingStockModel {

editoast/src/modelsv2/rolling_stock_livery.rs

@@ -13,7 +13,7 @@ use editoast_models::DbConnection;
 
 #[derive(Debug, Clone, ModelV2, Deserialize, Serialize, ToSchema)]
 #[schema(as = ScenarioV2)]
-#[model(table = crate::tables::scenario_v2)]
+#[model(table = editoast_models::tables::scenario_v2)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct Scenario {
     pub id: i64,
@@ -33,7 +33,7 @@ pub struct Scenario {
 
 impl Scenario {
     pub async fn infra_name(&self, conn: &mut DbConnection) -> Result<String> {
-        use crate::tables::infra::dsl as infra_dsl;
+        use editoast_models::tables::infra::dsl as infra_dsl;
         let infra_name = infra_dsl::infra
             .filter(infra_dsl::id.eq(self.infra_id))
             .select(infra_dsl::name)
@@ -43,7 +43,7 @@ impl Scenario {
     }
 
     pub async fn trains_count(&self, conn: &mut DbConnection) -> Result<i64> {
-        use crate::tables::train_schedule_v2::dsl::*;
+        use editoast_models::tables::train_schedule_v2::dsl::*;
         let trains_count = train_schedule_v2
             .filter(timetable_id.eq(self.timetable_id))
             .count()