editoast: endpoints to retrieve stdcm payloads

Signed-off-by: hamz2a <[email protected]>

editoast/editoast_common/src/tracing.rs

@@ -31,11 +31,12 @@ pub struct TracingConfig {
 
 pub fn create_tracing_subscriber<T: SpanExporter + 'static>(
     tracing_config: TracingConfig,
+    log_level: tracing_subscriber::filter::LevelFilter,
     exporter: T,
 ) -> impl tracing::Subscriber {
     let env_filter_layer = tracing_subscriber::EnvFilter::builder()
         // Set the default log level to 'info'
-        .with_default_directive(tracing_subscriber::filter::LevelFilter::INFO.into())
+        .with_default_directive(log_level.into())
         .from_env_lossy();
     let fmt_layer = tracing_subscriber::fmt::layer()
         .pretty()

editoast/openapi.yaml

@@ -2590,6 +2590,42 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/StdcmSearchEnvironment'
+  /stdcm_logs:
+    get:
+      tags:
+      - stdcm_log
+      responses:
+        '200':
+          description: The list of Stdcm Logs
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/StdcmLog'
+  /stdcm_logs/{trace_id}:
+    get:
+      tags:
+      - stdcm_log
+      parameters:
+      - name: trace_id
+        in: path
+        required: true
+        schema:
+          type: string
+      responses:
+        '200':
+          description: The stdcm log
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/StdcmLog'
+        '404':
+          description: The stdcm log was not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/InternalError'
   /temporary_speed_limit_group:
     post:
       tags:
@@ -4741,6 +4777,7 @@ components:
       - $ref: '#/components/schemas/EditoastStdcmErrorRollingStockNotFound'
       - $ref: '#/components/schemas/EditoastStdcmErrorTimetableNotFound'
       - $ref: '#/components/schemas/EditoastStdcmErrorTowedRollingStockNotFound'
+      - $ref: '#/components/schemas/EditoastStdcmLogErrorNotFound'
       - $ref: '#/components/schemas/EditoastStudyErrorNotFound'
       - $ref: '#/components/schemas/EditoastStudyErrorStartDateAfterEndDate'
       - $ref: '#/components/schemas/EditoastTemporarySpeedLimitErrorNameAlreadyUsed'
@@ -5960,6 +5997,30 @@ components:
           type: string
           enum:
           - editoast:stdcm_v2:TowedRollingStockNotFound
+    EditoastStdcmLogErrorNotFound:
+      type: object
+      required:
+      - type
+      - status
+      - message
+      properties:
+        context:
+          type: object
+          required:
+          - trace_id
+          properties:
+            trace_id:
+              type: string
+        message:
+          type: string
+        status:
+          type: integer
+          enum:
+          - 404
+        type:
+          type: string
+          enum:
+          - editoast:stdcm_log:NotFound
     EditoastStudyErrorNotFound:
       type: object
       required:

editoast/src/main.rs

@@ -115,7 +115,12 @@ async fn run() -> Result<(), Box<dyn Error + Send + Sync>> {
         stream: EditoastMode::from_client(&client).into(),
         telemetry,
     };
-    create_tracing_subscriber(tracing_config, exporter).init();
+    create_tracing_subscriber(
+        tracing_config,
+        tracing_subscriber::filter::LevelFilter::INFO,
+        exporter,
+    )
+    .init();
 
     let pg_config = client.postgres_config;
     let db_pool =

editoast/src/models/stdcm_log.rs

@@ -1,11 +1,15 @@
+use std::ops::DerefMut;
+
 use chrono::DateTime;
 use chrono::Utc;
+use diesel::ExpressionMethods;
+use diesel::OptionalExtension;
+use diesel::QueryDsl;
+use diesel_async::RunQueryDsl;
 use editoast_derive::Model;
 use editoast_models::DbConnection;
-use opentelemetry::trace::TraceContextExt;
 use serde::Deserialize;
 use serde::Serialize;
-use tracing_opentelemetry::OpenTelemetrySpanExt;
 use utoipa::ToSchema;
 
 use crate::core::stdcm::Request;
@@ -18,7 +22,7 @@ editoast_common::schemas! {
 
 #[derive(Clone, Debug, Serialize, Deserialize, Model, ToSchema)]
 #[model(table = editoast_models::tables::stdcm_logs)]
-#[model(gen(ops = c))]
+#[model(gen(ops = cd, list))]
 pub struct StdcmLog {
     pub id: i64,
     pub trace_id: String,
@@ -33,22 +37,33 @@ pub struct StdcmLog {
 impl StdcmLog {
     pub async fn log(
         mut conn: DbConnection,
+        trace_id: String,
         request: Request,
         response: Response,
         user_id: Option<i64>,
     ) {
-        let trace_id = tracing::Span::current()
-            .context()
-            .span()
-            .span_context()
-            .trace_id();
         let stdcm_log_changeset = StdcmLog::changeset()
-            .trace_id(trace_id.to_string())
+            .trace_id(trace_id)
             .request(request)
             .response(response.clone())
             .user_id(user_id);
         if let Err(e) = stdcm_log_changeset.create(&mut conn).await {
             tracing::error!("Failed during log operation: {e}");
         }
     }
+
+    pub async fn find_by_trace_id(
+        conn: &mut DbConnection,
+        trace_id: &str,
+    ) -> crate::error::Result<Option<StdcmLog>> {
+        use editoast_models::tables::stdcm_logs::dsl;
+
+        dsl::stdcm_logs
+            .filter(dsl::trace_id.eq(trace_id))
+            .first::<StdcmLogRow>(conn.write().await.deref_mut())
+            .await
+            .map(Into::into)
+            .optional()
+            .map_err(Into::into)
+    }
 }

editoast/src/views/mod.rs

@@ -14,6 +14,7 @@ pub mod scenario;
 pub mod search;
 pub mod speed_limit_tags;
 pub mod sprites;
+pub mod stdcm_logs;
 pub mod stdcm_search_environment;
 pub mod study;
 pub mod temporary_speed_limits;
@@ -111,6 +112,7 @@ crate::routes! {
     &train_schedule,
     &timetable,
     &path,
+    &stdcm_logs,
     &scenario,
 }
 

editoast/src/views/projects.rs

@@ -415,7 +415,7 @@ pub mod tests {
             .roles(HashSet::from([BuiltinRole::OpsRead]))
             .build();
 
-        let request = app.post("/projects").with_user(user).json(&json!({
+        let request = app.post("/projects").with_user(&user).json(&json!({
             "name": "test_project_failed",
             "description": "",
             "objectives": "",