From d219d63dca47026f9cb357174b1b6a8531904f02 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 27 Sep 2026 10:32:08 +0200 Subject: [PATCH] Added name query to accounts and updated query handling. --- ...e3084195d09c0a30f7e963a2497892398c6adc.json} | 5 +++-- server/src/database/accounts.rs | 17 +++++++++++++++-- server/src/database/recurring_transactions.rs | 9 +++++++++ server/src/database/transactions.rs | 9 +++++++++ server/src/repository/accounts.rs | 13 +++++++++++++ server/src/repository/recurring_transactions.rs | 10 ++++++++++ server/src/repository/transactions.rs | 10 ++++++++++ server/src/routes/accounts.rs | 3 +++ server/src/routes/scheduled_transactions.rs | 1 + server/src/routes/transactions.rs | 1 + 10 files changed, 74 insertions(+), 4 deletions(-) rename server/.sqlx/{query-b7bfaaed62475d82b8d551e1c9223ae42f06e1534d9587b876dbc494c9eeaebc.json => query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json} (58%) diff --git a/server/.sqlx/query-b7bfaaed62475d82b8d551e1c9223ae42f06e1534d9587b876dbc494c9eeaebc.json b/server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json similarity index 58% rename from server/.sqlx/query-b7bfaaed62475d82b8d551e1c9223ae42f06e1534d9587b876dbc494c9eeaebc.json rename to server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json index 1339fdc..811aa40 100644 --- a/server/.sqlx/query-b7bfaaed62475d82b8d551e1c9223ae42f06e1534d9587b876dbc494c9eeaebc.json +++ b/server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tSELECT id, name\n\t\tFROM accounts\n\t\tORDER BY name DESC, id DESC\n\t\tLIMIT $1\n\t\tOFFSET $2\n\t\t", + "query": "\n\t\tSELECT id, name\n\t\tFROM accounts\n\t\tWHERE ($1::text IS NULL OR name ILIKE '%' || $1 || '%')\n\t\tORDER BY name DESC, id DESC\n\t\tLIMIT $2\n\t\tOFFSET $3\n\t\t", "describe": { "columns": [ { @@ -16,6 +16,7 @@ ], "parameters": { "Left": [ + "Text", "Int8", "Int8" ] @@ -25,5 +26,5 @@ false ] }, - "hash": "b7bfaaed62475d82b8d551e1c9223ae42f06e1534d9587b876dbc494c9eeaebc" + "hash": "9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc" } diff --git a/server/src/database/accounts.rs b/server/src/database/accounts.rs index 70a6e05..4341451 100644 --- a/server/src/database/accounts.rs +++ b/server/src/database/accounts.rs @@ -3,10 +3,21 @@ use uuid::Uuid; use super::dtos::{AccountRow, Delete, Upsert}; pub struct Query { + pub name: Option, pub limit: Option, pub offset: Option, } +impl Default for Query { + fn default() -> Self { + Self { + name: None, + limit: None, + offset: None, + } + } +} + pub async fn query<'e, E>(executor: E, query: Query) -> Result, sqlx::Error> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, @@ -16,10 +27,12 @@ where r#" SELECT id, name FROM accounts + WHERE ($1::text IS NULL OR name ILIKE '%' || $1 || '%') ORDER BY name DESC, id DESC - LIMIT $1 - OFFSET $2 + LIMIT $2 + OFFSET $3 "#, + query.name, query.limit, query.offset, ) diff --git a/server/src/database/recurring_transactions.rs b/server/src/database/recurring_transactions.rs index f5fbefa..c9a333e 100644 --- a/server/src/database/recurring_transactions.rs +++ b/server/src/database/recurring_transactions.rs @@ -7,6 +7,15 @@ pub struct Query { pub offset: Option, } +impl Default for Query { + fn default() -> Self { + Self { + limit: None, + offset: None, + } + } +} + pub async fn query<'e, E>( executor: E, query: Query, diff --git a/server/src/database/transactions.rs b/server/src/database/transactions.rs index a147b04..b20ec0a 100644 --- a/server/src/database/transactions.rs +++ b/server/src/database/transactions.rs @@ -7,6 +7,15 @@ pub struct Query { pub offset: Option, } +impl Default for Query { + fn default() -> Self { + Self { + limit: None, + offset: None, + } + } +} + pub async fn query<'e, E>(executor: E, query: Query) -> Result, sqlx::Error> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, diff --git a/server/src/repository/accounts.rs b/server/src/repository/accounts.rs index 94eff60..c402b72 100644 --- a/server/src/repository/accounts.rs +++ b/server/src/repository/accounts.rs @@ -10,15 +10,27 @@ use crate::{ }; pub struct Query { + pub name: Option, pub limit: Option, 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 { + name: query.name, limit: query .limit .map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l))) @@ -27,6 +39,7 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, + ..Default::default() }) } } diff --git a/server/src/repository/recurring_transactions.rs b/server/src/repository/recurring_transactions.rs index f35e659..79cd72a 100644 --- a/server/src/repository/recurring_transactions.rs +++ b/server/src/repository/recurring_transactions.rs @@ -18,6 +18,15 @@ 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; @@ -31,6 +40,7 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, + ..Default::default() }) } } diff --git a/server/src/repository/transactions.rs b/server/src/repository/transactions.rs index 6aeca66..8c0e4a2 100644 --- a/server/src/repository/transactions.rs +++ b/server/src/repository/transactions.rs @@ -15,6 +15,15 @@ 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; @@ -28,6 +37,7 @@ impl TryFrom for db::Query { .offset .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) .transpose()?, + ..Default::default() }) } } diff --git a/server/src/routes/accounts.rs b/server/src/routes/accounts.rs index 8cbe006..0d130d1 100644 --- a/server/src/routes/accounts.rs +++ b/server/src/routes/accounts.rs @@ -28,6 +28,7 @@ pub fn create_router() -> axum::Router { #[derive(Debug, Deserialize)] pub struct QueryParams { + pub name: Option, pub limit: Option, pub offset: Option, } @@ -37,8 +38,10 @@ impl TryFrom for repository::Query { fn try_from(query: QueryParams) -> Result { Ok(repository::Query { + name: query.name, limit: Some(query.limit.unwrap_or(20)), offset: query.offset, + ..Default::default() }) } } diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index de68362..a66afa9 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -43,6 +43,7 @@ impl TryFrom for repository::Query { Ok(repository::Query { limit: Some(query.limit.unwrap_or(20)), offset: query.offset, + ..Default::default() }) } } diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index b25b51a..cc1ea5b 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -39,6 +39,7 @@ impl TryFrom for repository::Query { Ok(repository::Query { limit: Some(query.limit.unwrap_or(20)), offset: query.offset, + ..Default::default() }) } }