Slightly more expressive expressions.
This commit is contained in:
@@ -9,9 +9,7 @@ use super::{
|
||||
},
|
||||
};
|
||||
use crate::{
|
||||
database::{
|
||||
Constraint, DatabaseError, dtos::RecurringTransactionRow, recurring_transactions as db,
|
||||
},
|
||||
database::{self, Constraint, DatabaseError, dtos::RecurringTransactionRow},
|
||||
domain::{Cents, Recurrence, RecurrenceInterval, RecurringTransaction, Schedule},
|
||||
};
|
||||
|
||||
@@ -28,7 +26,7 @@ pub async fn list<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let query = db::Query {
|
||||
let query = database::recurring_transactions::Query {
|
||||
limit: query
|
||||
.limit
|
||||
.map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l)))
|
||||
@@ -39,7 +37,7 @@ where
|
||||
.transpose()?,
|
||||
};
|
||||
|
||||
let transactions = db::list(executor, user_id, query)
|
||||
let transactions = database::recurring_transactions::list(executor, user_id, query)
|
||||
.await?
|
||||
.into_iter()
|
||||
.map(decode)
|
||||
@@ -56,7 +54,7 @@ pub async fn get_by_id<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let transaction = db::get_by_id(executor, user_id, id)
|
||||
let transaction = database::recurring_transactions::get_by_id(executor, user_id, id)
|
||||
.await?
|
||||
.map(decode)
|
||||
.transpose()?;
|
||||
@@ -72,7 +70,7 @@ pub async fn upsert<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let upserted = db::upsert(executor, user_id, encode(transaction))
|
||||
let upserted = database::recurring_transactions::upsert(executor, user_id, encode(transaction))
|
||||
.await
|
||||
.map_err(classify_upsert_error)?
|
||||
.map(|upserted| upserted.try_map(decode))
|
||||
@@ -109,7 +107,7 @@ pub async fn delete_by_id<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let transaction = db::delete_by_id(executor, user_id, id)
|
||||
let transaction = database::recurring_transactions::delete_by_id(executor, user_id, id)
|
||||
.await?
|
||||
.map(decode)
|
||||
.transpose()?;
|
||||
|
||||
Reference in New Issue
Block a user