editoast: remove v2 suffix

Author: younesschrifi

editoast/openapi.yaml

@@ -37,7 +37,6 @@ pub struct ConflictDetectionResponse {
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, ToSchema)]
-#[schema(as=ConflictV2)]
 pub struct Conflict {
     /// List of train ids involved in the conflict
     pub train_ids: Vec<i64>,

editoast/src/core/v2/conflict_detection.rs editoast/src/core/conflict_detection.rs

@@ -1,10 +1,15 @@
+pub mod conflict_detection;
 mod http_client;
 pub mod infra_loading;
 pub mod infra_state;
 #[cfg(test)]
 pub mod mocking;
 pub mod mq_client;
-pub mod v2;
+pub mod path_properties;
+pub mod pathfinding;
+pub mod signal_projection;
+pub mod simulation;
+pub mod stdcm;
 pub mod version;
 
 use std::collections::HashMap;
@@ -36,9 +41,9 @@ use crate::error::Result;
 pub use mq_client::RabbitMQClient;
 
 editoast_common::schemas! {
-    v2::simulation::schemas(),
-    v2::pathfinding::schemas(),
-    v2::conflict_detection::schemas(),
+    simulation::schemas(),
+    pathfinding::schemas(),
+    conflict_detection::schemas(),
 }
 
 const MAX_RETRIES: u8 = 5;

editoast/src/core/mod.rs

@@ -4,8 +4,8 @@ use serde::Serialize;
 use std::collections::HashMap;
 use utoipa::ToSchema;
 
-use crate::core::v2::simulation::SignalSighting;
-use crate::core::v2::simulation::ZoneUpdate;
+use crate::core::simulation::SignalSighting;
+use crate::core::simulation::ZoneUpdate;
 use crate::core::{AsCoreRequest, Json};
 
 use super::pathfinding::TrackRange;

editoast/src/core/v2/path_properties.rs editoast/src/core/path_properties.rs

@@ -13,7 +13,7 @@ use serde::Serialize;
 use utoipa::ToSchema;
 
 use super::pathfinding::TrackRange;
-use crate::core::v2::pathfinding::PathfindingResult;
+use crate::core::pathfinding::PathfindingResult;
 use crate::core::{AsCoreRequest, Json};
 use crate::error::InternalError;
 use crate::RollingStockModel;
@@ -138,7 +138,6 @@ pub struct SimulationPath {
 }
 
 #[derive(Deserialize, Default, Serialize, Clone, Debug, ToSchema)]
-#[schema(as = ReportTrainV2)]
 pub struct ReportTrain {
     /// List of positions of a train
     /// Both positions (in mm) and times (in ms) must have the same length
@@ -156,7 +155,6 @@ pub struct ReportTrain {
 #[derive(Deserialize, Default, Serialize, Clone, Debug, ToSchema)]
 pub struct CompleteReportTrain {
     #[serde(flatten)]
-    #[schema(value_type = ReportTrainV2)]
     pub report_train: ReportTrain,
     pub signal_sightings: Vec<SignalSighting>,
     pub zone_updates: Vec<ZoneUpdate>,
@@ -288,10 +286,8 @@ pub struct SimulationRequest {
 pub enum SimulationResponse {
     Success {
         /// Simulation without any regularity margins
-        #[schema(value_type = ReportTrainV2)]
         base: ReportTrain,
         /// Simulation that takes into account the regularity margins
-        #[schema(value_type = ReportTrainV2)]
         provisional: ReportTrain,
         #[schema(inline)]
         /// User-selected simulation: can be base or provisional

editoast/src/core/v2/pathfinding.rs editoast/src/core/pathfinding.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use crate::core::v2::simulation::RoutingRequirement;
-use crate::core::v2::simulation::SpacingRequirement;
+use crate::core::simulation::RoutingRequirement;
+use crate::core::simulation::SpacingRequirement;
 use chrono::DateTime;
 use chrono::Utc;
 use editoast_schemas::infra::TrackOffset;

editoast/src/core/v2/signal_projection.rs editoast/src/core/signal_projection.rs

@@ -44,7 +44,7 @@ use tower_http::cors::{Any, CorsLayer};
 use tower_http::limit::RequestBodyLimitLayer;
 use tower_http::normalize_path::NormalizePathLayer;
 use tower_http::trace::TraceLayer;
-use views::v2::train_schedule::{TrainScheduleForm, TrainScheduleResult};
+use views::train_schedule::{TrainScheduleForm, TrainScheduleResult};
 
 use colored::*;
 use diesel::sql_query;
@@ -251,7 +251,6 @@ async fn trains_export(
                 return Err(Box::new(error));
             }
         };
-
     let (train_schedules, missing): (Vec<_>, _) =
         TrainSchedule::retrieve_batch(db_pool.get().await?.deref_mut(), train_ids).await?;
 
@@ -931,7 +930,7 @@ mod tests {
     }
 
     #[rstest]
-    async fn import_export_timetable_schedule_v2() {
+    async fn import_export_timetable_schedule() {
         let db_pool = DbConnectionPoolV2::for_tests();
 
         let timetable = Timetable::create(db_pool.get_ok().deref_mut())

editoast/src/core/v2/simulation.rs editoast/src/core/simulation.rs

@@ -23,8 +23,8 @@ use crate::modelsv2::RollingStockModel;
 use crate::modelsv2::Scenario;
 use crate::modelsv2::Study;
 use crate::modelsv2::Tags;
-use crate::views::rolling_stock::RollingStockForm;
-use crate::views::v2::train_schedule::TrainScheduleForm;
+use crate::views::rolling_stock::form::RollingStockForm;
+use crate::views::train_schedule::TrainScheduleForm;
 use crate::ElectricalProfileSet;
 use editoast_models::DbConnection;
 use editoast_models::DbConnectionPool;
@@ -103,7 +103,7 @@ pub fn scenario_changeset(
 ) -> Changeset<Scenario> {
     Scenario::changeset()
         .name(name.to_string())
-        .description("test_scenario_v2 description".to_string())
+        .description("test_scenario description".to_string())
         .creation_date(Utc::now().naive_utc())
         .last_modification(Utc::now().naive_utc())
         .tags(Tags::default())

editoast/src/core/v2/stdcm.rs editoast/src/core/stdcm.rs

@@ -9,7 +9,7 @@ use utoipa::ToSchema;
 use crate::error::Result;
 use crate::modelsv2::rolling_stock_model::RollingStockModel;
 use editoast_models::db_connection_pool::DbConnectionV2;
-use editoast_models::tables::{project, rolling_stock, scenario_v2, study, train_schedule_v2};
+use editoast_models::tables::{project, rolling_stock, scenario, study, train_schedule};
 
 #[derive(Debug, Serialize, ToSchema)]
 #[cfg_attr(test, derive(PartialEq, Eq, PartialOrd, Ord, Deserialize))]
@@ -40,26 +40,24 @@ type SchedulesFromRollingStock = (i64, String, i64, String, i64, String);
 
 impl RollingStockModel {
     pub async fn get_usage(&self, conn: &mut DbConnectionV2) -> Result<Vec<ScenarioReference>> {
-        let schedules: Vec<_> = train_schedule_v2::table
+        let schedules: Vec<_> = train_schedule::table
             .inner_join(
-                rolling_stock::table
-                    .on(train_schedule_v2::rolling_stock_name.eq(rolling_stock::name)),
+                rolling_stock::table.on(train_schedule::rolling_stock_name.eq(rolling_stock::name)),
             )
             .inner_join(
-                (scenario_v2::table
-                    .on(scenario_v2::timetable_id.eq(train_schedule_v2::timetable_id)))
-                .inner_join(study::table.inner_join(project::table)),
+                (scenario::table.on(scenario::timetable_id.eq(scenario::timetable_id)))
+                    .inner_join(study::table.inner_join(project::table)),
             )
             .select((
                 project::id,
                 project::name,
                 study::id,
                 study::name,
-                scenario_v2::id,
-                scenario_v2::name,
+                scenario::id,
+                scenario::name,
             ))
             .filter(rolling_stock::id.eq(self.id))
-            .filter(train_schedule_v2::id.is_not_null())
+            .filter(train_schedule::id.is_not_null())
             .load::<SchedulesFromRollingStock>(conn)
             .await?;
         let schedules = schedules.into_iter().map_into().collect();

editoast/src/core/v2/mod.rs

@@ -12,8 +12,7 @@ use crate::modelsv2::Tags;
 use editoast_models::DbConnection;
 
 #[derive(Debug, Clone, ModelV2, Deserialize, Serialize, ToSchema)]
-#[schema(as = ScenarioV2)]
-#[model(table = editoast_models::tables::scenario_v2)]
+#[model(table = editoast_models::tables::scenario)]
 #[model(gen(ops = crud, list))]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct Scenario {
@@ -44,8 +43,8 @@ impl Scenario {
     }
 
     pub async fn trains_count(&self, conn: &mut DbConnection) -> Result<i64> {
-        use editoast_models::tables::train_schedule_v2::dsl::*;
-        let trains_count = train_schedule_v2
+        use editoast_models::tables::train_schedule::dsl::*;
+        let trains_count = train_schedule
             .filter(timetable_id.eq(self.timetable_id))
             .count()
             .get_result(conn)

editoast/src/main.rs

@@ -8,11 +8,11 @@ use crate::error::Result;
 use crate::models::Identifiable;
 use crate::modelsv2::{DeleteStatic, Retrieve};
 use crate::Exists;
-use editoast_models::tables::timetable_v2::dsl;
+use editoast_models::tables::timetable::dsl;
 use editoast_models::DbConnection;
 
 #[derive(Debug, Default, Clone, PartialEq, Queryable, Identifiable)]
-#[diesel(table_name = editoast_models::tables::timetable_v2)]
+#[diesel(table_name = editoast_models::tables::timetable)]
 #[cfg_attr(test, derive(serde::Deserialize))]
 pub struct Timetable {
     pub id: i64,
@@ -21,7 +21,7 @@ pub struct Timetable {
 impl Timetable {
     #[tracing::instrument(name = "model:create<Timetable>", skip_all, err)]
     pub async fn create(conn: &mut DbConnection) -> Result<Self> {
-        diesel::insert_into(editoast_models::tables::timetable_v2::table)
+        diesel::insert_into(editoast_models::tables::timetable::table)
             .default_values()
             .get_result::<Timetable>(conn)
             .await
@@ -35,7 +35,7 @@ impl DeleteStatic<i64> for Timetable {
     #[allow(clippy::blocks_in_conditions)] // TODO: Remove this once using clippy 0.1.80
     #[tracing::instrument(name = "model:delete_static<Timetable>", skip_all, ret, err)]
     async fn delete_static(conn: &mut DbConnection, id: i64) -> Result<bool> {
-        diesel::delete(dsl::timetable_v2.filter(dsl::id.eq(id)))
+        diesel::delete(dsl::timetable.filter(dsl::id.eq(id)))
             .execute(conn)
             .await
             .map(|n| n == 1)
@@ -51,7 +51,7 @@ impl Retrieve<i64> for Timetable {
         conn: &mut editoast_models::DbConnection,
         id: i64,
     ) -> crate::error::Result<Option<Timetable>> {
-        dsl::timetable_v2
+        dsl::timetable
             .filter(dsl::id.eq(id))
             .first::<Timetable>(conn)
             .await
@@ -91,12 +91,12 @@ pub struct TimetableWithTrains {
 impl Retrieve<i64> for TimetableWithTrains {
     async fn retrieve(conn: &mut DbConnection, timetable_id: i64) -> Result<Option<Self>> {
         let result = sql_query(
-            "SELECT timetable_v2.*,
-        array_remove(array_agg(train_schedule_v2.id), NULL) as train_ids
-        FROM timetable_v2
-        LEFT JOIN train_schedule_v2 ON timetable_v2.id = train_schedule_v2.timetable_id
-        WHERE timetable_v2.id = $1
-        GROUP BY timetable_v2.id",
+            "SELECT timetable.*,
+        array_remove(array_agg(train_schedule.id), NULL) as train_ids
+        FROM timetable
+        LEFT JOIN train_schedule ON timetable.id = train_schedule.timetable_id
+        WHERE timetable.id = $1
+        GROUP BY timetable.id",
         )
         .bind::<BigInt, _>(timetable_id)
         .get_result::<TimetableWithTrains>(conn)

editoast/src/modelsv2/fixtures.rs

@@ -10,7 +10,7 @@ use editoast_schemas::train_schedule::ScheduleItem;
 use editoast_schemas::train_schedule::TrainScheduleOptions;
 
 #[derive(Debug, Default, Clone, ModelV2)]
-#[model(table = editoast_models::tables::train_schedule_v2)]
+#[model(table = editoast_models::tables::train_schedule)]
 #[model(gen(ops = crud, batch_ops = crd, list))]
 pub struct TrainSchedule {
     pub id: i64,

editoast/src/modelsv2/rolling_stock_model/schedules_from_rolling_stock.rs

@@ -6,14 +6,17 @@ mod openapi;
 pub mod operational_studies;
 pub mod pagination;
 pub mod params;
+pub mod path;
 pub mod projects;
 pub mod rolling_stock;
+pub mod scenario;
 pub mod search;
 pub mod speed_limit_tags;
 pub mod sprites;
 pub mod stdcm_search_environment;
 pub mod study;
-pub mod v2;
+pub mod timetable;
+pub mod train_schedule;
 pub mod work_schedules;
 
 #[cfg(test)]
@@ -75,8 +78,11 @@ crate::routes! {
     &speed_limit_tags,
     &sprites,
     &stdcm_search_environment,
-    &v2,
     &work_schedules,
+    &train_schedule,
+    &timetable,
+    &path,
+    &scenario,
 }
 
 editoast_common::schemas! {
@@ -99,8 +105,11 @@ editoast_common::schemas! {
     rolling_stock::schemas(),
     search::schemas(),
     stdcm_search_environment::schemas(),
-    v2::schemas(),
     work_schedules::schemas(),
+    train_schedule::schemas(),
+    timetable::schemas(),
+    path::schemas(),
+    scenario::schemas(),
 }
 
 pub type Roles = editoast_authz::roles::RoleConfig<BuiltinRole>;

editoast/src/modelsv2/scenario.rs

@@ -8,7 +8,7 @@ pub use pathfinding::pathfinding_from_train_batch;
 use editoast_derive::EditoastError;
 use thiserror::Error;
 
-use crate::core::v2::pathfinding::TrackRange;
+use crate::core::pathfinding::TrackRange;
 use crate::error::Result;
 use crate::modelsv2::prelude::*;
 use crate::modelsv2::Infra;

editoast/src/modelsv2/timetable.rs

@@ -1,4 +1,4 @@
-use crate::core::v2::pathfinding::PathfindingResult;
+use crate::core::pathfinding::PathfindingResult;
 use crate::error::Result;
 use crate::modelsv2::TrackSectionModel;
 use crate::RetrieveBatchUnchecked;

editoast/src/modelsv2/train_schedule.rs

@@ -17,8 +17,8 @@ use tracing::debug;
 use tracing::info;
 use utoipa::ToSchema;
 
-use crate::core::v2::pathfinding::PathfindingRequest;
-use crate::core::v2::pathfinding::PathfindingResult;
+use crate::core::pathfinding::PathfindingRequest;
+use crate::core::pathfinding::PathfindingResult;
 use crate::core::AsCoreRequest;
 use crate::core::CoreClient;
 use crate::error::Result;
@@ -28,15 +28,15 @@ use crate::modelsv2::Retrieve;
 use crate::modelsv2::RollingStockModel;
 use crate::redis_utils::RedisConnection;
 use crate::views::get_app_version;
-use crate::views::v2::path::path_item_cache::PathItemCache;
-use crate::views::v2::path::PathfindingError;
+use crate::views::path::path_item_cache::PathItemCache;
+use crate::views::path::PathfindingError;
 use crate::views::AuthorizationError;
 use crate::views::AuthorizerExt;
 use crate::AppState;
 use editoast_models::DbConnection;
 
 crate::routes! {
-    "/v2/infra/{infra_id}/pathfinding/blocks" => post,
+    "/infra/{infra_id}/pathfinding/blocks" => post,
 }
 
 editoast_common::schemas! {
@@ -46,7 +46,6 @@ editoast_common::schemas! {
 /// Path input is described by some rolling stock information
 /// and a list of path waypoints
 #[derive(Deserialize, Clone, Debug, Hash, ToSchema)]
-#[schema(as = PathfindingInputV2)]
 struct PathfindingInput {
     /// The loading gauge of the rolling stock
     rolling_stock_loading_gauge: LoadingGaugeType,
@@ -70,11 +69,11 @@ struct PathfindingInput {
 /// Compute a pathfinding
 #[utoipa::path(
     post, path = "",
-    tag = "pathfindingv2",
+    tag = "pathfinding",
     params(
         ("infra_id" = i64, Path, description = "The infra id"),
     ),
-    request_body = PathfindingInputV2,
+    request_body = PathfindingInput,
     responses(
         (status = 200, description = "Pathfinding Result", body = PathfindingResult),
     ),