Skip to content

Commit cb6c760

Browse files
authored
badges: Remove obsolete database calls (#5428)
* GET /crates: Remove obsolete database call * GET /crates/:crate_id: Remove obsolete database call
1 parent 4d4aacc commit cb6c760

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

src/controllers/krate/metadata.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,8 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
193193
None
194194
};
195195

196-
let badges = if include.badges {
197-
Some(
198-
badges::table
199-
.filter(badges::crate_id.eq(krate.id))
200-
.load(&*conn)?,
201-
)
202-
} else {
203-
None
204-
};
196+
let badges = if include.badges { Some(vec![]) } else { None };
197+
205198
let top_versions = if include.versions {
206199
Some(krate.top_versions(&conn)?)
207200
} else {

src/controllers/krate/search.rs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ use indexmap::IndexMap;
77

88
use crate::controllers::cargo_prelude::*;
99
use crate::controllers::helpers::Paginate;
10-
use crate::models::{
11-
Crate, CrateBadge, CrateOwner, CrateVersions, OwnerKind, TopVersions, Version,
12-
};
10+
use crate::models::{Crate, CrateOwner, CrateVersions, OwnerKind, TopVersions, Version};
1311
use crate::schema::*;
1412
use crate::util::errors::bad_request;
1513
use crate::views::EncodableCrate;
@@ -319,25 +317,16 @@ pub fn search(req: &mut dyn RequestExt) -> EndpointResult {
319317
.into_iter()
320318
.map(TopVersions::from_versions);
321319

322-
let badges: Vec<CrateBadge> = CrateBadge::belonging_to(&crates)
323-
.select((badges::crate_id, badges::all_columns))
324-
.load(&*conn)?;
325-
let badges = badges
326-
.grouped_by(&crates)
327-
.into_iter()
328-
.map(|badges| badges.into_iter().map(|cb| cb.badge).collect());
329-
330320
let crates = versions
331321
.zip(crates)
332322
.zip(perfect_matches)
333323
.zip(recent_downloads)
334-
.zip(badges)
335324
.map(
336-
|((((max_version, krate), perfect_match), recent_downloads), badges)| {
325+
|(((max_version, krate), perfect_match), recent_downloads)| {
337326
EncodableCrate::from_minimal(
338327
krate,
339328
Some(&max_version),
340-
Some(badges),
329+
Some(vec![]),
341330
perfect_match,
342331
Some(recent_downloads),
343332
)

0 commit comments

Comments
 (0)