No need for query transformation gymnastics if they're only used at one place.

This commit is contained in:
Rogier Reerink
2026-10-08 15:43:51 +02:00
parent c88cfac8a0
commit 8576da980e
4 changed files with 33 additions and 61 deletions
+8 -14
View File
@@ -33,26 +33,20 @@ pub struct QueryParams {
pub offset: Option<u64>,
}
impl TryFrom<QueryParams> for repository::accounts::Query {
type Error = AppError;
fn try_from(query: QueryParams) -> Result<Self, Self::Error> {
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<PgPool>,
Query(query): Query<QueryParams>,
) -> Result<Json<Vec<AccountResponse>>, AppError> {
let accounts = repository::accounts::list(&pool, query.try_into()?)
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)
+4 -13
View File
@@ -38,18 +38,6 @@ pub struct QueryParams {
pub offset: Option<u64>,
}
impl TryFrom<QueryParams> for repository::recurring_transactions::Query {
type Error = AppError;
fn try_from(query: QueryParams) -> Result<Self, Self::Error> {
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<QueryParams>,
) -> Result<Json<Vec<ScheduledTransactionResponse>>, 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?;
+6 -13
View File
@@ -35,26 +35,19 @@ pub struct QueryParams {
pub offset: Option<u64>,
}
impl TryFrom<QueryParams> for repository::transactions::Query {
type Error = AppError;
fn try_from(query: QueryParams) -> Result<Self, Self::Error> {
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<PgPool>,
Query(query): Query<QueryParams>,
) -> Result<Json<Vec<TransactionResponse>>, 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)?;
+7 -13
View File
@@ -32,25 +32,19 @@ pub struct QueryParams {
pub offset: Option<u64>,
}
impl TryFrom<QueryParams> for repository::users::Query {
type Error = AppError;
fn try_from(query: QueryParams) -> Result<Self, Self::Error> {
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<PgPool>,
Query(query): Query<QueryParams>,
) -> Result<Json<Vec<UserResponse>>, AppError> {
let users = repository::users::list(&pool, query.try_into()?)
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)