work on bus trip api

backend/src/main.rs

@@ -106,6 +106,7 @@ async fn main() {
         .route("/bus/stops", get(routes::bus::stops::get))
         .route("/bus/stops/times", get(routes::bus::stops::times))
         .route("/bus/trips", get(routes::bus::trips::get))
+        .route("/bus/trips/:id", get(routes::bus::trips::by_id))
         .route("/bus/routes", get(routes::bus::routes::get))
         .layer(TraceLayer::new_for_http())
         .layer(CompressionLayer::new())

backend/src/routes/bus/trips.rs

@@ -1,13 +1,13 @@
 use super::stops::Parameters;
 use crate::routes::{errors::ServerError, CurrentTime};
 use axum::{
-    extract::{Query, State},
+    extract::{Path, Query, State},
     response::IntoResponse,
     Json,
 };
 use chrono::Utc;
 use serde::Serialize;
-use sqlx::{FromRow, PgPool};
+use sqlx::{types::JsonValue, FromRow, PgPool};
 use uuid::Uuid;
 
 #[derive(FromRow, Serialize)]
@@ -87,3 +87,66 @@ WHERE
 }
 
 //
+
+#[derive(FromRow, Serialize)]
+pub struct BusTripData {
+    id: Uuid,
+    route_id: String,
+    direction: i16,
+    vehicle_id: i32,
+    deviation: Option<i32>,
+    created_at: chrono::DateTime<Utc>,
+    headsign: Option<String>,
+    stop_times: Option<JsonValue>,
+}
+
+pub async fn by_id(
+    State(pool): State<PgPool>,
+    Path(id): Path<Uuid>,
+) -> Result<impl IntoResponse, ServerError> {
+    let trip = sqlx::query_as!(
+        BusTripData,
+        r#"SELECT
+	t.id,
+	t.route_id,
+	t.direction,
+	t.vehicle_id,
+	t.created_at,
+	t.deviation,
+	jsonb_agg(jsonb_build_object('stop_id',
+	bst.stop_id,
+	'arrival',
+	bst.arrival,
+	'departure',
+	bst.departure,
+	'stop_sequence',
+	bst.stop_sequence)
+ORDER BY
+	bst.arrival) AS stop_times, 
+	(
+	SELECT
+		brs.headsign
+	FROM
+		bus_route_stops brs
+	WHERE
+		brs.route_id = t.route_id
+		AND brs.direction = t.direction
+	LIMIT 1) AS headsign
+FROM
+	bus_trips t
+LEFT JOIN bus_stop_times bst ON
+	t.id = bst.trip_id
+WHERE
+	t.id = $1
+GROUP BY
+	t.id"#,
+        id
+    )
+    .fetch_optional(&pool)
+    .await?;
+
+    match trip {
+        Some(trip) => Ok(Json(trip)),
+        None => Err(ServerError::NotFound),
+    }
+}

backend/src/routes/errors.rs

@@ -10,6 +10,8 @@ use serde_json::json;
 pub enum ServerError {
     #[error("{0}")]
     Database(#[from] sqlx::Error),
+    #[error("Not found")]
+    NotFound,
 }
 
 impl IntoResponse for ServerError {
@@ -21,6 +23,7 @@ impl IntoResponse for ServerError {
                 StatusCode::INTERNAL_SERVER_ERROR,
                 "Database error".to_string(),
             ),
+            ServerError::NotFound => (StatusCode::NOT_FOUND, "Not found".to_string()),
         };
 
         let body = Json(json!({ "message": message }));

backend/src/routes/trips.rs

@@ -6,8 +6,7 @@ use axum::{
 };
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
-use sqlx::types::JsonValue;
-use sqlx::{FromRow, PgPool};
+use sqlx::{types::JsonValue, FromRow, PgPool};
 use uuid::Uuid;
 
 #[derive(FromRow, Serialize)]
@@ -114,8 +113,11 @@ pub async fn by_id(
 		t.id"#,
         id
     )
-    .fetch_one(&pool)
+    .fetch_optional(&pool)
     .await?;
 
-    Ok(Json(trip))
+    match trip {
+        Some(trip) => Ok(Json(trip)),
+        None => Err(ServerError::NotFound),
+    }
 }