Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions src/controllers/helpers/pagination.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,30 @@ impl PaginationOptions {
}
}

#[derive(Debug, Deserialize, utoipa::IntoParams)]
#[into_params(parameter_in = Query)]
pub struct PaginationQueryParams {
/// The page number to request.
///
/// This parameter is mutually exclusive with `seek` and not supported for
/// all requests.
#[param(value_type = Option<u32>, minimum = 1)]
page: Option<NonZeroU32>,

/// The number of items to request per page.
#[param(value_type = Option<u32>, minimum = 1)]
per_page: Option<NonZeroU32>,

/// The seek key to request.
///
/// This parameter is mutually exclusive with `page` and not supported for
/// all requests.
///
/// The seek key can usually be found in the `meta.next_page` field of
/// paginated responses.
seek: Option<String>,
}

pub(crate) struct PaginationOptionsBuilder {
limit_page_numbers: bool,
enable_pages: bool,
Expand All @@ -80,14 +104,7 @@ impl PaginationOptionsBuilder {
pub(crate) fn gather(self, parts: &Parts) -> AppResult<PaginationOptions> {
use axum::extract::Query;

#[derive(Debug, Deserialize)]
struct QueryParams {
page: Option<NonZeroU32>,
per_page: Option<NonZeroU32>,
seek: Option<String>,
}

let Query(params) = Query::<QueryParams>::try_from_uri(&parts.uri)
let Query(params) = Query::<PaginationQueryParams>::try_from_uri(&parts.uri)
.map_err(|err| bad_request(err.body_text()))?;

if params.seek.is_some() && params.page.is_some() {
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/krate/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::schema::*;
use crate::util::errors::{bad_request, AppResult};
use crate::views::EncodableCrate;

use crate::controllers::helpers::pagination::{Page, PaginationOptions};
use crate::controllers::helpers::pagination::{Page, PaginationOptions, PaginationQueryParams};
use crate::models::krate::ALL_COLUMNS;
use crate::sql::{array_agg, canon_crate_name, lower};
use crate::util::string_excl_null::StringExclNull;
Expand All @@ -37,7 +37,7 @@ use crate::util::RequestUtils;
#[utoipa::path(
get,
path = "/api/v1/crates",
params(ListQueryParams),
params(ListQueryParams, PaginationQueryParams),
tag = "crates",
responses((status = 200, description = "Successful Response")),
)]
Expand Down
40 changes: 40 additions & 0 deletions src/snapshots/crates_io__openapi__tests__openapi_snapshot.snap
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,46 @@ snapshot_kind: text
},
"type": "array"
}
},
{
"description": "The page number to request.\n\nThis parameter is mutually exclusive with `seek` and not supported for\nall requests.",
"in": "query",
"name": "page",
"required": false,
"schema": {
"format": "int32",
"minimum": 1,
"type": [
"integer",
"null"
]
}
},
{
"description": "The number of items to request per page.",
"in": "query",
"name": "per_page",
"required": false,
"schema": {
"format": "int32",
"minimum": 1,
"type": [
"integer",
"null"
]
}
},
{
"description": "The seek key to request.\n\nThis parameter is mutually exclusive with `page` and not supported for\nall requests.\n\nThe seek key can usually be found in the `meta.next_page` field of\npaginated responses.",
"in": "query",
"name": "seek",
"required": false,
"schema": {
"type": [
"string",
"null"
]
}
}
],
"responses": {
Expand Down