lgtm

server-rs/src/routes/journey.rs

@@ -2,16 +2,22 @@ use std::sync::Arc;
 
 use axum::extract::State;
 use axum::http::StatusCode;
+use axum::response::IntoResponse;
 use axum::response::Json;
+use axum::Extension;
 use serde::{Deserialize, Serialize};
 
+use crate::auth::OptionalUser;
+use crate::licensing::{check_license_point, resolve_share_code};
 use crate::state::SharedState;
+use crate::utils::normalize_postcode;
 
 #[derive(Deserialize)]
 pub struct JourneyQuery {
     postcode: String,
     mode: String,
     slug: String,
+    share: Option<String>,
 }
 
 #[derive(Serialize)]
@@ -26,16 +32,30 @@ pub struct JourneyResponse {
 
 pub async fn get_journey(
     State(shared): State<Arc<SharedState>>,
+    Extension(user): Extension<OptionalUser>,
     query: axum::extract::Query<JourneyQuery>,
-) -> Result<Json<JourneyResponse>, (StatusCode, String)> {
+) -> Result<Json<JourneyResponse>, axum::response::Response> {
     let state = shared.load_state();
     let store = &state.travel_time_store;
+    let postcode = normalize_postcode(&query.postcode);
+
+    let pc_idx = state
+        .postcode_data
+        .postcode_to_idx
+        .get(&postcode)
+        .copied()
+        .ok_or_else(|| (StatusCode::NOT_FOUND, "Postcode not found").into_response())?;
+    let (lat, lon) = state.postcode_data.centroids[pc_idx];
+
+    let share_bounds = resolve_share_code(&state, query.share.as_deref()).await;
+    check_license_point(&user.0, lat as f64, lon as f64, share_bounds)?;
 
     if !store.has_destination(&query.mode, &query.slug) {
         return Err((
             StatusCode::NOT_FOUND,
             format!("No travel data for mode={} slug={}", query.mode, query.slug),
-        ));
+        )
+            .into_response());
     }
 
     let travel_data = store.get(&query.mode, &query.slug).map_err(|e| {
@@ -43,9 +63,10 @@ pub async fn get_journey(
             StatusCode::INTERNAL_SERVER_ERROR,
             format!("Failed to load travel data: {e}"),
         )
+            .into_response()
     })?;
 
-    let row = travel_data.get(&query.postcode);
+    let row = travel_data.get(&postcode);
     let journey = row
         .and_then(|r| r.journey.as_ref())
         .and_then(|j| serde_json::from_str::<serde_json::Value>(j).ok());