From 7cdd9bd74d8ba099ad8acd9afda958dca677d40b Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 27 Sep 2026 11:58:33 +0200 Subject: [PATCH] Deduplicated AccountRequest and AccountResponse. --- server/src/routes/accounts.rs | 2 +- server/src/routes/dtos.rs | 13 +++---- .../src/routes/dtos/scheduled_transaction.rs | 34 ++++++------------- server/src/routes/dtos/transaction.rs | 2 +- server/src/routes/scheduled_transactions.rs | 2 +- server/src/routes/transactions.rs | 2 +- 6 files changed, 19 insertions(+), 36 deletions(-) diff --git a/server/src/routes/accounts.rs b/server/src/routes/accounts.rs index 0d130d1..c08cf73 100644 --- a/server/src/routes/accounts.rs +++ b/server/src/routes/accounts.rs @@ -4,7 +4,7 @@ use sqlx::PgPool; use uuid::Uuid; use super::{ - dtos::{AccountRequest, AccountResponse}, + dtos::account::{AccountRequest, AccountResponse}, extractors::{json::Json, path::Path, query::Query}, }; use crate::{ diff --git a/server/src/routes/dtos.rs b/server/src/routes/dtos.rs index a3f8d44..790a204 100644 --- a/server/src/routes/dtos.rs +++ b/server/src/routes/dtos.rs @@ -1,9 +1,4 @@ -mod account; -mod direction; -mod scheduled_transaction; -mod transaction; - -pub use account::*; -pub use direction::*; -pub use scheduled_transaction::*; -pub use transaction::*; +pub mod account; +pub mod direction; +pub mod scheduled_transaction; +pub mod transaction; diff --git a/server/src/routes/dtos/scheduled_transaction.rs b/server/src/routes/dtos/scheduled_transaction.rs index 77c253e..50ee0b5 100644 --- a/server/src/routes/dtos/scheduled_transaction.rs +++ b/server/src/routes/dtos/scheduled_transaction.rs @@ -2,7 +2,7 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use super::Direction; +use super::direction::Direction; use crate::domain; #[derive(Debug, Clone, Deserialize)] @@ -30,8 +30,8 @@ pub struct RecurringTransactionRequest { pub name: String, pub amount_cents: u64, pub direction: Direction, - pub source_account: Option, - pub destination_account: Option, + pub source_account: Option, + pub destination_account: Option, pub schedule: ScheduleRequest, } @@ -68,8 +68,8 @@ pub struct RecurringTransactionResponse { pub name: String, pub amount_cents: u64, pub direction: Direction, - pub source_account: Option, - pub destination_account: Option, + pub source_account: Option, + pub destination_account: Option, pub schedule: ScheduleResponse, } @@ -85,11 +85,11 @@ impl RecurringTransactionResponse { name: transaction.name, amount_cents: transaction.amount.get(), direction: transaction.direction.into(), - source_account: source_account.map(|account| SourceAccountResponse { + source_account: source_account.map(|account| AccountResponse { id: account.id, name: account.name, }), - destination_account: destination_account.map(|account| DestinationAccountResponse { + destination_account: destination_account.map(|account| AccountResponse { id: account.id, name: account.name, }), @@ -99,23 +99,12 @@ impl RecurringTransactionResponse { } #[derive(Debug, Clone, Deserialize)] -pub struct SourceAccountRequest { +pub struct AccountRequest { pub id: Uuid, } #[derive(Debug, Clone, Serialize)] -pub struct SourceAccountResponse { - pub id: Uuid, - pub name: String, -} - -#[derive(Debug, Clone, Deserialize)] -pub struct DestinationAccountRequest { - pub id: Uuid, -} - -#[derive(Debug, Clone, Serialize)] -pub struct DestinationAccountResponse { +pub struct AccountResponse { pub id: Uuid, pub name: String, } @@ -293,9 +282,8 @@ mod tests { let source_id = Uuid::new_v4(); let destination_id = Uuid::new_v4(); let mut transaction = request(1234); - transaction.source_account = Some(super::SourceAccountRequest { id: source_id }); - transaction.destination_account = - Some(super::DestinationAccountRequest { id: destination_id }); + transaction.source_account = Some(super::AccountRequest { id: source_id }); + transaction.destination_account = Some(super::AccountRequest { id: destination_id }); let transaction = transaction.into_domain(Uuid::nil()).unwrap(); let source_account = Some(domain::Account { id: source_id, diff --git a/server/src/routes/dtos/transaction.rs b/server/src/routes/dtos/transaction.rs index 92338ec..64248d5 100644 --- a/server/src/routes/dtos/transaction.rs +++ b/server/src/routes/dtos/transaction.rs @@ -2,7 +2,7 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use super::Direction; +use super::direction::Direction; use crate::domain; #[derive(Debug, Clone, Deserialize)] diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 1d35b65..4734dbf 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -7,7 +7,7 @@ use sqlx::PgPool; use uuid::Uuid; use super::{ - dtos::{ + dtos::scheduled_transaction::{ RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse, }, extractors::{json::Json, path::Path, query::Query}, diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index cc1ea5b..a89917e 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -4,7 +4,7 @@ use sqlx::PgPool; use uuid::Uuid; use super::{ - dtos::{TransactionRequest, TransactionResponse}, + dtos::transaction::{TransactionRequest, TransactionResponse}, extractors::{json::Json, path::Path, query::Query}, }; use crate::{