Cleaned up imports.

This commit is contained in:
2026-09-26 20:57:38 +02:00
parent 859ae71c51
commit 75ee0cb760
16 changed files with 96 additions and 69 deletions
-1
View File
@@ -1,4 +1,3 @@
pub mod common;
pub mod dtos;
pub mod recurring_transactions;
pub mod transactions;
+7 -2
View File
@@ -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::*;
+5 -11
View File
@@ -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<i64>,
pub offset: Option<i64>,
}
pub async fn query_recurring_transactions<'e, E>(
pub async fn query<'e, E>(
executor: E,
query: Query,
) -> Result<Vec<RecurringTransactionRow>, 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<Option<RecurringTransactionRow>, 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<Upsert<RecurringTransactionRow>, sqlx::Error>
@@ -144,10 +141,7 @@ where
}
}
pub async fn delete_recurring_transaction_by_id<'e, E>(
executor: E,
id: Uuid,
) -> Result<Delete, sqlx::Error>
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, sqlx::Error>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
+5 -14
View File
@@ -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<i64>,
pub offset: Option<i64>,
}
pub async fn query_transactions<'e, E>(
executor: E,
query: Query,
) -> Result<Vec<TransactionRow>, sqlx::Error>
pub async fn query<'e, E>(executor: E, query: Query) -> Result<Vec<TransactionRow>, 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<Option<TransactionRow>, sqlx::Error>
pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result<Option<TransactionRow>, 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<Upsert<TransactionRow>, sqlx::Error>
@@ -101,7 +92,7 @@ where
}
}
pub async fn delete_transaction_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, sqlx::Error>
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, sqlx::Error>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
+1 -1
View File
@@ -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 {
+3 -3
View File
@@ -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)]
+3
View File
@@ -0,0 +1,3 @@
mod results;
pub use results::*;
+29
View File
@@ -0,0 +1,29 @@
use crate::database;
pub enum Upsert<T> {
Created(T),
Updated(T),
}
impl<T> From<database::dtos::Upsert<T>> for Upsert<T> {
fn from(value: database::dtos::Upsert<T>) -> 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<database::dtos::Delete> for Delete {
fn from(value: database::dtos::Delete) -> Self {
match value {
database::dtos::Delete::Deleted => Delete::Deleted,
database::dtos::Delete::NotFound => Delete::NotFound,
}
}
}
@@ -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<Delete, RepositoryError>
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<RecurringTransaction, DecodeError> {
+8 -10
View File
@@ -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<Vec<Transaction>,
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<Option<Transaction>, 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<Delete, RepositoryError>
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<Transaction, DecodeError> {
+7 -3
View File
@@ -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::*;
@@ -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")]
+2 -1
View File
@@ -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 {
+9 -6
View File
@@ -4,15 +4,18 @@ use serde::Deserialize;
use sqlx::PgPool;
use uuid::Uuid;
use crate::{
domain,
error::AppError,
repository::{Delete, Upsert, recurring_transactions as repository},
routes::{
dtos::scheduled_transaction::{
use super::{
dtos::{
RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse,
},
extractors::{json::Json, path::Path, query::Query},
};
use crate::{
domain,
error::AppError,
repository::{
dtos::{Delete, Upsert},
recurring_transactions as repository,
},
};
+7 -4
View File
@@ -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,
},
};