diff --git a/server/.sqlx/query-adfd3f5ee43fd9877d4411cb20b2d147ec204db6783a570668b4843c1c57ea4e.json b/server/.sqlx/query-b90fc3934e144910e05cddcfb11e66a670b842a4636960ac59f18d741cd9cc28.json similarity index 88% rename from server/.sqlx/query-adfd3f5ee43fd9877d4411cb20b2d147ec204db6783a570668b4843c1c57ea4e.json rename to server/.sqlx/query-b90fc3934e144910e05cddcfb11e66a670b842a4636960ac59f18d741cd9cc28.json index 85cf5db..7041a1b 100644 --- a/server/.sqlx/query-adfd3f5ee43fd9877d4411cb20b2d147ec204db6783a570668b4843c1c57ea4e.json +++ b/server/.sqlx/query-b90fc3934e144910e05cddcfb11e66a670b842a4636960ac59f18d741cd9cc28.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n id,\n name,\n amount_cents,\n direction,\n starts_at,\n ends_at,\n recurrence_every,\n recurrence_unit,\n weekend_adjustment\n FROM recurring_transactions\n ORDER BY starts_at DESC, id DESC\n ", + "query": "\n SELECT\n id,\n name,\n amount_cents,\n direction,\n starts_at,\n ends_at,\n recurrence_every,\n recurrence_unit,\n weekend_adjustment\n FROM recurring_transactions\n ORDER BY starts_at DESC, id DESC\n LIMIT $1 OFFSET $2\n ", "describe": { "columns": [ { @@ -50,7 +50,10 @@ } ], "parameters": { - "Left": [] + "Left": [ + "Int8", + "Int8" + ] }, "nullable": [ false, @@ -64,5 +67,5 @@ true ] }, - "hash": "adfd3f5ee43fd9877d4411cb20b2d147ec204db6783a570668b4843c1c57ea4e" + "hash": "b90fc3934e144910e05cddcfb11e66a670b842a4636960ac59f18d741cd9cc28" } diff --git a/server/.sqlx/query-7e9c0f4b0502b63b823233a826c9388703e9568f769cfc50c40ac0929750b744.json b/server/.sqlx/query-e7d222f4f85fc93521d38786aff2d2b7012139d5b3175a4eae06988317475c5d.json similarity index 82% rename from server/.sqlx/query-7e9c0f4b0502b63b823233a826c9388703e9568f769cfc50c40ac0929750b744.json rename to server/.sqlx/query-e7d222f4f85fc93521d38786aff2d2b7012139d5b3175a4eae06988317475c5d.json index 1097535..3ea41b1 100644 --- a/server/.sqlx/query-7e9c0f4b0502b63b823233a826c9388703e9568f769cfc50c40ac0929750b744.json +++ b/server/.sqlx/query-e7d222f4f85fc93521d38786aff2d2b7012139d5b3175a4eae06988317475c5d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tSELECT id, description, amount_cents, direction, date\n\t\tFROM transactions\n\t\tORDER BY date DESC, id DESC\n\t\t", + "query": "\n\t\tSELECT id, description, amount_cents, direction, date\n\t\tFROM transactions\n\t\tORDER BY date DESC, id DESC\n\t\tLIMIT $1\n\t\tOFFSET $2\n\t\t", "describe": { "columns": [ { @@ -30,7 +30,10 @@ } ], "parameters": { - "Left": [] + "Left": [ + "Int8", + "Int8" + ] }, "nullable": [ false, @@ -40,5 +43,5 @@ false ] }, - "hash": "7e9c0f4b0502b63b823233a826c9388703e9568f769cfc50c40ac0929750b744" + "hash": "e7d222f4f85fc93521d38786aff2d2b7012139d5b3175a4eae06988317475c5d" } diff --git a/server/src/database/recurring_transactions.rs b/server/src/database/recurring_transactions.rs index 76bae0b..c15370f 100644 --- a/server/src/database/recurring_transactions.rs +++ b/server/src/database/recurring_transactions.rs @@ -5,8 +5,14 @@ use crate::database::{ dtos::recurring_transaction::RecurringTransactionRow, }; +pub struct Query { + pub limit: Option, + pub offset: Option, +} + pub async fn query_recurring_transactions<'e, E>( executor: E, + query: Query, ) -> Result, sqlx::Error> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, @@ -26,7 +32,10 @@ where weekend_adjustment FROM recurring_transactions ORDER BY starts_at DESC, id DESC + LIMIT $1 OFFSET $2 "#, + query.limit, + query.offset, ) .fetch_all(executor) .await diff --git a/server/src/database/transactions.rs b/server/src/database/transactions.rs index 011fa48..0b865ec 100644 --- a/server/src/database/transactions.rs +++ b/server/src/database/transactions.rs @@ -5,7 +5,15 @@ use crate::database::{ dtos::transaction::TransactionRow, }; -pub async fn query_transactions<'e, E>(executor: E) -> Result, sqlx::Error> +pub struct Query { + pub limit: Option, + pub offset: Option, +} + +pub async fn query_transactions<'e, E>( + executor: E, + query: Query, +) -> Result, sqlx::Error> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -15,7 +23,11 @@ where SELECT id, description, amount_cents, direction, date FROM transactions ORDER BY date DESC, id DESC + LIMIT $1 + OFFSET $2 "#, + query.limit, + query.offset, ) .fetch_all(executor) .await diff --git a/server/src/error.rs b/server/src/error.rs index a17d013..506a6ac 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -29,15 +29,18 @@ impl IntoResponse for AppError { Self::NotFound => { return error_response(StatusCode::NOT_FOUND, "Not found"); } - Self::Validation(error) => { - return error_response(StatusCode::UNPROCESSABLE_ENTITY, error.to_string()); - } Self::Repository(RepositoryError::Database(error)) => { tracing::error!(%error, "Database query failed"); } Self::Repository(RepositoryError::Decode(error)) => { tracing::error!(%error, "Invalid stored data"); } + Self::Repository(RepositoryError::QueryConversion(error)) => { + return error_response(StatusCode::BAD_REQUEST, error.to_string()); + } + Self::Validation(error) => { + return error_response(StatusCode::UNPROCESSABLE_ENTITY, error.to_string()); + } } error_response(StatusCode::INTERNAL_SERVER_ERROR, "Internal server error") diff --git a/server/src/repository.rs b/server/src/repository.rs index 5034cd0..79a2561 100644 --- a/server/src/repository.rs +++ b/server/src/repository.rs @@ -12,6 +12,9 @@ pub enum RepositoryError { #[error(transparent)] Decode(#[from] DecodeError), + + #[error(transparent)] + QueryConversion(#[from] QueryConversionError), } #[derive(Debug, thiserror::Error)] @@ -34,3 +37,12 @@ pub enum DecodeError { #[error("invalid weekend_adjustment value: {0}")] WeekendAdjustment(String), } + +#[derive(Debug, thiserror::Error)] +pub enum QueryConversionError { + #[error("Failed to convert limit: {0}")] + Limit(u64), + + #[error("Failed to convert offset: {0}")] + Offset(u64), +} diff --git a/server/src/repository/recurring_transactions.rs b/server/src/repository/recurring_transactions.rs index 313d30a..7bccf1d 100644 --- a/server/src/repository/recurring_transactions.rs +++ b/server/src/repository/recurring_transactions.rs @@ -1,7 +1,7 @@ use uuid::Uuid; use super::{ - DecodeError, Delete, RepositoryError, Upsert, + DecodeError, Delete, QueryConversionError, RepositoryError, Upsert, encoding::{ decode_direction, decode_recurrence_unit, decode_weekend_adjustment, encode_direction, encode_recurrence_unit, encode_weekend_adjustment, @@ -14,11 +14,36 @@ use crate::{ domain::{Cents, Recurrence, RecurrenceInterval, RecurringTransaction, Schedule}, }; -pub async fn list<'e, E>(executor: E) -> Result, RepositoryError> +pub struct Query { + pub limit: Option, + pub offset: Option, +} + +impl TryFrom for db::Query { + type Error = QueryConversionError; + + fn try_from(query: Query) -> Result { + Ok(db::Query { + limit: query + .limit + .map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l))) + .transpose()?, + offset: query + .offset + .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) + .transpose()?, + }) + } +} + +pub async fn query<'e, E>( + executor: E, + query: Query, +) -> Result, RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transactions = db::query_recurring_transactions(executor) + let transactions = db::query_recurring_transactions(executor, query.try_into()?) .await? .into_iter() .map(decode) diff --git a/server/src/repository/transactions.rs b/server/src/repository/transactions.rs index 684af77..c37452a 100644 --- a/server/src/repository/transactions.rs +++ b/server/src/repository/transactions.rs @@ -1,7 +1,7 @@ use uuid::Uuid; use super::{ - DecodeError, Delete, RepositoryError, Upsert, + DecodeError, Delete, QueryConversionError, RepositoryError, Upsert, encoding::{decode_direction, encode_direction}, }; use crate::{ @@ -9,11 +9,33 @@ use crate::{ domain::{Cents, Transaction}, }; -pub async fn list<'e, E>(executor: E) -> Result, RepositoryError> +pub struct Query { + pub limit: Option, + pub offset: Option, +} + +impl TryFrom for db::Query { + type Error = QueryConversionError; + + fn try_from(query: Query) -> Result { + Ok(db::Query { + limit: query + .limit + .map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l))) + .transpose()?, + offset: query + .offset + .map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o))) + .transpose()?, + }) + } +} + +pub async fn list<'e, E>(executor: E, query: Query) -> Result, RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transactions = db::query_transactions(executor) + let transactions = db::query_transactions(executor, query.try_into()?) .await? .into_iter() .map(decode) diff --git a/server/src/routes/extractors.rs b/server/src/routes/extractors.rs index bccb7a4..da8b727 100644 --- a/server/src/routes/extractors.rs +++ b/server/src/routes/extractors.rs @@ -1,2 +1,3 @@ pub mod json; pub mod path; +pub mod query; diff --git a/server/src/routes/extractors/query.rs b/server/src/routes/extractors/query.rs new file mode 100644 index 0000000..5e93614 --- /dev/null +++ b/server/src/routes/extractors/query.rs @@ -0,0 +1,24 @@ +use axum::extract::FromRequestParts; +use serde::de::DeserializeOwned; + +use crate::error::AppError; + +pub struct Query(pub T); + +impl FromRequestParts for Query +where + T: DeserializeOwned + Send, + S: Send + Sync, +{ + type Rejection = AppError; + + async fn from_request_parts( + parts: &mut axum::http::request::Parts, + state: &S, + ) -> Result { + axum::extract::Query::::from_request_parts(parts, state) + .await + .map(|axum::extract::Query(value)| Self(value)) + .map_err(|rejection| AppError::BadRequest(rejection.body_text())) + } +} diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 0f3c8d5..4a55ba3 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -1,5 +1,6 @@ use axum::{extract::State, http::StatusCode}; use chrono::{DateTime, Utc}; +use serde::Deserialize; use sqlx::PgPool; use uuid::Uuid; @@ -11,7 +12,7 @@ use crate::{ dtos::scheduled_transaction::{ RecurringTransactionResponse, ScheduledTransactionRequest, ScheduledTransactionResponse, }, - extractors::{json::Json, path::Path}, + extractors::{json::Json, path::Path, query::Query}, }, }; @@ -26,13 +27,31 @@ pub fn create_router() -> axum::Router { ) } +#[derive(Debug, Deserialize)] +pub struct QueryParams { + pub limit: Option, + pub offset: Option, +} + +impl TryFrom for repository::Query { + type Error = AppError; + + fn try_from(query: QueryParams) -> Result { + Ok(repository::Query { + limit: Some(query.limit.unwrap_or(20)), + offset: query.offset, + }) + } +} + #[axum::debug_handler] #[tracing::instrument(skip(pool))] async fn get_scheduled_transactions( State(pool): State, + Query(query): Query, ) -> Result>, AppError> { let now = Utc::now(); - let transactions = repository::list(&pool) + let transactions = repository::query(&pool, query.try_into()?) .await? .into_iter() .map(|transaction| create_response(transaction, now)) diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index 7f59a20..27e3043 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -1,4 +1,5 @@ use axum::{extract::State, http::StatusCode}; +use serde::Deserialize; use sqlx::PgPool; use uuid::Uuid; @@ -7,7 +8,7 @@ use crate::{ repository::{Delete, Upsert, transactions as repository}, routes::{ dtos::transaction::{TransactionRequest, TransactionResponse}, - extractors::{json::Json, path::Path}, + extractors::{json::Json, path::Path, query::Query}, }, }; @@ -22,12 +23,30 @@ pub fn create_router() -> axum::Router { ) } +#[derive(Debug, Deserialize)] +pub struct QueryParams { + pub limit: Option, + pub offset: Option, +} + +impl TryFrom for repository::Query { + type Error = AppError; + + fn try_from(query: QueryParams) -> Result { + Ok(repository::Query { + limit: Some(query.limit.unwrap_or(20)), + offset: query.offset, + }) + } +} + #[axum::debug_handler] #[tracing::instrument(skip(pool))] async fn get_transactions( State(pool): State, + Query(query): Query, ) -> Result>, AppError> { - let transactions = repository::list(&pool) + let transactions = repository::list(&pool, query.try_into()?) .await? .into_iter() .map(TransactionResponse::from)