diff --git a/server/src/api.rs b/server/src/api.rs index 2bf2311..cc4e2e7 100644 --- a/server/src/api.rs +++ b/server/src/api.rs @@ -404,12 +404,10 @@ async fn board( BoardStop { id: stop.id, name: stop.name, distance_m, favorite, nearby, rows, direction } }) .collect(); - if let Some(stop) = pseudo_train { - stops.push(stop); - } - if let Some(stop) = pseudo_villo { - stops.push(stop); - } + let appended = stops.split_off(stops.iter().position(|s| !s.nearby).unwrap_or(stops.len())); + stops.extend(pseudo_train); + stops.extend(pseudo_villo); + stops.extend(appended); let data_age_seconds = state .waiting_updated .read() @@ -1415,6 +1413,20 @@ mod tests { assert!(stops.iter().all(|s| s["id"] != "VILLO:1")); } + #[tokio::test] + async fn board_orders_nearby_then_pseudo_then_appended_favorites() { + let (status, v) = + get_json(seeded(), "/v1/board?lat=50.70005&lon=4.20005&n=1&favs=1057").await; + assert_eq!(status, StatusCode::OK); + let stops = v["stops"].as_array().unwrap(); + assert_eq!(stops.len(), 3); + assert_eq!(stops[0]["nearby"], true); + assert!(stops[0]["id"].as_str().unwrap().parse::().is_ok()); + assert_eq!(stops[1]["id"], "VILLO:1"); + assert_eq!(stops[2]["id"], "1057"); + assert_eq!(stops[2]["nearby"], false); + } + #[tokio::test] async fn board_without_location_has_no_pseudo_stops() { let (status, v) = get_json(seeded(), "/v1/board?favs=8021").await;