brewlog/src/application/routes/roasters.rs
Jon Seager 4bdfc661f9
refactor: consolidate entity pages into unified /data and /add views
Replace per-entity pages (/roasters, /roasts, /bags, /brews, /gear,
/cafes, /cups) and detail pages with a single tabbed /data view and
a dedicated /add page for entity creation.

- Add /data route with tab-based navigation using Datastar
- Add /add route consolidating all create forms
- Remove per-entity page handlers and standalone templates
- Remove detail page routes, handlers, and templates
- Update ListNavigator to accept String paths for query-param URLs
- Update home page and timeline links to use new /data?type=X paths
- Update nav to reference /data instead of individual entity pages
2026-02-04 20:51:30 +00:00

171 lines
5.3 KiB
Rust

use axum::Json;
use axum::extract::{Path, Query, State};
use axum::http::{HeaderMap, StatusCode};
use axum::response::{IntoResponse, Redirect, Response};
use super::macros::{define_delete_handler, define_get_handler, define_list_fragment_renderer};
use crate::application::auth::AuthenticatedUser;
use crate::application::errors::{ApiError, AppError};
use crate::application::routes::support::{
FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
};
use crate::application::server::AppState;
use crate::domain::ids::RoasterId;
use crate::domain::listing::{ListRequest, SortDirection};
use crate::domain::roasters::{NewRoaster, Roaster, RoasterSortKey, UpdateRoaster};
use crate::infrastructure::ai::{self, ExtractionInput};
use crate::presentation::web::templates::RoasterListTemplate;
use crate::presentation::web::views::{ListNavigator, Paginated, RoasterView};
const ROASTER_PAGE_PATH: &str = "/data?type=roasters";
const ROASTER_FRAGMENT_PATH: &str = "/data?type=roasters#roaster-list";
#[tracing::instrument(skip(state))]
pub(super) async fn load_roaster_page(
state: &AppState,
request: ListRequest<RoasterSortKey>,
search: Option<&str>,
) -> Result<(Paginated<RoasterView>, ListNavigator<RoasterSortKey>), AppError> {
let page = state
.roaster_repo
.list(&request, search)
.await
.map_err(AppError::from)?;
Ok(crate::application::routes::support::build_page_view(
page,
request,
RoasterView::from,
ROASTER_PAGE_PATH,
ROASTER_FRAGMENT_PATH,
search.map(String::from),
))
}
#[tracing::instrument(skip(state))]
pub(crate) async fn list_roasters(
State(state): State<AppState>,
) -> Result<Json<Vec<Roaster>>, ApiError> {
let roasters = state
.roaster_repo
.list_all_sorted(RoasterSortKey::Name, SortDirection::Asc)
.await
.map_err(AppError::from)?;
Ok(Json(roasters))
}
#[tracing::instrument(skip(state, _auth_user, headers, query))]
pub(crate) async fn create_roaster(
State(state): State<AppState>,
_auth_user: AuthenticatedUser,
headers: HeaderMap,
Query(query): Query<ListQuery>,
payload: FlexiblePayload<NewRoaster>,
) -> Result<Response, ApiError> {
let (request, search) = query.into_request_and_search::<RoasterSortKey>();
let (new_roaster, source) = payload.into_parts();
let new_roaster = new_roaster.normalize();
let roaster = state
.roaster_repo
.insert(new_roaster)
.await
.map_err(AppError::from)?;
if is_datastar_request(&headers) {
render_roaster_list_fragment(state, request, search, true)
.await
.map_err(ApiError::from)
} else if matches!(source, PayloadSource::Form) {
let target = ListNavigator::new(ROASTER_PAGE_PATH, ROASTER_FRAGMENT_PATH, request, search)
.page_href(1);
Ok(Redirect::to(&target).into_response())
} else {
Ok((StatusCode::CREATED, Json(roaster)).into_response())
}
}
define_get_handler!(get_roaster, RoasterId, Roaster, roaster_repo);
#[tracing::instrument(skip(state, _auth_user))]
pub(crate) async fn update_roaster(
State(state): State<AppState>,
_auth_user: AuthenticatedUser,
Path(id): Path<RoasterId>,
Json(payload): Json<UpdateRoaster>,
) -> Result<Json<Roaster>, ApiError> {
let has_changes = payload.name.is_some()
|| payload.country.is_some()
|| payload.city.is_some()
|| payload.homepage.is_some();
if !has_changes {
return Err(AppError::validation("no changes provided").into());
}
let roaster = state
.roaster_repo
.update(id, payload)
.await
.map_err(AppError::from)?;
Ok(Json(roaster))
}
define_delete_handler!(
delete_roaster,
RoasterId,
RoasterSortKey,
roaster_repo,
render_roaster_list_fragment
);
#[tracing::instrument(skip(state, _auth_user, headers, payload))]
pub(crate) async fn extract_roaster(
State(state): State<AppState>,
_auth_user: AuthenticatedUser,
headers: HeaderMap,
payload: FlexiblePayload<ExtractionInput>,
) -> Result<Response, ApiError> {
let (input, _) = payload.into_parts();
let result = ai::extract_roaster(
&state.http_client,
&state.openrouter_api_key,
&state.openrouter_model,
&input,
)
.await
.map_err(ApiError::from)?;
if is_datastar_request(&headers) {
use serde_json::Value;
let signals = vec![
(
"_roaster-name",
Value::String(result.name.unwrap_or_default()),
),
(
"_roaster-country",
Value::String(result.country.unwrap_or_default()),
),
(
"_roaster-city",
Value::String(result.city.unwrap_or_default()),
),
(
"_roaster-homepage",
Value::String(result.homepage.unwrap_or_default()),
),
("_extracted", Value::Bool(true)),
];
crate::application::routes::support::render_signals_json(&signals).map_err(ApiError::from)
} else {
Ok(Json(result).into_response())
}
}
define_list_fragment_renderer!(
render_roaster_list_fragment,
RoasterSortKey,
load_roaster_page,
RoasterListTemplate { roasters },
"#roaster-list"
);