Refactored src and dst account to just account in preparation for a "counter party", instead of a full account.

This commit is contained in:
2026-10-03 20:33:13 +02:00
parent 221c38d364
commit 896b192c01
29 changed files with 535 additions and 422 deletions
+52 -10
View File
@@ -1,3 +1,5 @@
use std::collections::{HashMap, HashSet};
use axum::{extract::State, http::StatusCode};
use serde::Deserialize;
use sqlx::PgPool;
@@ -8,8 +10,10 @@ use super::{
extractors::{json::Json, path::Path, query::Query},
};
use crate::{
domain,
error::AppError,
repository::{
RepositoryError, accounts as account_repository,
dtos::{Delete, Upsert},
transactions as repository,
},
@@ -50,13 +54,17 @@ async fn list_transactions(
State(pool): State<PgPool>,
Query(query): Query<QueryParams>,
) -> Result<Json<Vec<TransactionResponse>>, AppError> {
let transactions = repository::list(&pool, query.try_into()?)
.await?
.into_iter()
.map(TransactionResponse::from)
.collect();
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
let transactions = repository::list(&mut *tx, query.try_into()?).await?;
let accounts = get_accounts_for_transactions(&mut tx, &transactions).await?;
tx.commit().await.map_err(RepositoryError::from)?;
Ok(Json(transactions))
let responses = transactions
.into_iter()
.map(|transaction| create_response(transaction, &accounts))
.collect::<Result<Vec<_>, _>>()?;
Ok(Json(responses))
}
#[axum::debug_handler]
@@ -65,11 +73,15 @@ async fn get_transaction(
State(pool): State<PgPool>,
Path(id): Path<Uuid>,
) -> Result<Json<TransactionResponse>, 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(transaction.into()))
Ok(Json(create_response(transaction, &accounts)?))
}
#[axum::debug_handler]
@@ -81,12 +93,16 @@ async fn upsert_transaction(
) -> Result<(StatusCode, Json<TransactionResponse>), AppError> {
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(transaction.into())))
Ok((status, Json(create_response(transaction, &accounts)?)))
}
#[axum::debug_handler]
@@ -100,3 +116,29 @@ async fn delete_transaction(
Delete::NotFound => Err(AppError::NotFound),
}
}
async fn get_accounts_for_transactions(
connection: &mut sqlx::PgConnection,
transactions: &[domain::Transaction],
) -> Result<HashMap<Uuid, domain::Account>, AppError> {
let account_ids = transactions
.iter()
.map(|transaction| transaction.account_id)
.collect::<HashSet<_>>()
.into_iter()
.collect::<Vec<_>>();
Ok(account_repository::get_by_ids(connection, &account_ids).await?)
}
fn create_response(
transaction: domain::Transaction,
accounts: &HashMap<Uuid, domain::Account>,
) -> Result<TransactionResponse, AppError> {
let account = accounts
.get(&transaction.account_id)
.cloned()
.ok_or(AppError::Internal)?;
Ok(TransactionResponse::new(transaction, account))
}