From 75ee0cb760bda2f3dc3575385cd9b104835dfcb0 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sat, 26 Sep 2026 20:57:38 +0200 Subject: [PATCH] Cleaned up imports. --- server/src/database.rs | 1 - server/src/database/dtos.rs | 9 ++++-- .../database/{common.rs => dtos/results.rs} | 0 server/src/database/recurring_transactions.rs | 16 ++++------ server/src/database/transactions.rs | 19 ++++-------- server/src/domain/schedule.rs | 2 +- server/src/repository.rs | 6 ++-- server/src/repository/dtos.rs | 3 ++ server/src/repository/dtos/results.rs | 29 +++++++++++++++++++ .../src/repository/recurring_transactions.rs | 20 +++++-------- server/src/repository/transactions.rs | 18 +++++------- server/src/routes/dtos.rs | 10 +++++-- .../src/routes/dtos/scheduled_transaction.rs | 3 +- server/src/routes/dtos/transaction.rs | 3 +- server/src/routes/scheduled_transactions.rs | 15 ++++++---- server/src/routes/transactions.rs | 11 ++++--- 16 files changed, 96 insertions(+), 69 deletions(-) rename server/src/database/{common.rs => dtos/results.rs} (100%) create mode 100644 server/src/repository/dtos.rs create mode 100644 server/src/repository/dtos/results.rs diff --git a/server/src/database.rs b/server/src/database.rs index 74272eb..c239825 100644 --- a/server/src/database.rs +++ b/server/src/database.rs @@ -1,4 +1,3 @@ -pub mod common; pub mod dtos; pub mod recurring_transactions; pub mod transactions; diff --git a/server/src/database/dtos.rs b/server/src/database/dtos.rs index c62f23c..a9963b0 100644 --- a/server/src/database/dtos.rs +++ b/server/src/database/dtos.rs @@ -1,2 +1,7 @@ -pub mod recurring_transaction; -pub mod transaction; +mod recurring_transaction; +mod results; +mod transaction; + +pub use recurring_transaction::*; +pub use results::*; +pub use transaction::*; diff --git a/server/src/database/common.rs b/server/src/database/dtos/results.rs similarity index 100% rename from server/src/database/common.rs rename to server/src/database/dtos/results.rs diff --git a/server/src/database/recurring_transactions.rs b/server/src/database/recurring_transactions.rs index c15370f..f5fbefa 100644 --- a/server/src/database/recurring_transactions.rs +++ b/server/src/database/recurring_transactions.rs @@ -1,16 +1,13 @@ use uuid::Uuid; -use crate::database::{ - common::{Delete, Upsert}, - dtos::recurring_transaction::RecurringTransactionRow, -}; +use super::dtos::{Delete, RecurringTransactionRow, Upsert}; pub struct Query { pub limit: Option, pub offset: Option, } -pub async fn query_recurring_transactions<'e, E>( +pub async fn query<'e, E>( executor: E, query: Query, ) -> Result, sqlx::Error> @@ -41,7 +38,7 @@ where .await } -pub async fn get_recurring_transaction_by_id<'e, E>( +pub async fn get_by_id<'e, E>( executor: E, id: Uuid, ) -> Result, sqlx::Error> @@ -70,7 +67,7 @@ where .await } -pub async fn upsert_recurring_transaction<'e, E>( +pub async fn upsert<'e, E>( executor: E, transaction: RecurringTransactionRow, ) -> Result, sqlx::Error> @@ -144,10 +141,7 @@ where } } -pub async fn delete_recurring_transaction_by_id<'e, E>( - executor: E, - id: Uuid, -) -> Result +pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/database/transactions.rs b/server/src/database/transactions.rs index 0b865ec..a147b04 100644 --- a/server/src/database/transactions.rs +++ b/server/src/database/transactions.rs @@ -1,19 +1,13 @@ use uuid::Uuid; -use crate::database::{ - common::{Delete, Upsert}, - dtos::transaction::TransactionRow, -}; +use super::dtos::{Delete, TransactionRow, Upsert}; pub struct Query { pub limit: Option, pub offset: Option, } -pub async fn query_transactions<'e, E>( - executor: E, - query: Query, -) -> Result, sqlx::Error> +pub async fn query<'e, E>(executor: E, query: Query) -> Result, sqlx::Error> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -33,10 +27,7 @@ where .await } -pub async fn get_transaction_by_id<'e, E>( - executor: E, - id: Uuid, -) -> Result, sqlx::Error> +pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result, sqlx::Error> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -53,7 +44,7 @@ where .await } -pub async fn upsert_transaction<'e, E>( +pub async fn upsert<'e, E>( executor: E, transaction: TransactionRow, ) -> Result, sqlx::Error> @@ -101,7 +92,7 @@ where } } -pub async fn delete_transaction_by_id<'e, E>(executor: E, id: Uuid) -> Result +pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/domain/schedule.rs b/server/src/domain/schedule.rs index 831d52c..bc7aac3 100644 --- a/server/src/domain/schedule.rs +++ b/server/src/domain/schedule.rs @@ -1,6 +1,6 @@ use chrono::{DateTime, Datelike, Months, TimeDelta, Utc, Weekday}; -use crate::domain::ValidationError; +use super::ValidationError; #[derive(Debug, Clone, PartialEq, Eq)] pub struct Schedule { diff --git a/server/src/repository.rs b/server/src/repository.rs index 79a2561..d5c5e0d 100644 --- a/server/src/repository.rs +++ b/server/src/repository.rs @@ -1,10 +1,10 @@ +use crate::domain::{CentsConversionError, RecurrenceIntervalError, ValidationError}; + +pub mod dtos; mod encoding; pub mod recurring_transactions; pub mod transactions; -pub use crate::database::common::{Delete, Upsert}; -use crate::domain::{CentsConversionError, RecurrenceIntervalError, ValidationError}; - #[derive(Debug, thiserror::Error)] pub enum RepositoryError { #[error(transparent)] diff --git a/server/src/repository/dtos.rs b/server/src/repository/dtos.rs new file mode 100644 index 0000000..80388a2 --- /dev/null +++ b/server/src/repository/dtos.rs @@ -0,0 +1,3 @@ +mod results; + +pub use results::*; diff --git a/server/src/repository/dtos/results.rs b/server/src/repository/dtos/results.rs new file mode 100644 index 0000000..907519a --- /dev/null +++ b/server/src/repository/dtos/results.rs @@ -0,0 +1,29 @@ +use crate::database; + +pub enum Upsert { + Created(T), + Updated(T), +} + +impl From> for Upsert { + fn from(value: database::dtos::Upsert) -> Self { + match value { + database::dtos::Upsert::Created(v) => Upsert::Created(v), + database::dtos::Upsert::Updated(v) => Upsert::Updated(v), + } + } +} + +pub enum Delete { + Deleted, + NotFound, +} + +impl From for Delete { + fn from(value: database::dtos::Delete) -> Self { + match value { + database::dtos::Delete::Deleted => Delete::Deleted, + database::dtos::Delete::NotFound => Delete::NotFound, + } + } +} diff --git a/server/src/repository/recurring_transactions.rs b/server/src/repository/recurring_transactions.rs index 7bccf1d..aaa414b 100644 --- a/server/src/repository/recurring_transactions.rs +++ b/server/src/repository/recurring_transactions.rs @@ -1,16 +1,15 @@ use uuid::Uuid; use super::{ - DecodeError, Delete, QueryConversionError, RepositoryError, Upsert, + DecodeError, QueryConversionError, RepositoryError, + dtos::{Delete, Upsert}, encoding::{ decode_direction, decode_recurrence_unit, decode_weekend_adjustment, encode_direction, encode_recurrence_unit, encode_weekend_adjustment, }, }; use crate::{ - database::{ - dtos::recurring_transaction::RecurringTransactionRow, recurring_transactions as db, - }, + database::{dtos::RecurringTransactionRow, recurring_transactions as db}, domain::{Cents, Recurrence, RecurrenceInterval, RecurringTransaction, Schedule}, }; @@ -43,7 +42,7 @@ pub async fn query<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transactions = db::query_recurring_transactions(executor, query.try_into()?) + let transactions = db::query(executor, query.try_into()?) .await? .into_iter() .map(decode) @@ -59,10 +58,7 @@ pub async fn get<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transaction = db::get_recurring_transaction_by_id(executor, id) - .await? - .map(decode) - .transpose()?; + let transaction = db::get_by_id(executor, id).await?.map(decode).transpose()?; Ok(transaction) } @@ -74,18 +70,18 @@ pub async fn upsert<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transaction = db::upsert_recurring_transaction(executor, encode(transaction)) + let transaction = db::upsert(executor, encode(transaction)) .await? .try_map(decode)?; - Ok(transaction) + Ok(transaction.into()) } pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::delete_recurring_transaction_by_id(executor, id).await?) + Ok(db::delete_by_id(executor, id).await?.into()) } fn decode(row: RecurringTransactionRow) -> Result { diff --git a/server/src/repository/transactions.rs b/server/src/repository/transactions.rs index c37452a..6aeca66 100644 --- a/server/src/repository/transactions.rs +++ b/server/src/repository/transactions.rs @@ -1,11 +1,12 @@ use uuid::Uuid; use super::{ - DecodeError, Delete, QueryConversionError, RepositoryError, Upsert, + DecodeError, QueryConversionError, RepositoryError, + dtos::{Delete, Upsert}, encoding::{decode_direction, encode_direction}, }; use crate::{ - database::{dtos::transaction::TransactionRow, transactions as db}, + database::{dtos::TransactionRow, transactions as db}, domain::{Cents, Transaction}, }; @@ -35,7 +36,7 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result, where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transactions = db::query_transactions(executor, query.try_into()?) + let transactions = db::query(executor, query.try_into()?) .await? .into_iter() .map(decode) @@ -48,10 +49,7 @@ pub async fn get<'e, E>(executor: E, id: Uuid) -> Result, Re where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transaction = db::get_transaction_by_id(executor, id) - .await? - .map(decode) - .transpose()?; + let transaction = db::get_by_id(executor, id).await?.map(decode).transpose()?; Ok(transaction) } @@ -63,18 +61,18 @@ pub async fn upsert<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transaction = db::upsert_transaction(executor, encode(transaction)) + let transaction = db::upsert(executor, encode(transaction)) .await? .try_map(decode)?; - Ok(transaction) + Ok(transaction.into()) } pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::delete_transaction_by_id(executor, id).await?) + Ok(db::delete_by_id(executor, id).await?.into()) } fn decode(row: TransactionRow) -> Result { diff --git a/server/src/routes/dtos.rs b/server/src/routes/dtos.rs index c8509ae..23380f0 100644 --- a/server/src/routes/dtos.rs +++ b/server/src/routes/dtos.rs @@ -1,3 +1,7 @@ -pub mod direction; -pub mod scheduled_transaction; -pub mod transaction; +mod direction; +mod scheduled_transaction; +mod transaction; + +pub use direction::*; +pub use scheduled_transaction::*; +pub use transaction::*; diff --git a/server/src/routes/dtos/scheduled_transaction.rs b/server/src/routes/dtos/scheduled_transaction.rs index 6f4b132..386f9ff 100644 --- a/server/src/routes/dtos/scheduled_transaction.rs +++ b/server/src/routes/dtos/scheduled_transaction.rs @@ -2,7 +2,8 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::{domain, routes::dtos::direction::Direction}; +use super::Direction; +use crate::domain; #[derive(Debug, Clone, Deserialize)] #[serde(rename_all = "snake_case")] diff --git a/server/src/routes/dtos/transaction.rs b/server/src/routes/dtos/transaction.rs index 1f69266..5d49e55 100644 --- a/server/src/routes/dtos/transaction.rs +++ b/server/src/routes/dtos/transaction.rs @@ -2,7 +2,8 @@ use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::{domain, routes::dtos::direction::Direction}; +use super::Direction; +use crate::domain; #[derive(Debug, Clone, Deserialize)] pub struct TransactionRequest { diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 4a55ba3..94c9ba9 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -4,15 +4,18 @@ use serde::Deserialize; use sqlx::PgPool; use uuid::Uuid; +use super::{ + dtos::{ + RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse, + }, + extractors::{json::Json, path::Path, query::Query}, +}; use crate::{ domain, error::AppError, - repository::{Delete, Upsert, recurring_transactions as repository}, - routes::{ - dtos::scheduled_transaction::{ - RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse, - }, - extractors::{json::Json, path::Path, query::Query}, + repository::{ + dtos::{Delete, Upsert}, + recurring_transactions as repository, }, }; diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index 27e3043..536565a 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -3,12 +3,15 @@ use serde::Deserialize; use sqlx::PgPool; use uuid::Uuid; +use super::{ + dtos::{TransactionRequest, TransactionResponse}, + extractors::{json::Json, path::Path, query::Query}, +}; use crate::{ error::AppError, - repository::{Delete, Upsert, transactions as repository}, - routes::{ - dtos::transaction::{TransactionRequest, TransactionResponse}, - extractors::{json::Json, path::Path, query::Query}, + repository::{ + dtos::{Delete, Upsert}, + transactions as repository, }, };