Deduplicated AccountRequest and AccountResponse.

This commit is contained in:
2026-09-27 11:58:33 +02:00
parent 406f30ef80
commit 7cdd9bd74d
6 changed files with 19 additions and 36 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ use sqlx::PgPool;
use uuid::Uuid; use uuid::Uuid;
use super::{ use super::{
dtos::{AccountRequest, AccountResponse}, dtos::account::{AccountRequest, AccountResponse},
extractors::{json::Json, path::Path, query::Query}, extractors::{json::Json, path::Path, query::Query},
}; };
use crate::{ use crate::{
+4 -9
View File
@@ -1,9 +1,4 @@
mod account; pub mod account;
mod direction; pub mod direction;
mod scheduled_transaction; pub mod scheduled_transaction;
mod transaction; pub mod transaction;
pub use account::*;
pub use direction::*;
pub use scheduled_transaction::*;
pub use transaction::*;
+11 -23
View File
@@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use uuid::Uuid; use uuid::Uuid;
use super::Direction; use super::direction::Direction;
use crate::domain; use crate::domain;
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
@@ -30,8 +30,8 @@ pub struct RecurringTransactionRequest {
pub name: String, pub name: String,
pub amount_cents: u64, pub amount_cents: u64,
pub direction: Direction, pub direction: Direction,
pub source_account: Option<SourceAccountRequest>, pub source_account: Option<AccountRequest>,
pub destination_account: Option<DestinationAccountRequest>, pub destination_account: Option<AccountRequest>,
pub schedule: ScheduleRequest, pub schedule: ScheduleRequest,
} }
@@ -68,8 +68,8 @@ pub struct RecurringTransactionResponse {
pub name: String, pub name: String,
pub amount_cents: u64, pub amount_cents: u64,
pub direction: Direction, pub direction: Direction,
pub source_account: Option<SourceAccountResponse>, pub source_account: Option<AccountResponse>,
pub destination_account: Option<DestinationAccountResponse>, pub destination_account: Option<AccountResponse>,
pub schedule: ScheduleResponse, pub schedule: ScheduleResponse,
} }
@@ -85,11 +85,11 @@ impl RecurringTransactionResponse {
name: transaction.name, name: transaction.name,
amount_cents: transaction.amount.get(), amount_cents: transaction.amount.get(),
direction: transaction.direction.into(), direction: transaction.direction.into(),
source_account: source_account.map(|account| SourceAccountResponse { source_account: source_account.map(|account| AccountResponse {
id: account.id, id: account.id,
name: account.name, name: account.name,
}), }),
destination_account: destination_account.map(|account| DestinationAccountResponse { destination_account: destination_account.map(|account| AccountResponse {
id: account.id, id: account.id,
name: account.name, name: account.name,
}), }),
@@ -99,23 +99,12 @@ impl RecurringTransactionResponse {
} }
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
pub struct SourceAccountRequest { pub struct AccountRequest {
pub id: Uuid, pub id: Uuid,
} }
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct SourceAccountResponse { pub struct AccountResponse {
pub id: Uuid,
pub name: String,
}
#[derive(Debug, Clone, Deserialize)]
pub struct DestinationAccountRequest {
pub id: Uuid,
}
#[derive(Debug, Clone, Serialize)]
pub struct DestinationAccountResponse {
pub id: Uuid, pub id: Uuid,
pub name: String, pub name: String,
} }
@@ -293,9 +282,8 @@ mod tests {
let source_id = Uuid::new_v4(); let source_id = Uuid::new_v4();
let destination_id = Uuid::new_v4(); let destination_id = Uuid::new_v4();
let mut transaction = request(1234); let mut transaction = request(1234);
transaction.source_account = Some(super::SourceAccountRequest { id: source_id }); transaction.source_account = Some(super::AccountRequest { id: source_id });
transaction.destination_account = transaction.destination_account = Some(super::AccountRequest { id: destination_id });
Some(super::DestinationAccountRequest { id: destination_id });
let transaction = transaction.into_domain(Uuid::nil()).unwrap(); let transaction = transaction.into_domain(Uuid::nil()).unwrap();
let source_account = Some(domain::Account { let source_account = Some(domain::Account {
id: source_id, id: source_id,
+1 -1
View File
@@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use uuid::Uuid; use uuid::Uuid;
use super::Direction; use super::direction::Direction;
use crate::domain; use crate::domain;
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
+1 -1
View File
@@ -7,7 +7,7 @@ use sqlx::PgPool;
use uuid::Uuid; use uuid::Uuid;
use super::{ use super::{
dtos::{ dtos::scheduled_transaction::{
RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse, RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse,
}, },
extractors::{json::Json, path::Path, query::Query}, extractors::{json::Json, path::Path, query::Query},
+1 -1
View File
@@ -4,7 +4,7 @@ use sqlx::PgPool;
use uuid::Uuid; use uuid::Uuid;
use super::{ use super::{
dtos::{TransactionRequest, TransactionResponse}, dtos::transaction::{TransactionRequest, TransactionResponse},
extractors::{json::Json, path::Path, query::Query}, extractors::{json::Json, path::Path, query::Query},
}; };
use crate::{ use crate::{