seems alright
This commit is contained in:
parent
ebe7bbb51d
commit
eac1bd0d13
58 changed files with 23125 additions and 153505 deletions
|
|
@ -1,80 +1,239 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use axum::extract::{Query, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum::response::Json;
|
||||
use rustc_hash::FxHashSet;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tracing::info;
|
||||
|
||||
use crate::api_error::ApiError;
|
||||
use crate::consts::{DEFAULT_ACTUAL_LISTINGS_LIMIT, MAX_ACTUAL_LISTINGS_LIMIT};
|
||||
use crate::data::ActualListing;
|
||||
use crate::parsing::require_bounds;
|
||||
use crate::state::SharedState;
|
||||
use crate::features::property_level_feature_names;
|
||||
use crate::parsing::{
|
||||
parse_filters_with_poi, require_bounds, row_passes_filters, row_passes_poi_filters,
|
||||
};
|
||||
use crate::state::{AppState, SharedState};
|
||||
|
||||
const MAX_RESULTS: usize = 5000;
|
||||
use super::travel_time::{parse_optional_travel, row_passes_travel_filters, TravelEntry};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct ActualListingsParams {
|
||||
bounds: Option<String>,
|
||||
/// `;;`-separated filters: `name:min:max;;...`
|
||||
filters: Option<String>,
|
||||
/// Pipe-separated travel time entries: `mode:slug|mode:slug:min:max`
|
||||
travel: Option<String>,
|
||||
/// Page size — defaults to DEFAULT_ACTUAL_LISTINGS_LIMIT, capped at
|
||||
/// MAX_ACTUAL_LISTINGS_LIMIT.
|
||||
limit: Option<usize>,
|
||||
/// Number of results to skip. Defaults to 0.
|
||||
offset: Option<usize>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct ActualListingsResponse {
|
||||
pub listings: Vec<ActualListing>,
|
||||
pub total: usize,
|
||||
pub limit: usize,
|
||||
pub offset: usize,
|
||||
pub truncated: bool,
|
||||
}
|
||||
|
||||
pub async fn get_actual_listings(
|
||||
State(shared): State<Arc<SharedState>>,
|
||||
Query(params): Query<ActualListingsParams>,
|
||||
) -> Result<Json<ActualListingsResponse>, (StatusCode, String)> {
|
||||
) -> Result<Json<ActualListingsResponse>, ApiError> {
|
||||
let state = shared.load_state();
|
||||
let limit = params
|
||||
.limit
|
||||
.unwrap_or(DEFAULT_ACTUAL_LISTINGS_LIMIT)
|
||||
.min(MAX_ACTUAL_LISTINGS_LIMIT);
|
||||
let offset = params.offset.unwrap_or(0);
|
||||
let Some(actual_listings) = state.actual_listings.clone() else {
|
||||
return Ok(Json(ActualListingsResponse {
|
||||
listings: Vec::new(),
|
||||
total: 0,
|
||||
limit,
|
||||
offset,
|
||||
truncated: false,
|
||||
}));
|
||||
};
|
||||
let (south, west, north, east) = require_bounds(params.bounds)?;
|
||||
let (south, west, north, east) = require_bounds(params.bounds).map_err(ApiError::from)?;
|
||||
|
||||
let response = tokio::task::spawn_blocking(move || {
|
||||
let t0 = std::time::Instant::now();
|
||||
let row_indices = actual_listings.grid.query(south, west, north, east);
|
||||
let total = row_indices.len();
|
||||
let truncated = total > MAX_RESULTS;
|
||||
let quant = state.data.quant_ref();
|
||||
let poi_quant = state.data.poi_metrics.quant_ref();
|
||||
let (mut parsed_filters, mut parsed_enum_filters, parsed_poi_filters) = parse_filters_with_poi(
|
||||
params.filters.as_deref(),
|
||||
&state.feature_name_to_index,
|
||||
&state.data.enum_values,
|
||||
&quant,
|
||||
&state.data.poi_metrics.name_to_index,
|
||||
&poi_quant,
|
||||
)
|
||||
.map_err(ApiError::BadRequest)?;
|
||||
|
||||
let mut listings: Vec<ActualListing> = row_indices
|
||||
.iter()
|
||||
.take(MAX_RESULTS)
|
||||
.map(|&row| actual_listings.listing_at(row as usize))
|
||||
.collect();
|
||||
// Drop property-level filters (price, sqm, build year, beds, type, etc.) so they
|
||||
// don't hide live listings — those are individual-property concerns the user can
|
||||
// judge from the pin itself. We only keep area/postcode-level filters here.
|
||||
let property_level_idxs: FxHashSet<usize> = property_level_feature_names()
|
||||
.into_iter()
|
||||
.filter_map(|name| state.feature_name_to_index.get(name).copied())
|
||||
.collect();
|
||||
parsed_filters.retain(|f| !property_level_idxs.contains(&f.feat_idx));
|
||||
parsed_enum_filters.retain(|f| !property_level_idxs.contains(&f.feat_idx));
|
||||
|
||||
// Sort newest first so the most relevant pins win when the viewport is busy.
|
||||
listings.sort_by(|left, right| {
|
||||
right
|
||||
.listing_date_iso
|
||||
.cmp(&left.listing_date_iso)
|
||||
.then_with(|| right.asking_price.cmp(&left.asking_price))
|
||||
});
|
||||
let travel_entries =
|
||||
parse_optional_travel(params.travel.as_deref()).map_err(ApiError::BadRequest)?;
|
||||
|
||||
let elapsed = t0.elapsed();
|
||||
info!(
|
||||
results = listings.len(),
|
||||
total,
|
||||
truncated,
|
||||
ms = format_args!("{:.1}", elapsed.as_secs_f64() * 1000.0),
|
||||
"GET /api/actual-listings"
|
||||
);
|
||||
let has_area_filters = !parsed_filters.is_empty()
|
||||
|| !parsed_enum_filters.is_empty()
|
||||
|| !parsed_poi_filters.is_empty()
|
||||
|| !travel_entries.is_empty();
|
||||
|
||||
ActualListingsResponse {
|
||||
listings,
|
||||
total,
|
||||
truncated,
|
||||
}
|
||||
})
|
||||
.await
|
||||
.map_err(|error| (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()))?;
|
||||
let state_clone = state.clone();
|
||||
let response =
|
||||
tokio::task::spawn_blocking(move || -> Result<ActualListingsResponse, String> {
|
||||
let t0 = std::time::Instant::now();
|
||||
|
||||
let passing_postcodes = if has_area_filters {
|
||||
Some(compute_passing_postcodes(
|
||||
&state_clone,
|
||||
south,
|
||||
west,
|
||||
north,
|
||||
east,
|
||||
&parsed_filters,
|
||||
&parsed_enum_filters,
|
||||
&parsed_poi_filters,
|
||||
&travel_entries,
|
||||
)?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let row_indices = actual_listings.grid.query(south, west, north, east);
|
||||
let total_in_bounds = row_indices.len();
|
||||
|
||||
// Build (row, sort_key) pairs so we can sort by index without
|
||||
// materializing the full ActualListing for every matching row.
|
||||
let mut matching_rows: Vec<usize> = row_indices
|
||||
.iter()
|
||||
.filter_map(|&row_idx| {
|
||||
let row = row_idx as usize;
|
||||
if let Some(allowed) = passing_postcodes.as_ref() {
|
||||
if !allowed.contains(actual_listings.postcode[row].as_str()) {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
Some(row)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let total_matching = matching_rows.len();
|
||||
|
||||
matching_rows.sort_by(|&left, &right| {
|
||||
actual_listings.listing_date_iso[right]
|
||||
.cmp(&actual_listings.listing_date_iso[left])
|
||||
.then_with(|| {
|
||||
actual_listings.asking_price[right].cmp(&actual_listings.asking_price[left])
|
||||
})
|
||||
});
|
||||
|
||||
let truncated = total_matching > offset.saturating_add(limit);
|
||||
let listings: Vec<ActualListing> = matching_rows
|
||||
.iter()
|
||||
.skip(offset)
|
||||
.take(limit)
|
||||
.map(|&row| actual_listings.listing_at(row))
|
||||
.collect();
|
||||
|
||||
let elapsed = t0.elapsed();
|
||||
info!(
|
||||
results = listings.len(),
|
||||
total = total_matching,
|
||||
total_in_bounds,
|
||||
offset,
|
||||
filtered = passing_postcodes.is_some(),
|
||||
ms = format_args!("{:.1}", elapsed.as_secs_f64() * 1000.0),
|
||||
"GET /api/actual-listings"
|
||||
);
|
||||
|
||||
Ok(ActualListingsResponse {
|
||||
listings,
|
||||
total: total_matching,
|
||||
limit,
|
||||
offset,
|
||||
truncated,
|
||||
})
|
||||
})
|
||||
.await
|
||||
.map_err(|error| ApiError::Internal(error.to_string()))?
|
||||
.map_err(ApiError::Internal)?;
|
||||
|
||||
Ok(Json(response))
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn compute_passing_postcodes(
|
||||
state: &AppState,
|
||||
south: f64,
|
||||
west: f64,
|
||||
north: f64,
|
||||
east: f64,
|
||||
parsed_filters: &[crate::parsing::ParsedFilter],
|
||||
parsed_enum_filters: &[crate::parsing::ParsedEnumFilter],
|
||||
parsed_poi_filters: &[crate::parsing::ParsedPoiFilter],
|
||||
travel_entries: &[TravelEntry],
|
||||
) -> Result<FxHashSet<String>, String> {
|
||||
let num_features = state.data.num_features;
|
||||
let feature_data = &state.data.feature_data;
|
||||
let poi_metrics = &state.data.poi_metrics;
|
||||
let has_poi_filters = !parsed_poi_filters.is_empty();
|
||||
|
||||
let travel_data = if travel_entries.is_empty() {
|
||||
Vec::new()
|
||||
} else {
|
||||
let store = &state.travel_time_store;
|
||||
travel_entries
|
||||
.iter()
|
||||
.map(|entry| {
|
||||
store
|
||||
.get(&entry.mode, &entry.slug)
|
||||
.map_err(|err| format!("Failed to load travel data: {}", err))
|
||||
})
|
||||
.collect::<Result<Vec<_>, _>>()?
|
||||
};
|
||||
let has_travel = !travel_entries.is_empty();
|
||||
|
||||
let mut passing: FxHashSet<String> = FxHashSet::default();
|
||||
|
||||
state
|
||||
.grid
|
||||
.for_each_in_bounds(south, west, north, east, |row_idx| {
|
||||
let row = row_idx as usize;
|
||||
if !row_passes_filters(
|
||||
row,
|
||||
parsed_filters,
|
||||
parsed_enum_filters,
|
||||
feature_data,
|
||||
num_features,
|
||||
) {
|
||||
return;
|
||||
}
|
||||
if has_poi_filters && !row_passes_poi_filters(row, parsed_poi_filters, poi_metrics) {
|
||||
return;
|
||||
}
|
||||
let postcode = state.data.postcode(row);
|
||||
if has_travel && !row_passes_travel_filters(postcode, travel_entries, &travel_data) {
|
||||
return;
|
||||
}
|
||||
// Property postcodes share the same canonical "OUT IN" format used by
|
||||
// ActualListingData::load (normalize_postcode), so we can match by string.
|
||||
if !passing.contains(postcode) {
|
||||
passing.insert(postcode.to_string());
|
||||
}
|
||||
});
|
||||
|
||||
Ok(passing)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue