diff --git a/server/src/error.rs b/server/src/error.rs index 82ae280..61ef84e 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -36,18 +36,24 @@ pub enum AppError { impl IntoResponse for AppError { fn into_response(self) -> Response { match self { - Self::NotFound => return StatusCode::NOT_FOUND.into_response(), + Self::NotFound => { + return StatusCode::NOT_FOUND.into_response(); + } Self::ScheduledTransactionValidation(error) => { return (StatusCode::UNPROCESSABLE_ENTITY, error.to_string()).into_response(); } - Self::Database(error) => tracing::error!(%error, "Database query failed"), + Self::Database(error) => { + tracing::error!(%error, "Database query failed"); + } Self::Direction(error) => { tracing::error!(%error, "Invalid transaction direction") } Self::RecurringTransaction(error) => { tracing::error!(%error, "Invalid recurring transaction data") } - Self::Transaction(error) => tracing::error!(%error, "Invalid transaction data"), + Self::Transaction(error) => { + tracing::error!(%error, "Invalid transaction data"); + } } (StatusCode::INTERNAL_SERVER_ERROR, "Internal server error").into_response() diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 3befe46..47f28a8 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -102,8 +102,8 @@ async fn delete_scheduled_transaction( State(pool): State, Path(id): Path, ) -> Result { - Ok(match delete_scheduled_transaction_by_id(&pool, id).await? { - Delete::Deleted => StatusCode::NO_CONTENT, - Delete::NotFound => StatusCode::NOT_FOUND, - }) + match delete_scheduled_transaction_by_id(&pool, id).await? { + Delete::Deleted => Ok(StatusCode::NO_CONTENT), + Delete::NotFound => Err(AppError::NotFound), + } }