diff --git a/server/src/routes/accounts.rs b/server/src/routes/accounts.rs index 4474b64..2f77485 100644 --- a/server/src/routes/accounts.rs +++ b/server/src/routes/accounts.rs @@ -33,30 +33,24 @@ pub struct QueryParams { pub offset: Option, } -impl TryFrom for repository::accounts::Query { - type Error = AppError; - - fn try_from(query: QueryParams) -> Result { - Ok(repository::accounts::Query { - name: query.name, - limit: Some(query.limit.unwrap_or(20)), - offset: query.offset, - ..Default::default() - }) - } -} - #[axum::debug_handler] #[tracing::instrument(skip(pool))] async fn list_accounts( State(pool): State, Query(query): Query, ) -> Result>, AppError> { - let accounts = repository::accounts::list(&pool, query.try_into()?) - .await? - .into_iter() - .map(AccountResponse::from) - .collect(); + let accounts = repository::accounts::list( + &pool, + repository::accounts::Query { + name: query.name, + limit: Some(query.limit.unwrap_or(20)), + offset: query.offset, + }, + ) + .await? + .into_iter() + .map(AccountResponse::from) + .collect(); Ok(Json(accounts)) } diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 3166fa0..015d49d 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -38,18 +38,6 @@ pub struct QueryParams { pub offset: Option, } -impl TryFrom for repository::recurring_transactions::Query { - type Error = AppError; - - fn try_from(query: QueryParams) -> Result { - Ok(repository::recurring_transactions::Query { - limit: Some(query.limit.unwrap_or(20)), - offset: query.offset, - ..Default::default() - }) - } -} - #[axum::debug_handler] #[tracing::instrument(skip(pool))] async fn list_scheduled_transactions( @@ -57,7 +45,10 @@ async fn list_scheduled_transactions( Query(query): Query, ) -> Result>, AppError> { let now = Utc::now(); - let query = query.try_into()?; + let query = repository::recurring_transactions::Query { + limit: Some(query.limit.unwrap_or(20)), + offset: query.offset, + }; let mut tx = pool.begin().await.map_err(RepositoryError::from)?; let transactions = repository::recurring_transactions::query(&mut *tx, query).await?; diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index 5645954..df86697 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -35,26 +35,19 @@ pub struct QueryParams { pub offset: Option, } -impl TryFrom for repository::transactions::Query { - type Error = AppError; - - fn try_from(query: QueryParams) -> Result { - Ok(repository::transactions::Query { - limit: Some(query.limit.unwrap_or(20)), - offset: query.offset, - ..Default::default() - }) - } -} - #[axum::debug_handler] #[tracing::instrument(skip(pool))] async fn list_transactions( State(pool): State, Query(query): Query, ) -> Result>, AppError> { + let query = repository::transactions::Query { + limit: Some(query.limit.unwrap_or(20)), + offset: query.offset, + }; + let mut tx = pool.begin().await.map_err(RepositoryError::from)?; - let transactions = repository::transactions::list(&mut *tx, query.try_into()?).await?; + let transactions = repository::transactions::list(&mut *tx, query).await?; let accounts = get_accounts_for_transactions(&mut tx, &transactions).await?; tx.commit().await.map_err(RepositoryError::from)?; diff --git a/server/src/routes/users.rs b/server/src/routes/users.rs index 07a7d4a..aa8286d 100644 --- a/server/src/routes/users.rs +++ b/server/src/routes/users.rs @@ -32,29 +32,23 @@ pub struct QueryParams { pub offset: Option, } -impl TryFrom for repository::users::Query { - type Error = AppError; - - fn try_from(query: QueryParams) -> Result { - Ok(repository::users::Query { - limit: Some(query.limit.unwrap_or(20)), - offset: query.offset, - ..Default::default() - }) - } -} - #[axum::debug_handler] #[tracing::instrument(skip(pool))] async fn list_users( State(pool): State, Query(query): Query, ) -> Result>, AppError> { - let users = repository::users::list(&pool, query.try_into()?) - .await? - .into_iter() - .map(UserResponse::from) - .collect(); + let users = repository::users::list( + &pool, + repository::users::Query { + limit: Some(query.limit.unwrap_or(20)), + offset: query.offset, + }, + ) + .await? + .into_iter() + .map(UserResponse::from) + .collect(); Ok(Json(users)) }