moby/brewlog
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(data): fix search bar 400 error on data page

Browse source 
Split Query<DataQuery> (which used #[serde(flatten)]) into two
separate extractors, since serde_urlencoded doesn't support flatten
and coerces all flattened values to strings, breaking u32 parsing.
This commit is contained in:
Jon Seager 2026-02-04 20:57:26 +00:00
parent 2c045f9335
commit dd08e84572
No known key found for this signature in database
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/application/routes/data.rs
View file

@ -44,28 +44,27 @@ const TABS: &[DataTab] = &[
]; ];
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
pub struct DataQuery { pub(crate) struct DataType {
#[serde(rename = "type", default = "default_type")] #[serde(rename = "type", default = "default_type")]
entity_type: String, entity_type: String,
#[serde(flatten)]
list: ListQuery,
} }
fn default_type() -> String { fn default_type() -> String {
"brews".to_string() "brews".to_string()
} }
#[tracing::instrument(skip(state, cookies, headers, query))] #[tracing::instrument(skip(state, cookies, headers, data_type, list_query))]
pub(crate) async fn data_page( pub(crate) async fn data_page(
State(state): State<AppState>, State(state): State<AppState>,
cookies: tower_cookies::Cookies, cookies: tower_cookies::Cookies,
headers: HeaderMap, headers: HeaderMap,
Query(query): Query<DataQuery>, Query(data_type): Query<DataType>,
Query(list_query): Query<ListQuery>,
) -> Result<Response, StatusCode> { ) -> Result<Response, StatusCode> {
let entity_type = query.entity_type.clone(); let entity_type = data_type.entity_type;
let is_authenticated = super::is_authenticated(&state, &cookies).await; let is_authenticated = super::is_authenticated(&state, &cookies).await;
let content = render_entity_content(&state, &entity_type, query.list, is_authenticated) let content = render_entity_content(&state, &entity_type, list_query, is_authenticated)
.await .await
.map_err(map_app_error)?; .map_err(map_app_error)?;