Skip to content

controllers/krate/versions: Extract ListQueryParams::include() fn #10283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 30, 2024
Merged

controllers/krate/versions: Extract ListQueryParams::include() fn #10283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions src/controllers/krate/versions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ pub struct ListQueryParams {
sort: Option<String>,
}

impl ListQueryParams {
fn include(&self) -> AppResult<ShowIncludeMode> {
let include = self
.include
.as_ref()
.map(|mode| ShowIncludeMode::from_str(mode))
.transpose()?
.unwrap_or_default();
Ok(include)
}
}

/// List all versions of a crate.
#[utoipa::path(
get,
Expand Down Expand Up @@ -73,18 +85,12 @@ pub async fn list_versions(
None => None,
};

let include = params
.include
.map(|mode| ShowIncludeMode::from_str(&mode))
.transpose()?
.unwrap_or_default();

// Sort by semver by default
let versions_and_publishers = match params.sort.map(|s| s.to_lowercase()).as_deref() {
let versions_and_publishers = match &params.sort.as_ref().map(|s| s.to_lowercase()).as_deref() {
Some("date") => {
list_by_date(crate_id, pagination.as_ref(), include, &req, &mut conn).await?
list_by_date(crate_id, pagination.as_ref(), &params, &req, &mut conn).await?
}
_ => list_by_semver(crate_id, pagination.as_ref(), include, &req, &mut conn).await?,
_ => list_by_semver(crate_id, pagination.as_ref(), &params, &req, &mut conn).await?,
};

let versions = versions_and_publishers
Expand All @@ -111,7 +117,7 @@ pub async fn list_versions(
async fn list_by_date(
crate_id: i32,
options: Option<&PaginationOptions>,
include: ShowIncludeMode,
params: &ListQueryParams,
req: &Parts,
conn: &mut AsyncPgConnection,
) -> AppResult<PaginatedVersionsAndPublishers> {
Expand Down Expand Up @@ -148,7 +154,7 @@ async fn list_by_date(
.map(|p| req.query_with_params(p));
};

let release_tracks = if include.release_tracks {
let release_tracks = if params.include()?.release_tracks {
let mut sorted_versions = IndexSet::new();
if options.is_some() {
versions::table
Expand Down Expand Up @@ -216,12 +222,13 @@ async fn list_by_date(
async fn list_by_semver(
crate_id: i32,
options: Option<&PaginationOptions>,
include: ShowIncludeMode,
params: &ListQueryParams,
req: &Parts,
conn: &mut AsyncPgConnection,
) -> AppResult<PaginatedVersionsAndPublishers> {
use seek::*;

let include = params.include()?;
let (data, total, release_tracks) = if let Some(options) = options {
// Since versions will only increase in the future and both sorting and pagination need to
// happen on the app server, implementing it with fetching only the data needed for sorting
Expand Down