From 5703c6245d7e41eba3937334d7520473a55c36e5 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sun, 6 Nov 2022 10:40:40 +0100
Subject: [PATCH 1/2] GET /crates: Remove obsolete database call

---
 src/controllers/krate/search.rs | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/controllers/krate/search.rs b/src/controllers/krate/search.rs
index 0793d481a22..b6e36dba068 100644
--- a/src/controllers/krate/search.rs
+++ b/src/controllers/krate/search.rs
@@ -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;
@@ -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),
                 )

From 3057eb352aaa15d8c14c637c8d91a5235e4c2fcb Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sun, 6 Nov 2022 10:40:17 +0100
Subject: [PATCH 2/2] GET /crates/:crate_id: Remove obsolete database call

---
 src/controllers/krate/metadata.rs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/controllers/krate/metadata.rs b/src/controllers/krate/metadata.rs
index 943f803019b..c7e691c7f05 100644
--- a/src/controllers/krate/metadata.rs
+++ b/src/controllers/krate/metadata.rs
@@ -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 {