Cleaned up imports.
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
pub mod common;
|
|
||||||
pub mod dtos;
|
pub mod dtos;
|
||||||
pub mod recurring_transactions;
|
pub mod recurring_transactions;
|
||||||
pub mod transactions;
|
pub mod transactions;
|
||||||
|
|||||||
@@ -1,2 +1,7 @@
|
|||||||
pub mod recurring_transaction;
|
mod recurring_transaction;
|
||||||
pub mod transaction;
|
mod results;
|
||||||
|
mod transaction;
|
||||||
|
|
||||||
|
pub use recurring_transaction::*;
|
||||||
|
pub use results::*;
|
||||||
|
pub use transaction::*;
|
||||||
|
|||||||
@@ -1,16 +1,13 @@
|
|||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::database::{
|
use super::dtos::{Delete, RecurringTransactionRow, Upsert};
|
||||||
common::{Delete, Upsert},
|
|
||||||
dtos::recurring_transaction::RecurringTransactionRow,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub struct Query {
|
pub struct Query {
|
||||||
pub limit: Option<i64>,
|
pub limit: Option<i64>,
|
||||||
pub offset: Option<i64>,
|
pub offset: Option<i64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn query_recurring_transactions<'e, E>(
|
pub async fn query<'e, E>(
|
||||||
executor: E,
|
executor: E,
|
||||||
query: Query,
|
query: Query,
|
||||||
) -> Result<Vec<RecurringTransactionRow>, sqlx::Error>
|
) -> Result<Vec<RecurringTransactionRow>, sqlx::Error>
|
||||||
@@ -41,7 +38,7 @@ where
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_recurring_transaction_by_id<'e, E>(
|
pub async fn get_by_id<'e, E>(
|
||||||
executor: E,
|
executor: E,
|
||||||
id: Uuid,
|
id: Uuid,
|
||||||
) -> Result<Option<RecurringTransactionRow>, sqlx::Error>
|
) -> Result<Option<RecurringTransactionRow>, sqlx::Error>
|
||||||
@@ -70,7 +67,7 @@ where
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn upsert_recurring_transaction<'e, E>(
|
pub async fn upsert<'e, E>(
|
||||||
executor: E,
|
executor: E,
|
||||||
transaction: RecurringTransactionRow,
|
transaction: RecurringTransactionRow,
|
||||||
) -> Result<Upsert<RecurringTransactionRow>, sqlx::Error>
|
) -> Result<Upsert<RecurringTransactionRow>, sqlx::Error>
|
||||||
@@ -144,10 +141,7 @@ where
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn delete_recurring_transaction_by_id<'e, E>(
|
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, sqlx::Error>
|
||||||
executor: E,
|
|
||||||
id: Uuid,
|
|
||||||
) -> Result<Delete, sqlx::Error>
|
|
||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,19 +1,13 @@
|
|||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::database::{
|
use super::dtos::{Delete, TransactionRow, Upsert};
|
||||||
common::{Delete, Upsert},
|
|
||||||
dtos::transaction::TransactionRow,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub struct Query {
|
pub struct Query {
|
||||||
pub limit: Option<i64>,
|
pub limit: Option<i64>,
|
||||||
pub offset: Option<i64>,
|
pub offset: Option<i64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn query_transactions<'e, E>(
|
pub async fn query<'e, E>(executor: E, query: Query) -> Result<Vec<TransactionRow>, sqlx::Error>
|
||||||
executor: E,
|
|
||||||
query: Query,
|
|
||||||
) -> Result<Vec<TransactionRow>, sqlx::Error>
|
|
||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
@@ -33,10 +27,7 @@ where
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_transaction_by_id<'e, E>(
|
pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result<Option<TransactionRow>, sqlx::Error>
|
||||||
executor: E,
|
|
||||||
id: Uuid,
|
|
||||||
) -> Result<Option<TransactionRow>, sqlx::Error>
|
|
||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
@@ -53,7 +44,7 @@ where
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn upsert_transaction<'e, E>(
|
pub async fn upsert<'e, E>(
|
||||||
executor: E,
|
executor: E,
|
||||||
transaction: TransactionRow,
|
transaction: TransactionRow,
|
||||||
) -> Result<Upsert<TransactionRow>, sqlx::Error>
|
) -> 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
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use chrono::{DateTime, Datelike, Months, TimeDelta, Utc, Weekday};
|
use chrono::{DateTime, Datelike, Months, TimeDelta, Utc, Weekday};
|
||||||
|
|
||||||
use crate::domain::ValidationError;
|
use super::ValidationError;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct Schedule {
|
pub struct Schedule {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
|
use crate::domain::{CentsConversionError, RecurrenceIntervalError, ValidationError};
|
||||||
|
|
||||||
|
pub mod dtos;
|
||||||
mod encoding;
|
mod encoding;
|
||||||
pub mod recurring_transactions;
|
pub mod recurring_transactions;
|
||||||
pub mod transactions;
|
pub mod transactions;
|
||||||
|
|
||||||
pub use crate::database::common::{Delete, Upsert};
|
|
||||||
use crate::domain::{CentsConversionError, RecurrenceIntervalError, ValidationError};
|
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive(Debug, thiserror::Error)]
|
||||||
pub enum RepositoryError {
|
pub enum RepositoryError {
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
mod results;
|
||||||
|
|
||||||
|
pub use results::*;
|
||||||
@@ -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 uuid::Uuid;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
DecodeError, Delete, QueryConversionError, RepositoryError, Upsert,
|
DecodeError, QueryConversionError, RepositoryError,
|
||||||
|
dtos::{Delete, Upsert},
|
||||||
encoding::{
|
encoding::{
|
||||||
decode_direction, decode_recurrence_unit, decode_weekend_adjustment, encode_direction,
|
decode_direction, decode_recurrence_unit, decode_weekend_adjustment, encode_direction,
|
||||||
encode_recurrence_unit, encode_weekend_adjustment,
|
encode_recurrence_unit, encode_weekend_adjustment,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
database::{
|
database::{dtos::RecurringTransactionRow, recurring_transactions as db},
|
||||||
dtos::recurring_transaction::RecurringTransactionRow, recurring_transactions as db,
|
|
||||||
},
|
|
||||||
domain::{Cents, Recurrence, RecurrenceInterval, RecurringTransaction, Schedule},
|
domain::{Cents, Recurrence, RecurrenceInterval, RecurringTransaction, Schedule},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -43,7 +42,7 @@ pub async fn query<'e, E>(
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
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?
|
.await?
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(decode)
|
.map(decode)
|
||||||
@@ -59,10 +58,7 @@ pub async fn get<'e, E>(
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
let transaction = db::get_recurring_transaction_by_id(executor, id)
|
let transaction = db::get_by_id(executor, id).await?.map(decode).transpose()?;
|
||||||
.await?
|
|
||||||
.map(decode)
|
|
||||||
.transpose()?;
|
|
||||||
|
|
||||||
Ok(transaction)
|
Ok(transaction)
|
||||||
}
|
}
|
||||||
@@ -74,18 +70,18 @@ pub async fn upsert<'e, E>(
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
let transaction = db::upsert_recurring_transaction(executor, encode(transaction))
|
let transaction = db::upsert(executor, encode(transaction))
|
||||||
.await?
|
.await?
|
||||||
.try_map(decode)?;
|
.try_map(decode)?;
|
||||||
|
|
||||||
Ok(transaction)
|
Ok(transaction.into())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result<Delete, RepositoryError>
|
pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result<Delete, RepositoryError>
|
||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
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> {
|
fn decode(row: RecurringTransactionRow) -> Result<RecurringTransaction, DecodeError> {
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
DecodeError, Delete, QueryConversionError, RepositoryError, Upsert,
|
DecodeError, QueryConversionError, RepositoryError,
|
||||||
|
dtos::{Delete, Upsert},
|
||||||
encoding::{decode_direction, encode_direction},
|
encoding::{decode_direction, encode_direction},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
database::{dtos::transaction::TransactionRow, transactions as db},
|
database::{dtos::TransactionRow, transactions as db},
|
||||||
domain::{Cents, Transaction},
|
domain::{Cents, Transaction},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<Transaction>,
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
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?
|
.await?
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(decode)
|
.map(decode)
|
||||||
@@ -48,10 +49,7 @@ pub async fn get<'e, E>(executor: E, id: Uuid) -> Result<Option<Transaction>, Re
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
let transaction = db::get_transaction_by_id(executor, id)
|
let transaction = db::get_by_id(executor, id).await?.map(decode).transpose()?;
|
||||||
.await?
|
|
||||||
.map(decode)
|
|
||||||
.transpose()?;
|
|
||||||
|
|
||||||
Ok(transaction)
|
Ok(transaction)
|
||||||
}
|
}
|
||||||
@@ -63,18 +61,18 @@ pub async fn upsert<'e, E>(
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||||
{
|
{
|
||||||
let transaction = db::upsert_transaction(executor, encode(transaction))
|
let transaction = db::upsert(executor, encode(transaction))
|
||||||
.await?
|
.await?
|
||||||
.try_map(decode)?;
|
.try_map(decode)?;
|
||||||
|
|
||||||
Ok(transaction)
|
Ok(transaction.into())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result<Delete, RepositoryError>
|
pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result<Delete, RepositoryError>
|
||||||
where
|
where
|
||||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
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> {
|
fn decode(row: TransactionRow) -> Result<Transaction, DecodeError> {
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
pub mod direction;
|
mod direction;
|
||||||
pub mod scheduled_transaction;
|
mod scheduled_transaction;
|
||||||
pub mod 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 serde::{Deserialize, Serialize};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::{domain, routes::dtos::direction::Direction};
|
use super::Direction;
|
||||||
|
use crate::domain;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
#[serde(rename_all = "snake_case")]
|
#[serde(rename_all = "snake_case")]
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ use chrono::{DateTime, Utc};
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::{domain, routes::dtos::direction::Direction};
|
use super::Direction;
|
||||||
|
use crate::domain;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
pub struct TransactionRequest {
|
pub struct TransactionRequest {
|
||||||
|
|||||||
@@ -4,15 +4,18 @@ use serde::Deserialize;
|
|||||||
use sqlx::PgPool;
|
use sqlx::PgPool;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::{
|
use super::{
|
||||||
domain,
|
dtos::{
|
||||||
error::AppError,
|
|
||||||
repository::{Delete, Upsert, recurring_transactions as repository},
|
|
||||||
routes::{
|
|
||||||
dtos::scheduled_transaction::{
|
|
||||||
RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse,
|
RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse,
|
||||||
},
|
},
|
||||||
extractors::{json::Json, path::Path, query::Query},
|
extractors::{json::Json, path::Path, query::Query},
|
||||||
|
};
|
||||||
|
use crate::{
|
||||||
|
domain,
|
||||||
|
error::AppError,
|
||||||
|
repository::{
|
||||||
|
dtos::{Delete, Upsert},
|
||||||
|
recurring_transactions as repository,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,12 +3,15 @@ use serde::Deserialize;
|
|||||||
use sqlx::PgPool;
|
use sqlx::PgPool;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::{
|
||||||
|
dtos::{TransactionRequest, TransactionResponse},
|
||||||
|
extractors::{json::Json, path::Path, query::Query},
|
||||||
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
error::AppError,
|
error::AppError,
|
||||||
repository::{Delete, Upsert, transactions as repository},
|
repository::{
|
||||||
routes::{
|
dtos::{Delete, Upsert},
|
||||||
dtos::transaction::{TransactionRequest, TransactionResponse},
|
transactions as repository,
|
||||||
extractors::{json::Json, path::Path, query::Query},
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user