nickorlow/septastic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimize query
Some checks failed
Create and publish a Docker image / build-and-push-image (push) Failing after 6m2s
Details

Browse source
This commit is contained in:
Nicholas Orlowsky 2025-09-24 18:55:06 -04:00
parent 0593f14408
commit 775d6c2899
No known key found for this signature in database
GPG key ID: A9F3BA4C0AA7A70B
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/src/controllers/route.rs
View file

@ -54,14 +54,14 @@ async fn get_route_info(route_id: String, state: Data<Arc<AppState>>) -> ::anyho
let mut tx = state.database.begin().await?; let mut tx = state.database.begin().await?;
let route = database::get_route_by_id(route_id.clone(), &mut tx).await?; let route = database::get_route_by_id(route_id.clone(), &mut tx).await?;
//let directions = database::get_direction_by_route_id(route_id.clone(), &mut tx).await?; let directions = database::get_direction_by_route_id(route_id.clone(), &mut tx).await?;
let mut trips = database::get_schedule_by_route_id(route_id.clone(), &mut tx).await?; let mut trips = database::get_schedule_by_route_id(route_id.clone(), &mut tx).await?;
state.trip_tracking_service.annotate_trips(&mut trips); state.trip_tracking_service.annotate_trips(&mut trips);
Ok(RouteResponse{ Ok(RouteResponse{
route, route,
directions: Vec::new(), directions,
schedule: trips schedule: trips
}) })
} }

8
api/src/database.rs
View file

@ -120,7 +120,7 @@ pub async fn get_schedule_by_route_id(
septa_stop_schedules.route_id, septa_stop_schedules.route_id,
septa_stops.name as stop_name, septa_stops.name as stop_name,
trip_id, trip_id,
service_id, septa_stop_schedules.service_id,
septa_stop_schedules.direction_id, septa_stop_schedules.direction_id,
arrival_time, arrival_time,
stop_id, stop_id,
@ -129,10 +129,12 @@ pub async fn get_schedule_by_route_id(
septa_stop_schedules septa_stop_schedules
INNER JOIN septa_stops INNER JOIN septa_stops
ON septa_stops.id = septa_stop_schedules.stop_id ON septa_stops.id = septa_stop_schedules.stop_id
INNER JOIN septa_schedule_days
ON septa_schedule_days.date = $2
AND
septa_schedule_days.service_id = septa_stop_schedules.service_id
WHERE WHERE
septa_stop_schedules.route_id = $1 septa_stop_schedules.route_id = $1
AND
service_id IN (SELECT service_id FROM septa_schedule_days WHERE date = $2)
;"#, ;"#,
id.clone(), id.clone(),
schedule_day_str.clone() schedule_day_str.clone()