From 5f4c9bdf90d8f70c0be07ecbb37faae57920568e Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 27 Sep 2026 10:02:30 +0200 Subject: [PATCH] Some more cleanup. --- server/src/domain.rs | 12 ++++------ server/src/error.rs | 4 ++-- server/src/routes.rs | 26 ++++++++++----------- server/src/routes/scheduled_transactions.rs | 8 +++---- server/src/routes/transactions.rs | 8 +++---- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/server/src/domain.rs b/server/src/domain.rs index c7a2462..a6fdded 100644 --- a/server/src/domain.rs +++ b/server/src/domain.rs @@ -4,13 +4,11 @@ mod recurring_transaction; mod schedule; mod transaction; -pub use cents::{Cents, CentsError}; -pub use direction::Direction; -pub use recurring_transaction::RecurringTransaction; -pub use schedule::{ - Recurrence, RecurrenceInterval, RecurrenceUnit, Schedule, ScheduleError, WeekendAdjustment, -}; -pub use transaction::Transaction; +pub use cents::*; +pub use direction::*; +pub use recurring_transaction::*; +pub use schedule::*; +pub use transaction::*; #[derive(Debug, thiserror::Error)] pub enum DomainError { diff --git a/server/src/error.rs b/server/src/error.rs index 417b351..288eae9 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -48,7 +48,7 @@ impl IntoResponse for AppError { } #[derive(serde::Serialize)] -pub struct ErrorResponse { +struct ErrorResponse { pub message: String, } @@ -60,6 +60,6 @@ impl ErrorResponse { } } -pub fn error_response(status_code: StatusCode, message: impl Into) -> Response { +fn error_response(status_code: StatusCode, message: impl Into) -> Response { (status_code, axum::Json(ErrorResponse::new(message))).into_response() } diff --git a/server/src/routes.rs b/server/src/routes.rs index 14b5faf..de24aa7 100644 --- a/server/src/routes.rs +++ b/server/src/routes.rs @@ -1,3 +1,5 @@ +use axum::{http::StatusCode, routing::get}; + use crate::error::AppError; pub mod dtos; @@ -6,20 +8,16 @@ pub mod scheduled_transactions; pub mod transactions; pub fn create_router(pool: sqlx::PgPool) -> axum::Router { + let scheduled_transactions = scheduled_transactions::create_router(); + let transactions = transactions::create_router(); + + let api = axum::Router::new() + .nest("/scheduled-transactions", scheduled_transactions) + .nest("/transactions", transactions); + axum::Router::new() - .nest( - "/api", - axum::Router::new() - .nest( - "/scheduled-transactions", - scheduled_transactions::create_router(), - ) - .nest("/transactions", transactions::create_router()), - ) - .fallback(handle_fallback) + .nest("/api", api) + .route("/health", get(async || StatusCode::NO_CONTENT)) + .fallback(async || AppError::NotFound) .with_state(pool) } - -async fn handle_fallback() -> AppError { - AppError::NotFound -} diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 94c9ba9..c202a9a 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -21,11 +21,11 @@ use crate::{ pub fn create_router() -> axum::Router { axum::Router::new() - .route("/", axum::routing::get(get_scheduled_transactions)) + .route("/", axum::routing::get(query_scheduled_transactions)) .route( "/{id}", axum::routing::get(get_scheduled_transaction) - .put(put_scheduled_transaction) + .put(upsert_scheduled_transaction) .delete(delete_scheduled_transaction), ) } @@ -49,7 +49,7 @@ impl TryFrom for repository::Query { #[axum::debug_handler] #[tracing::instrument(skip(pool))] -async fn get_scheduled_transactions( +async fn query_scheduled_transactions( State(pool): State, Query(query): Query, ) -> Result>, AppError> { @@ -78,7 +78,7 @@ async fn get_scheduled_transaction( #[axum::debug_handler] #[tracing::instrument(skip(pool, transaction))] -async fn put_scheduled_transaction( +async fn upsert_scheduled_transaction( State(pool): State, Path(id): Path, Json(transaction): Json, diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index 536565a..9036dd8 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -17,11 +17,11 @@ use crate::{ pub fn create_router() -> axum::Router { axum::Router::new() - .route("/", axum::routing::get(get_transactions)) + .route("/", axum::routing::get(query_transactions)) .route( "/{id}", axum::routing::get(get_transaction) - .put(put_transaction) + .put(upsert_transaction) .delete(delete_transaction), ) } @@ -45,7 +45,7 @@ impl TryFrom for repository::Query { #[axum::debug_handler] #[tracing::instrument(skip(pool))] -async fn get_transactions( +async fn query_transactions( State(pool): State, Query(query): Query, ) -> Result>, AppError> { @@ -73,7 +73,7 @@ async fn get_transaction( #[axum::debug_handler] #[tracing::instrument(skip(pool, transaction))] -async fn put_transaction( +async fn upsert_transaction( State(pool): State, Path(id): Path, Json(transaction): Json,