Slight polishing.

This commit is contained in:
2026-10-12 14:04:59 +02:00
parent 945ae46dbe
commit 29fcf284be
5 changed files with 37 additions and 13 deletions
+3
View File
@@ -32,6 +32,9 @@ pub enum AppError {
#[error("not found")] #[error("not found")]
NotFound, NotFound,
#[error("race condition occurred")]
RaceCondition,
#[error("unknown")] #[error("unknown")]
Unknown, Unknown,
+11 -4
View File
@@ -74,7 +74,10 @@ async fn get_account_member(
repository::account_members::get_by_id(&pool, auth.user_id(), account_id, member_id) repository::account_members::get_by_id(&pool, auth.user_id(), account_id, member_id)
.await? .await?
.ok_or(AppError::NotFound)?; .ok_or(AppError::NotFound)?;
let users = get_users_for_account_members(&pool, std::slice::from_ref(&member)).await?; let users = repository::users::get_by_id(&pool, member.user_id)
.await?
.map(|user| HashMap::from([(user.id, user)]))
.ok_or(AppError::RaceCondition)?; // User should exist!
Ok(Json(create_response(member, &users)?)) Ok(Json(create_response(member, &users)?))
} }
@@ -103,9 +106,13 @@ async fn upsert_account_member(
StatusCode::CREATED StatusCode::CREATED
}; };
let users = HashMap::from([(user.id, user)]); Ok((
status,
Ok((status, Json(create_response(upserted.current, &users)?))) Json(create_response(
upserted.current,
&HashMap::from([(user.id, user)]),
)?),
))
} }
#[axum::debug_handler] #[axum::debug_handler]
+1
View File
@@ -53,6 +53,7 @@ impl ClientError for AppError {
"Invalid client credentials".into(), "Invalid client credentials".into(),
), ),
Self::InvalidRefreshToken => (StatusCode::UNAUTHORIZED, "Invalid refresh token".into()), Self::InvalidRefreshToken => (StatusCode::UNAUTHORIZED, "Invalid refresh token".into()),
Self::RaceCondition => (StatusCode::CONFLICT, "Try again".into()),
Self::NotFound => (StatusCode::NOT_FOUND, "Not found".into()), Self::NotFound => (StatusCode::NOT_FOUND, "Not found".into()),
Self::Domain(error) => error.client_response(), Self::Domain(error) => error.client_response(),
Self::Extractor(error) => error.client_response(), Self::Extractor(error) => error.client_response(),
+8 -3
View File
@@ -68,10 +68,15 @@ async fn get_scheduled_transaction(
let transaction = repository::recurring_transactions::get_by_id(&pool, user_id, id) let transaction = repository::recurring_transactions::get_by_id(&pool, user_id, id)
.await? .await?
.ok_or(AppError::NotFound)?; .ok_or(AppError::NotFound)?;
let accounts = let account = repository::accounts::get_by_id(&pool, user_id, transaction.account_id)
get_accounts_for_transactions(&pool, user_id, std::slice::from_ref(&transaction)).await?; .await?
.ok_or(AppError::RaceCondition)?; // Account should exist!
Ok(Json(create_response(transaction, &accounts, Utc::now())?)) Ok(Json(create_response(
transaction,
&HashMap::from([(account.id, account)]),
Utc::now(),
)?))
} }
#[axum::debug_handler] #[axum::debug_handler]
+14 -6
View File
@@ -65,10 +65,14 @@ async fn get_transaction(
let transaction = repository::transactions::get_by_id(&pool, user_id, id) let transaction = repository::transactions::get_by_id(&pool, user_id, id)
.await? .await?
.ok_or(AppError::NotFound)?; .ok_or(AppError::NotFound)?;
let accounts = let account = repository::accounts::get_by_id(&pool, user_id, transaction.account_id)
get_accounts_for_transactions(&pool, user_id, std::slice::from_ref(&transaction)).await?; .await?
.ok_or(AppError::RaceCondition)?; // Account should exist!
Ok(Json(create_response(transaction, &accounts)?)) Ok(Json(create_response(
transaction,
&HashMap::from([(account.id, account)]),
)?))
} }
#[axum::debug_handler] #[axum::debug_handler]
@@ -95,9 +99,13 @@ async fn upsert_transaction(
StatusCode::CREATED StatusCode::CREATED
}; };
let accounts = HashMap::from([(account.id, account)]); Ok((
status,
Ok((status, Json(create_response(upserted.current, &accounts)?))) Json(create_response(
upserted.current,
&HashMap::from([(account.id, account)]),
)?),
))
} }
#[axum::debug_handler] #[axum::debug_handler]