Return account details.

This commit is contained in:
2026-09-27 11:50:59 +02:00
parent 26a370aa31
commit 406f30ef80
7 changed files with 239 additions and 33 deletions
+57 -9
View File
@@ -1,3 +1,5 @@
use std::collections::{HashMap, HashSet};
use axum::{extract::State, http::StatusCode};
use chrono::{DateTime, Utc};
use serde::Deserialize;
@@ -14,6 +16,7 @@ use crate::{
domain,
error::AppError,
repository::{
RepositoryError, accounts as account_repository,
dtos::{Delete, Upsert},
recurring_transactions as repository,
},
@@ -55,13 +58,19 @@ async fn list_scheduled_transactions(
Query(query): Query<QueryParams>,
) -> Result<Json<Vec<ScheduledTransactionResponse>>, AppError> {
let now = Utc::now();
let transactions = repository::query(&pool, query.try_into()?)
.await?
let query = query.try_into()?;
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
let transactions = repository::query(&mut *tx, query).await?;
let accounts = get_accounts_for_transactions(&mut tx, &transactions).await?;
tx.commit().await.map_err(RepositoryError::from)?;
let responses = transactions
.into_iter()
.map(|transaction| create_response(transaction, now))
.map(|transaction| create_response(transaction, &accounts, now))
.collect();
Ok(Json(transactions))
Ok(Json(responses))
}
#[axum::debug_handler]
@@ -70,11 +79,15 @@ async fn get_scheduled_transaction(
State(pool): State<PgPool>,
Path(id): Path<Uuid>,
) -> Result<Json<ScheduledTransactionResponse>, AppError> {
let transaction = repository::get(&pool, id)
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
let transaction = repository::get(&mut *tx, id)
.await?
.ok_or(AppError::NotFound)?;
let accounts =
get_accounts_for_transactions(&mut tx, std::slice::from_ref(&transaction)).await?;
tx.commit().await.map_err(RepositoryError::from)?;
Ok(Json(create_response(transaction, Utc::now())))
Ok(Json(create_response(transaction, &accounts, Utc::now())))
}
#[axum::debug_handler]
@@ -87,12 +100,19 @@ async fn upsert_scheduled_transaction(
let ScheduledTransactionRequest::Recurring(transaction) = transaction;
let transaction = transaction.into_domain(id)?;
let (status, transaction) = match repository::upsert(&pool, transaction).await? {
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
let (status, transaction) = match repository::upsert(&mut *tx, transaction).await? {
Upsert::Created(transaction) => (StatusCode::CREATED, transaction),
Upsert::Updated(transaction) => (StatusCode::OK, transaction),
};
let accounts =
get_accounts_for_transactions(&mut tx, std::slice::from_ref(&transaction)).await?;
tx.commit().await.map_err(RepositoryError::from)?;
Ok((status, Json(create_response(transaction, Utc::now()))))
Ok((
status,
Json(create_response(transaction, &accounts, Utc::now())),
))
}
#[axum::debug_handler]
@@ -107,11 +127,39 @@ async fn delete_scheduled_transaction(
}
}
async fn get_accounts_for_transactions(
connection: &mut sqlx::PgConnection,
transactions: &[domain::RecurringTransaction],
) -> Result<HashMap<Uuid, domain::Account>, AppError> {
let account_ids = transactions
.iter()
.flat_map(|transaction| {
[
transaction.source_account_id,
transaction.destination_account_id,
]
})
.flatten()
.collect::<HashSet<_>>()
.into_iter()
.collect::<Vec<_>>();
Ok(account_repository::get_by_ids(connection, &account_ids).await?)
}
fn create_response(
transaction: domain::RecurringTransaction,
accounts: &HashMap<Uuid, domain::Account>,
now: DateTime<Utc>,
) -> ScheduledTransactionResponse {
let source_account = transaction
.source_account_id
.and_then(|id| accounts.get(&id).cloned());
let destination_account = transaction
.destination_account_id
.and_then(|id| accounts.get(&id).cloned());
let next = transaction.schedule.next_occurrence(now);
RecurringTransactionResponse::new(transaction, next).into()
RecurringTransactionResponse::new(transaction, source_account, destination_account, next).into()
}