From b4a885e99071c6fe7a89f9be1d0770aa3951d859 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 5 Feb 2026 19:08:44 +0000 Subject: [PATCH] refactor(routes): simplify visibility to pub(crate) Replace verbose pub(in crate::application::routes) with pub(crate) across all api/ modules and support.rs for readability. --- src/application/routes/api/bags.rs | 8 ++++---- src/application/routes/api/brews.rs | 26 ++++++++++++-------------- src/application/routes/api/cafes.rs | 2 +- src/application/routes/api/cups.rs | 2 +- src/application/routes/api/gear.rs | 2 +- src/application/routes/api/mod.rs | 26 +++++++++++++------------- src/application/routes/api/roasters.rs | 2 +- src/application/routes/api/roasts.rs | 2 +- src/application/routes/support.rs | 10 +++------- 9 files changed, 37 insertions(+), 43 deletions(-) diff --git a/src/application/routes/api/bags.rs b/src/application/routes/api/bags.rs index 1f55210..3388273 100644 --- a/src/application/routes/api/bags.rs +++ b/src/application/routes/api/bags.rs @@ -22,13 +22,13 @@ use crate::presentation::web::views::{BagView, ListNavigator, Paginated}; const BAG_PAGE_PATH: &str = "/data?type=bags"; const BAG_FRAGMENT_PATH: &str = "/data?type=bags#bag-list"; -pub(in crate::application::routes) struct BagPageData { - pub(in crate::application::routes) bags: Paginated, - pub(in crate::application::routes) navigator: ListNavigator, +pub(crate) struct BagPageData { + pub(crate) bags: Paginated, + pub(crate) navigator: ListNavigator, } #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_bag_page( +pub(crate) async fn load_bag_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/api/brews.rs b/src/application/routes/api/brews.rs index 7857b54..0ac8b3e 100644 --- a/src/application/routes/api/brews.rs +++ b/src/application/routes/api/brews.rs @@ -26,22 +26,20 @@ use crate::presentation::web::views::{ const BREW_PAGE_PATH: &str = "/data?type=brews"; const BREW_FRAGMENT_PATH: &str = "/data?type=brews#brew-list"; -pub(in crate::application::routes) struct BrewPageData { - pub(in crate::application::routes) brews: Paginated, - pub(in crate::application::routes) navigator: ListNavigator, +pub(crate) struct BrewPageData { + pub(crate) brews: Paginated, + pub(crate) navigator: ListNavigator, } -pub(in crate::application::routes) struct BrewFormData { - pub(in crate::application::routes) bag_options: Vec, - pub(in crate::application::routes) grinder_options: Vec, - pub(in crate::application::routes) brewer_options: Vec, - pub(in crate::application::routes) filter_paper_options: Vec, - pub(in crate::application::routes) defaults: BrewDefaultsView, +pub(crate) struct BrewFormData { + pub(crate) bag_options: Vec, + pub(crate) grinder_options: Vec, + pub(crate) brewer_options: Vec, + pub(crate) filter_paper_options: Vec, + pub(crate) defaults: BrewDefaultsView, } -pub(in crate::application::routes) async fn load_brew_form_data( - state: &AppState, -) -> Result { +pub(crate) async fn load_brew_form_data(state: &AppState) -> Result { let open_bags_request = ListRequest::show_all( crate::domain::bags::BagSortKey::RoastDate, SortDirection::Desc, @@ -91,7 +89,7 @@ pub(in crate::application::routes) async fn load_brew_form_data( }) } -pub(in crate::application::routes) async fn load_gear_options( +pub(crate) async fn load_gear_options( state: &AppState, category: GearCategory, request: &ListRequest, @@ -105,7 +103,7 @@ pub(in crate::application::routes) async fn load_gear_options( } #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_brew_page( +pub(crate) async fn load_brew_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/api/cafes.rs b/src/application/routes/api/cafes.rs index 31b6ff6..ff9a179 100644 --- a/src/application/routes/api/cafes.rs +++ b/src/application/routes/api/cafes.rs @@ -23,7 +23,7 @@ const CAFE_PAGE_PATH: &str = "/data?type=cafes"; const CAFE_FRAGMENT_PATH: &str = "/data?type=cafes#cafe-list"; #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_cafe_page( +pub(crate) async fn load_cafe_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/api/cups.rs b/src/application/routes/api/cups.rs index ed59a78..9c1f885 100644 --- a/src/application/routes/api/cups.rs +++ b/src/application/routes/api/cups.rs @@ -23,7 +23,7 @@ const CUP_PAGE_PATH: &str = "/data?type=cups"; const CUP_FRAGMENT_PATH: &str = "/data?type=cups#cup-list"; #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_cup_page( +pub(crate) async fn load_cup_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/api/gear.rs b/src/application/routes/api/gear.rs index dc31be4..7f438a9 100644 --- a/src/application/routes/api/gear.rs +++ b/src/application/routes/api/gear.rs @@ -25,7 +25,7 @@ const GEAR_PAGE_PATH: &str = "/data?type=gear"; const GEAR_FRAGMENT_PATH: &str = "/data?type=gear#gear-list"; #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_gear_page( +pub(crate) async fn load_gear_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/api/mod.rs b/src/application/routes/api/mod.rs index 8af521d..b2e3a01 100644 --- a/src/application/routes/api/mod.rs +++ b/src/application/routes/api/mod.rs @@ -1,17 +1,17 @@ -pub(in crate::application::routes) mod account; -pub(in crate::application::routes) mod backup; -pub(in crate::application::routes) mod bags; -pub(in crate::application::routes) mod brews; -pub(in crate::application::routes) mod cafes; -pub(in crate::application::routes) mod checkin; -pub(in crate::application::routes) mod cups; -pub(in crate::application::routes) mod gear; +pub(crate) mod account; +pub(crate) mod backup; +pub(crate) mod bags; +pub(crate) mod brews; +pub(crate) mod cafes; +pub(crate) mod checkin; +pub(crate) mod cups; +pub(crate) mod gear; mod macros; -pub(in crate::application::routes) mod roasters; -pub(in crate::application::routes) mod roasts; -pub(in crate::application::routes) mod scan; -pub(in crate::application::routes) mod tokens; -pub(in crate::application::routes) mod webauthn; +pub(crate) mod roasters; +pub(crate) mod roasts; +pub(crate) mod scan; +pub(crate) mod tokens; +pub(crate) mod webauthn; use axum::extract::DefaultBodyLimit; use axum::routing::{get, post}; diff --git a/src/application/routes/api/roasters.rs b/src/application/routes/api/roasters.rs index b6c1ff0..7289923 100644 --- a/src/application/routes/api/roasters.rs +++ b/src/application/routes/api/roasters.rs @@ -22,7 +22,7 @@ const ROASTER_PAGE_PATH: &str = "/data?type=roasters"; const ROASTER_FRAGMENT_PATH: &str = "/data?type=roasters#roaster-list"; #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_roaster_page( +pub(crate) async fn load_roaster_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/api/roasts.rs b/src/application/routes/api/roasts.rs index cc50972..e12e286 100644 --- a/src/application/routes/api/roasts.rs +++ b/src/application/routes/api/roasts.rs @@ -25,7 +25,7 @@ const ROAST_PAGE_PATH: &str = "/data?type=roasts"; const ROAST_FRAGMENT_PATH: &str = "/data?type=roasts#roast-list"; #[tracing::instrument(skip(state))] -pub(in crate::application::routes) async fn load_roast_page( +pub(crate) async fn load_roast_page( state: &AppState, request: ListRequest, search: Option<&str>, diff --git a/src/application/routes/support.rs b/src/application/routes/support.rs index 889654c..337e347 100644 --- a/src/application/routes/support.rs +++ b/src/application/routes/support.rs @@ -215,7 +215,7 @@ where } } -pub(in crate::application::routes) async fn load_roaster_options( +pub(crate) async fn load_roaster_options( state: &AppState, ) -> Result, AppError> { use crate::domain::roasters::RoasterSortKey; @@ -227,16 +227,12 @@ pub(in crate::application::routes) async fn load_roaster_options( Ok(roasters.into_iter().map(RoasterOptionView::from).collect()) } -pub(in crate::application::routes) async fn load_roast_options( - state: &AppState, -) -> Result, AppError> { +pub(crate) async fn load_roast_options(state: &AppState) -> Result, AppError> { let roasts = state.roast_repo.list_all().await.map_err(AppError::from)?; Ok(roasts.into_iter().map(RoastOptionView::from).collect()) } -pub(in crate::application::routes) async fn load_cafe_options( - state: &AppState, -) -> Result, AppError> { +pub(crate) async fn load_cafe_options(state: &AppState) -> Result, AppError> { use crate::domain::cafes::CafeSortKey; let cafes = state .cafe_repo