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.
This commit is contained in:
parent
f25101eef4
commit
b4a885e990
9 changed files with 37 additions and 43 deletions
|
|
@ -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<BagView>,
|
||||
pub(in crate::application::routes) navigator: ListNavigator<BagSortKey>,
|
||||
pub(crate) struct BagPageData {
|
||||
pub(crate) bags: Paginated<BagView>,
|
||||
pub(crate) navigator: ListNavigator<BagSortKey>,
|
||||
}
|
||||
|
||||
#[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<BagSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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<BrewView>,
|
||||
pub(in crate::application::routes) navigator: ListNavigator<BrewSortKey>,
|
||||
pub(crate) struct BrewPageData {
|
||||
pub(crate) brews: Paginated<BrewView>,
|
||||
pub(crate) navigator: ListNavigator<BrewSortKey>,
|
||||
}
|
||||
|
||||
pub(in crate::application::routes) struct BrewFormData {
|
||||
pub(in crate::application::routes) bag_options: Vec<BagOptionView>,
|
||||
pub(in crate::application::routes) grinder_options: Vec<GearOptionView>,
|
||||
pub(in crate::application::routes) brewer_options: Vec<GearOptionView>,
|
||||
pub(in crate::application::routes) filter_paper_options: Vec<GearOptionView>,
|
||||
pub(in crate::application::routes) defaults: BrewDefaultsView,
|
||||
pub(crate) struct BrewFormData {
|
||||
pub(crate) bag_options: Vec<BagOptionView>,
|
||||
pub(crate) grinder_options: Vec<GearOptionView>,
|
||||
pub(crate) brewer_options: Vec<GearOptionView>,
|
||||
pub(crate) filter_paper_options: Vec<GearOptionView>,
|
||||
pub(crate) defaults: BrewDefaultsView,
|
||||
}
|
||||
|
||||
pub(in crate::application::routes) async fn load_brew_form_data(
|
||||
state: &AppState,
|
||||
) -> Result<BrewFormData, AppError> {
|
||||
pub(crate) async fn load_brew_form_data(state: &AppState) -> Result<BrewFormData, AppError> {
|
||||
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<GearSortKey>,
|
||||
|
|
@ -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<BrewSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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<CafeSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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<CupSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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<GearSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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};
|
||||
|
|
|
|||
|
|
@ -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<RoasterSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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<RoastSortKey>,
|
||||
search: Option<&str>,
|
||||
|
|
|
|||
|
|
@ -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<Vec<RoasterOptionView>, 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<Vec<RoastOptionView>, AppError> {
|
||||
pub(crate) async fn load_roast_options(state: &AppState) -> Result<Vec<RoastOptionView>, 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<Vec<CafeOptionView>, AppError> {
|
||||
pub(crate) async fn load_cafe_options(state: &AppState) -> Result<Vec<CafeOptionView>, AppError> {
|
||||
use crate::domain::cafes::CafeSortKey;
|
||||
let cafes = state
|
||||
.cafe_repo
|
||||
|
|
|
|||
Loading…
Reference in a new issue