Refactored API DTOs to be more straight forward.

This commit is contained in:
2026-09-26 18:25:53 +02:00
parent 4737bd5c81
commit 87ded739b8
6 changed files with 251 additions and 195 deletions
+38 -36
View File
@@ -4,37 +4,15 @@ use uuid::Uuid;
use crate::{domain, routes::dtos::direction::Direction};
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct Transaction {
pub id: Uuid,
#[serde(flatten)]
pub data: TransactionData,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct TransactionData {
#[derive(Debug, Clone, Deserialize)]
pub struct TransactionRequest {
pub description: String,
pub amount_cents: u64,
pub direction: Direction,
pub date: DateTime<Utc>,
}
impl From<domain::Transaction> for Transaction {
fn from(transaction: domain::Transaction) -> Self {
Self {
id: transaction.id,
data: TransactionData {
description: transaction.description,
amount_cents: transaction.amount.get(),
direction: transaction.direction.into(),
date: transaction.date,
},
}
}
}
impl TransactionData {
impl TransactionRequest {
pub fn into_domain(self, id: Uuid) -> Result<domain::Transaction, domain::ValidationError> {
Ok(domain::Transaction {
id,
@@ -46,12 +24,33 @@ impl TransactionData {
}
}
#[derive(Debug, Clone, Serialize)]
pub struct TransactionResponse {
pub id: Uuid,
pub description: String,
pub amount_cents: u64,
pub direction: Direction,
pub date: DateTime<Utc>,
}
impl From<domain::Transaction> for TransactionResponse {
fn from(transaction: domain::Transaction) -> Self {
Self {
id: transaction.id,
description: transaction.description,
amount_cents: transaction.amount.get(),
direction: transaction.direction.into(),
date: transaction.date,
}
}
}
#[cfg(test)]
mod tests {
use super::*;
fn data(amount_cents: u64) -> TransactionData {
TransactionData {
fn request(amount_cents: u64) -> TransactionRequest {
TransactionRequest {
description: "Groceries".to_string(),
amount_cents,
direction: Direction::Out,
@@ -62,20 +61,20 @@ mod tests {
#[test]
fn converts_between_dto_and_domain() {
let id = Uuid::new_v4();
let transaction = data(4250).into_domain(id).unwrap();
let transaction = request(4250).into_domain(id).unwrap();
assert_eq!(transaction.id, id);
assert_eq!(transaction.amount.get(), 4250);
assert_eq!(transaction.direction, domain::Direction::Out);
let response = Transaction::from(transaction);
let response = TransactionResponse::from(transaction);
assert_eq!(response.id, id);
assert_eq!(response.data.description, "Groceries");
assert_eq!(response.data.amount_cents, 4250);
assert_eq!(response.description, "Groceries");
assert_eq!(response.amount_cents, 4250);
}
#[test]
fn rejects_amounts_that_do_not_fit_in_database() {
let error = data(i64::MAX as u64 + 1)
let error = request(i64::MAX as u64 + 1)
.into_domain(Uuid::nil())
.unwrap_err();
assert!(matches!(
@@ -87,18 +86,21 @@ mod tests {
#[test]
fn keeps_transaction_json_flat() {
let response = Transaction {
let response = TransactionResponse {
id: Uuid::nil(),
data: data(4250),
description: "Groceries".to_owned(),
amount_cents: 4250,
direction: Direction::Out,
date: Utc::now(),
};
let response = serde_json::to_value(response).unwrap();
assert_eq!(response["id"], Uuid::nil().to_string());
assert_eq!(response["amount_cents"], 4250);
assert_eq!(response["direction"], "out");
assert!(response.get("data").is_none());
assert_eq!(response["description"], "Groceries");
let request: TransactionData = serde_json::from_value(response).unwrap();
let request: TransactionRequest = serde_json::from_value(response).unwrap();
assert_eq!(request.description, "Groceries");
assert_eq!(request.amount_cents, 4250);
}