Skip to content

badges: Remove obsolete database calls #5428

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 2 commits into from
Nov 6, 2022
Merged

badges: Remove obsolete database calls #5428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5703c62
GET /crates: Remove obsolete database call
Turbo87 Nov 6, 2022
3057eb3
GET /crates/:crate_id: Remove obsolete database call
Turbo87 Nov 6, 2022
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
11 changes: 2 additions & 9 deletions src/controllers/krate/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,8 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
None
};

let badges = if include.badges {
Some(
badges::table
.filter(badges::crate_id.eq(krate.id))
.load(&*conn)?,
)
} else {
None
};
let badges = if include.badges { Some(vec![]) } else { None };

let top_versions = if include.versions {
Some(krate.top_versions(&conn)?)
} else {
Expand Down
17 changes: 3 additions & 14 deletions src/controllers/krate/search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ use indexmap::IndexMap;

use crate::controllers::cargo_prelude::*;
use crate::controllers::helpers::Paginate;
use crate::models::{
Crate, CrateBadge, CrateOwner, CrateVersions, OwnerKind, TopVersions, Version,
};
use crate::models::{Crate, CrateOwner, CrateVersions, OwnerKind, TopVersions, Version};
use crate::schema::*;
use crate::util::errors::bad_request;
use crate::views::EncodableCrate;
Expand Down Expand Up @@ -319,25 +317,16 @@ pub fn search(req: &mut dyn RequestExt) -> EndpointResult {
.into_iter()
.map(TopVersions::from_versions);

let badges: Vec<CrateBadge> = CrateBadge::belonging_to(&crates)
.select((badges::crate_id, badges::all_columns))
.load(&*conn)?;
let badges = badges
.grouped_by(&crates)
.into_iter()
.map(|badges| badges.into_iter().map(|cb| cb.badge).collect());

let crates = versions
.zip(crates)
.zip(perfect_matches)
.zip(recent_downloads)
.zip(badges)
.map(
|((((max_version, krate), perfect_match), recent_downloads), badges)| {
|(((max_version, krate), perfect_match), recent_downloads)| {
EncodableCrate::from_minimal(
krate,
Some(&max_version),
Some(badges),
Some(vec![]),
perfect_match,
Some(recent_downloads),
)
Expand Down