Implemented a domain layer, because the API DTO's where getting bloated.
This commit is contained in:
@@ -1,23 +1,17 @@
|
||||
use axum::{extract::State, http::StatusCode};
|
||||
use chrono::{DateTime, Utc};
|
||||
use sqlx::PgPool;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
database::{
|
||||
common::{Delete, Upsert},
|
||||
dtos::recurring_transaction::RecurringTransactionRow,
|
||||
recurring_transactions::{
|
||||
delete_scheduled_transaction_by_id, get_scheduled_transaction_by_id,
|
||||
query_scheduled_transactions, upsert_scheduled_transaction,
|
||||
},
|
||||
},
|
||||
domain,
|
||||
error::AppError,
|
||||
repository::{Delete, Upsert, recurring_transactions as repository},
|
||||
routes::{
|
||||
dtos::scheduled_transaction::{
|
||||
RecurringTransaction, ScheduledTransaction, ScheduledTransactionData,
|
||||
},
|
||||
extractors::{json::Json, path::Path},
|
||||
validation::recurring_transaction::ValidatedRecurringTransaction,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -37,13 +31,12 @@ pub fn create_router() -> axum::Router<PgPool> {
|
||||
async fn get_scheduled_transactions(
|
||||
State(pool): State<PgPool>,
|
||||
) -> Result<Json<Vec<ScheduledTransaction>>, AppError> {
|
||||
let rows = query_scheduled_transactions(&pool).await?;
|
||||
|
||||
let transactions = rows
|
||||
let now = Utc::now();
|
||||
let transactions = repository::list(&pool)
|
||||
.await?
|
||||
.into_iter()
|
||||
.map(RecurringTransaction::try_from)
|
||||
.map(|result| result.map(ScheduledTransaction::from))
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
.map(|transaction| respond(transaction, now))
|
||||
.collect();
|
||||
|
||||
Ok(Json(transactions))
|
||||
}
|
||||
@@ -54,15 +47,11 @@ async fn get_scheduled_transaction(
|
||||
State(pool): State<PgPool>,
|
||||
Path(id): Path<Uuid>,
|
||||
) -> Result<Json<ScheduledTransaction>, AppError> {
|
||||
let row = get_scheduled_transaction_by_id(&pool, id)
|
||||
let transaction = repository::get(&pool, id)
|
||||
.await?
|
||||
.map(RecurringTransaction::try_from)
|
||||
.transpose()?;
|
||||
.ok_or(AppError::NotFound)?;
|
||||
|
||||
match row {
|
||||
Some(transaction) => Ok(Json(ScheduledTransaction::from(transaction))),
|
||||
None => Err(AppError::NotFound),
|
||||
}
|
||||
Ok(Json(respond(transaction, Utc::now())))
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
@@ -73,29 +62,14 @@ async fn put_scheduled_transaction(
|
||||
Json(transaction): Json<ScheduledTransactionData>,
|
||||
) -> Result<(StatusCode, Json<ScheduledTransaction>), AppError> {
|
||||
let ScheduledTransactionData::Recurring(transaction) = transaction;
|
||||
let transaction = transaction.into_domain(id)?;
|
||||
|
||||
let transaction = ValidatedRecurringTransaction::try_from(transaction)?;
|
||||
let transaction = RecurringTransactionRow {
|
||||
id,
|
||||
name: transaction.name,
|
||||
amount_cents: transaction.amount_cents,
|
||||
direction: transaction.direction.as_str().to_owned(),
|
||||
starts_at: transaction.starts_at,
|
||||
ends_at: transaction.ends_at,
|
||||
recurrence_every: transaction.recurrence_every.get(),
|
||||
recurrence_unit: transaction.recurrence_unit.as_str().to_owned(),
|
||||
weekend_adjustment: transaction
|
||||
.weekend_adjustment
|
||||
.map(|adjustment| adjustment.as_str().to_owned()),
|
||||
let (status, transaction) = match repository::upsert(&pool, transaction).await? {
|
||||
Upsert::Created(transaction) => (StatusCode::CREATED, transaction),
|
||||
Upsert::Updated(transaction) => (StatusCode::OK, transaction),
|
||||
};
|
||||
|
||||
let (status, row) = match upsert_scheduled_transaction(&pool, transaction).await? {
|
||||
Upsert::Created(row) => (StatusCode::CREATED, row),
|
||||
Upsert::Updated(row) => (StatusCode::OK, row),
|
||||
};
|
||||
let transaction = RecurringTransaction::try_from(row)?;
|
||||
|
||||
Ok((status, Json(transaction.into())))
|
||||
Ok((status, Json(respond(transaction, Utc::now()))))
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
@@ -104,8 +78,14 @@ async fn delete_scheduled_transaction(
|
||||
State(pool): State<PgPool>,
|
||||
Path(id): Path<Uuid>,
|
||||
) -> Result<StatusCode, AppError> {
|
||||
match delete_scheduled_transaction_by_id(&pool, id).await? {
|
||||
match repository::delete(&pool, id).await? {
|
||||
Delete::Deleted => Ok(StatusCode::NO_CONTENT),
|
||||
Delete::NotFound => Err(AppError::NotFound),
|
||||
}
|
||||
}
|
||||
|
||||
fn respond(transaction: domain::RecurringTransaction, now: DateTime<Utc>) -> ScheduledTransaction {
|
||||
let next = transaction.schedule.next_occurrence(now);
|
||||
|
||||
RecurringTransaction::new(transaction, next).into()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user