controllers/krate/search: Expose the yanked field

Author: eth3lbert

src/controllers/krate/search.rs

@@ -88,6 +88,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
             recent_crate_downloads::downloads.nullable(),
             0_f32.into_sql::<Float>(),
             versions::num.nullable(),
+            versions::yanked.nullable(),
         );
 
         let mut seek: Option<Seek> = None;
@@ -117,6 +118,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
                         recent_crate_downloads::downloads.nullable(),
                         rank.clone(),
                         versions::num.nullable(),
+                        versions::yanked.nullable(),
                     ));
                     seek = Some(Seek::Relevance);
                     query = query.then_order_by(rank.desc())
@@ -128,6 +130,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
                         recent_crate_downloads::downloads.nullable(),
                         0_f32.into_sql::<Float>(),
                         versions::num.nullable(),
+                        versions::yanked.nullable(),
                     ));
                     seek = Some(Seek::Query);
                 }
@@ -231,11 +234,14 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
         let crates = versions
             .zip(data)
             .map(
-                |(max_version, (krate, perfect_match, total, recent, _, default_version))| {
+                |(
+                    max_version,
+                    (krate, perfect_match, total, recent, _, default_version, yanked),
+                )| {
                     EncodableCrate::from_minimal(
                         krate,
                         default_version.as_deref(),
-                        None,
+                        yanked,
                         Some(&max_version),
                         perfect_match,
                         total,
@@ -622,7 +628,7 @@ mod seek {
                 downloads,
                 recent_downloads,
                 rank,
-                _,
+                ..,
             ) = *record;
 
             match *self {
@@ -645,7 +651,15 @@ mod seek {
     }
 }
 
-type Record = (Crate, bool, i64, Option<i64>, f32, Option<String>);
+type Record = (
+    Crate,
+    bool,
+    i64,
+    Option<i64>,
+    f32,
+    Option<String>,
+    Option<bool>,
+);
 
 type QuerySource = LeftJoinQuerySource<
     LeftJoinQuerySource<

src/tests/routes/crates/list.rs

@@ -713,11 +713,18 @@ async fn index_include_yanked() {
         assert_eq!(json.crates[1].name, "newest_yanked");
         assert_eq!(json.crates[2].name, "oldest_yanked");
         assert_eq!(json.crates[3].name, "unyanked");
+
         assert_eq!(
             default_versions_iter(&json.crates)
-                .flatten()
+                .flat_map(|s| s.as_deref())
+                .zip(yanked_iter(&json.crates).flatten().cloned())
                 .collect::<Vec<_>>(),
-            ["2.0.0", "1.0.0", "2.0.0", "2.0.0",]
+            [
+                ("2.0.0", true),
+                ("1.0.0", false),
+                ("2.0.0", false),
+                ("2.0.0", false),
+            ]
         );
     }
 
@@ -729,9 +736,10 @@ async fn index_include_yanked() {
         assert_eq!(json.crates[2].name, "unyanked");
         assert_eq!(
             default_versions_iter(&json.crates)
-                .flatten()
+                .flat_map(|s| s.as_deref())
+                .zip(yanked_iter(&json.crates).flatten().cloned())
                 .collect::<Vec<_>>(),
-            ["1.0.0", "2.0.0", "2.0.0",]
+            [("1.0.0", false), ("2.0.0", false), ("2.0.0", false),]
         );
     }
 }
@@ -751,6 +759,7 @@ async fn yanked_versions_are_not_considered_for_max_version() {
     for json in search_both(&anon, "q=foo").await {
         assert_eq!(json.meta.total, 1);
         assert_eq!(json.crates[0].default_version, Some("1.0.0".into()));
+        assert_eq!(json.crates[0].yanked, Some(false));
         assert_eq!(json.crates[0].max_version, "1.0.0");
     }
 }
@@ -773,6 +782,7 @@ async fn max_stable_version() {
     for json in search_both(&anon, "q=foo").await {
         assert_eq!(json.meta.total, 1);
         assert_eq!(json.crates[0].default_version, Some("1.0.0".into()));
+        assert_eq!(json.crates[0].yanked, Some(false));
         assert_eq!(json.crates[0].max_stable_version, Some("1.0.0".to_string()));
     }
 }
@@ -1149,6 +1159,7 @@ async fn page_with_seek<U: RequestHelper>(
             url = Some(new_url.to_owned());
             assert_ne!(resp.meta.total, 0);
             assert!(default_versions_iter(&resp.crates).all(Option::is_some));
+            assert!(yanked_iter(&resp.crates).all(Option::is_some));
         } else {
             assert_that!(resp.crates, empty());
             assert_eq!(resp.meta.total, 0);
@@ -1163,3 +1174,7 @@ fn default_versions_iter(
 ) -> impl Iterator<Item = &Option<String>> {
     crates.iter().map(|c| &c.default_version)
 }
+
+fn yanked_iter(crates: &[crate::tests::EncodableCrate]) -> impl Iterator<Item = &Option<bool>> {
+    crates.iter().map(|c| &c.yanked)
+}