diff --git a/server/src/database/accounts.rs b/server/src/database/accounts.rs index e2d7ecf..493d0ec 100644 --- a/server/src/database/accounts.rs +++ b/server/src/database/accounts.rs @@ -11,16 +11,6 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - name: None, - limit: None, - offset: None, - } - } -} - pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, diff --git a/server/src/database/recurring_transactions.rs b/server/src/database/recurring_transactions.rs index 9f3847a..31d39f6 100644 --- a/server/src/database/recurring_transactions.rs +++ b/server/src/database/recurring_transactions.rs @@ -10,15 +10,6 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - limit: None, - offset: None, - } - } -} - pub async fn list<'e, E>( executor: E, query: Query, diff --git a/server/src/database/transactions.rs b/server/src/database/transactions.rs index e454898..57066e2 100644 --- a/server/src/database/transactions.rs +++ b/server/src/database/transactions.rs @@ -10,15 +10,6 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - limit: None, - offset: None, - } - } -} - pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, diff --git a/server/src/database/user_app_secrets.rs b/server/src/database/user_app_secrets.rs index 4de7a18..af9c526 100644 --- a/server/src/database/user_app_secrets.rs +++ b/server/src/database/user_app_secrets.rs @@ -11,16 +11,6 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - app_id: Uuid::nil(), - limit: None, - offset: None, - } - } -} - pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, diff --git a/server/src/database/user_apps.rs b/server/src/database/user_apps.rs index 675e007..a8eb125 100644 --- a/server/src/database/user_apps.rs +++ b/server/src/database/user_apps.rs @@ -11,16 +11,6 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - user_id: Uuid::nil(), - limit: None, - offset: None, - } - } -} - pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, diff --git a/server/src/database/users.rs b/server/src/database/users.rs index 9b61566..bfcb296 100644 --- a/server/src/database/users.rs +++ b/server/src/database/users.rs @@ -10,15 +10,6 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - limit: None, - offset: None, - } - } -} - pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, diff --git a/server/src/repository/accounts.rs b/server/src/repository/accounts.rs index 6ff75d5..2439047 100644 --- a/server/src/repository/accounts.rs +++ b/server/src/repository/accounts.rs @@ -17,21 +17,13 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - name: None, - limit: None, - offset: None, - } - } -} - -impl TryFrom for db::Query { - type Error = QueryConversionError; - - fn try_from(query: Query) -> Result { - Ok(db::Query { +pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> +where + E: sqlx::Executor<'e, Database = sqlx::Postgres>, +{ + let accounts = db::list( + executor, + db::Query { name: query.name, limit: query .limit @@ -41,20 +33,12 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, - ..Default::default() - }) - } -} - -pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> -where - E: sqlx::Executor<'e, Database = sqlx::Postgres>, -{ - let accounts = db::list(executor, query.try_into()?) - .await? - .into_iter() - .map(decode) - .collect::>()?; + }, + ) + .await? + .into_iter() + .map(decode) + .collect::>()?; Ok(accounts) } diff --git a/server/src/repository/recurring_transactions.rs b/server/src/repository/recurring_transactions.rs index cfaede2..9e514ff 100644 --- a/server/src/repository/recurring_transactions.rs +++ b/server/src/repository/recurring_transactions.rs @@ -20,20 +20,16 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - limit: None, - offset: None, - } - } -} - -impl TryFrom for db::Query { - type Error = QueryConversionError; - - fn try_from(query: Query) -> Result { - Ok(db::Query { +pub async fn list<'e, E>( + executor: E, + query: Query, +) -> Result, RepositoryError> +where + E: sqlx::Executor<'e, Database = sqlx::Postgres>, +{ + let transactions = db::list( + executor, + db::Query { limit: query .limit .map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l))) @@ -42,23 +38,12 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, - ..Default::default() - }) - } -} - -pub async fn list<'e, E>( - executor: E, - query: Query, -) -> Result, RepositoryError> -where - E: sqlx::Executor<'e, Database = sqlx::Postgres>, -{ - let transactions = db::list(executor, query.try_into()?) - .await? - .into_iter() - .map(decode) - .collect::>()?; + }, + ) + .await? + .into_iter() + .map(decode) + .collect::>()?; Ok(transactions) } diff --git a/server/src/repository/transactions.rs b/server/src/repository/transactions.rs index f81659f..a9a6747 100644 --- a/server/src/repository/transactions.rs +++ b/server/src/repository/transactions.rs @@ -15,20 +15,13 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - limit: None, - offset: None, - } - } -} - -impl TryFrom for db::Query { - type Error = QueryConversionError; - - fn try_from(query: Query) -> Result { - Ok(db::Query { +pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> +where + E: sqlx::Executor<'e, Database = sqlx::Postgres>, +{ + let transactions = db::list( + executor, + db::Query { limit: query .limit .map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l))) @@ -37,20 +30,12 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, - ..Default::default() - }) - } -} - -pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> -where - E: sqlx::Executor<'e, Database = sqlx::Postgres>, -{ - let transactions = db::list(executor, query.try_into()?) - .await? - .into_iter() - .map(decode) - .collect::>()?; + }, + ) + .await? + .into_iter() + .map(decode) + .collect::>()?; Ok(transactions) } diff --git a/server/src/repository/user_app_secrets.rs b/server/src/repository/user_app_secrets.rs index ed28745..3eca33a 100644 --- a/server/src/repository/user_app_secrets.rs +++ b/server/src/repository/user_app_secrets.rs @@ -14,21 +14,13 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - app_id: Uuid::nil(), - limit: None, - offset: None, - } - } -} - -impl TryFrom for db::Query { - type Error = QueryConversionError; - - fn try_from(query: Query) -> Result { - Ok(db::Query { +pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> +where + E: sqlx::Executor<'e, Database = sqlx::Postgres>, +{ + Ok(db::list( + executor, + db::Query { app_id: query.app_id, limit: query .limit @@ -40,19 +32,12 @@ impl TryFrom for db::Query { i64::try_from(offset).map_err(|_| QueryConversionError::Offset(offset)) }) .transpose()?, - }) - } -} - -pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> -where - E: sqlx::Executor<'e, Database = sqlx::Postgres>, -{ - Ok(db::list(executor, query.try_into()?) - .await? - .into_iter() - .map(decode) - .collect()) + }, + ) + .await? + .into_iter() + .map(decode) + .collect()) } pub async fn get_by_id<'e, E>( diff --git a/server/src/repository/user_apps.rs b/server/src/repository/user_apps.rs index 35a9bb2..ca93683 100644 --- a/server/src/repository/user_apps.rs +++ b/server/src/repository/user_apps.rs @@ -12,21 +12,13 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - user_id: Uuid::nil(), - limit: None, - offset: None, - } - } -} - -impl TryFrom for db::Query { - type Error = QueryConversionError; - - fn try_from(query: Query) -> Result { - Ok(db::Query { +pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> +where + E: sqlx::Executor<'e, Database = sqlx::Postgres>, +{ + Ok(db::list( + executor, + db::Query { user_id: query.user_id, limit: query .limit @@ -38,19 +30,12 @@ impl TryFrom for db::Query { i64::try_from(offset).map_err(|_| QueryConversionError::Offset(offset)) }) .transpose()?, - }) - } -} - -pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> -where - E: sqlx::Executor<'e, Database = sqlx::Postgres>, -{ - Ok(db::list(executor, query.try_into()?) - .await? - .into_iter() - .map(decode) - .collect()) + }, + ) + .await? + .into_iter() + .map(decode) + .collect()) } pub async fn get_by_id<'e, E>( diff --git a/server/src/repository/users.rs b/server/src/repository/users.rs index e1d0acd..5bab036 100644 --- a/server/src/repository/users.rs +++ b/server/src/repository/users.rs @@ -14,20 +14,13 @@ pub struct Query { pub offset: Option, } -impl Default for Query { - fn default() -> Self { - Self { - limit: None, - offset: None, - } - } -} - -impl TryFrom for db::Query { - type Error = QueryConversionError; - - fn try_from(query: Query) -> Result { - Ok(db::Query { +pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> +where + E: sqlx::Executor<'e, Database = sqlx::Postgres>, +{ + let users = db::list( + executor, + db::Query { limit: query .limit .map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l))) @@ -36,20 +29,12 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, - ..Default::default() - }) - } -} - -pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> -where - E: sqlx::Executor<'e, Database = sqlx::Postgres>, -{ - let users = db::list(executor, query.try_into()?) - .await? - .into_iter() - .map(decode) - .collect::>()?; + }, + ) + .await? + .into_iter() + .map(decode) + .collect::>()?; Ok(users) } @@ -84,9 +69,7 @@ where } fn classify_delete_error(error: DatabaseError) -> RepositoryError { - match &error { - _ => RepositoryError::Database(error), - } + RepositoryError::Database(error) } fn decode(row: UserRow) -> Result {