Skip to content

controllers/summary: Remove unnecessary .is_empty() conditions #9862

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
Nov 7, 2024
Merged

controllers/summary: Remove unnecessary .is_empty() conditions #9862

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
18 changes: 4 additions & 14 deletions src/controllers/summary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,34 +96,24 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
.load(&mut conn)
.await?;

let mut most_downloaded_query = crates::table
let most_downloaded = crates::table
.inner_join(crate_downloads::table)
.left_join(recent_crate_downloads::table)
.left_join(default_versions::table)
.left_join(versions::table.on(default_versions::version_id.eq(versions::id)))
.into_boxed();
if !config.excluded_crate_names.is_empty() {
most_downloaded_query =
most_downloaded_query.filter(crates::name.ne_all(&config.excluded_crate_names));
}
let most_downloaded = most_downloaded_query
.filter(crates::name.ne_all(&config.excluded_crate_names))
.then_order_by(crate_downloads::downloads.desc())
.select(selection)
.limit(10)
.load(&mut conn)
.await?;

let mut most_recently_downloaded_query = crates::table
let most_recently_downloaded = crates::table
.inner_join(crate_downloads::table)
.inner_join(recent_crate_downloads::table)
.left_join(default_versions::table)
.left_join(versions::table.on(default_versions::version_id.eq(versions::id)))
.into_boxed();
if !config.excluded_crate_names.is_empty() {
most_recently_downloaded_query = most_recently_downloaded_query
.filter(crates::name.ne_all(&config.excluded_crate_names));
}
let most_recently_downloaded = most_recently_downloaded_query
.filter(crates::name.ne_all(&config.excluded_crate_names))
.then_order_by(recent_crate_downloads::downloads.desc())
.select(selection)
.limit(10)
Expand Down