controllers/summary: Expose the default_version field

Author: eth3lbert

src/controllers/summary.rs

@@ -1,6 +1,8 @@
 use crate::app::AppState;
 use crate::models::{Category, Crate, CrateVersions, Keyword, TopVersions, Version};
-use crate::schema::{crate_downloads, crates, keywords, metadata, recent_crate_downloads};
+use crate::schema::{
+    crate_downloads, crates, default_versions, keywords, metadata, recent_crate_downloads, versions,
+};
 use crate::tasks::spawn_blocking;
 use crate::util::diesel::Conn;
 use crate::util::errors::AppResult;
@@ -25,7 +27,7 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
 
         fn encode_crates(
             conn: &mut impl Conn,
-            data: Vec<(Crate, i64, Option<i64>)>,
+            data: Vec<(Crate, i64, Option<i64>, Option<String>)>,
         ) -> AppResult<Vec<EncodableCrate>> {
             let krates = data.iter().map(|(c, ..)| c).collect::<Vec<_>>();
             let versions: Vec<Version> = krates.versions().load(conn)?;
@@ -34,10 +36,10 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
                 .into_iter()
                 .map(TopVersions::from_versions)
                 .zip(data)
-                .map(|(top_versions, (krate, total, recent))| {
+                .map(|(top_versions, (krate, total, recent, default_version))| {
                     Ok(EncodableCrate::from_minimal(
                         krate,
-                        None,
+                        default_version.as_deref(),
                         Some(&top_versions),
                         None,
                         false,
@@ -52,18 +54,23 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
             Crate::as_select(),
             crate_downloads::downloads,
             recent_crate_downloads::downloads.nullable(),
+            versions::num.nullable(),
         );
 
         let new_crates = 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)))
             .order(crates::created_at.desc())
             .select(selection)
             .limit(10)
             .load(conn)?;
         let just_updated = 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)))
             .filter(crates::updated_at.ne(crates::created_at))
             .order(crates::updated_at.desc())
             .select(selection)
@@ -73,6 +80,8 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
         let mut most_downloaded_query = 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 =
@@ -87,6 +96,8 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
         let mut most_recently_downloaded_query = 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

src/tests/routes/summary.rs

@@ -51,6 +51,7 @@ async fn summary_new_crates() {
 
         CrateBuilder::new("most_recent_downloads", user.id)
             .version(VersionBuilder::new("0.2.0"))
+            .version(VersionBuilder::new("0.2.1").yanked(true))
             .keyword("popular")
             .category("cat1")
             .downloads(5000)
@@ -59,6 +60,7 @@ async fn summary_new_crates() {
 
         CrateBuilder::new("just_updated", user.id)
             .version(VersionBuilder::new("0.1.0"))
+            .version(VersionBuilder::new("0.1.1").yanked(true))
             .version(VersionBuilder::new("0.1.2"))
             // update 'just_updated' krate. Others won't appear because updated_at == created_at.
             .updated_at(now_)
@@ -67,13 +69,15 @@ async fn summary_new_crates() {
         CrateBuilder::new("just_updated_patch", user.id)
             .version(VersionBuilder::new("0.1.0"))
             .version(VersionBuilder::new("0.2.0"))
+            .version(VersionBuilder::new("0.2.1").yanked(true))
             // Add a patch version be newer than the other versions, including the higher one.
             .version(VersionBuilder::new("0.1.1").created_at(now_plus_two))
             .updated_at(now_plus_two)
             .expect_build(conn);
 
         CrateBuilder::new("with_downloads", user.id)
             .version(VersionBuilder::new("0.3.0"))
+            .version(VersionBuilder::new("0.3.1").yanked(true))
             .keyword("popular")
             .downloads(1000)
             .expect_build(conn);
@@ -92,25 +96,37 @@ async fn summary_new_crates() {
     assert_eq!(json.num_crates, 5);
     assert_eq!(json.num_downloads, 6000);
     assert_eq!(json.most_downloaded[0].name, "most_recent_downloads");
+    assert_eq!(
+        json.most_downloaded[0].default_version,
+        Some("0.2.0".into())
+    );
     assert_eq!(json.most_downloaded[0].downloads, 5000);
     assert_eq!(json.most_downloaded[0].recent_downloads, Some(50));
     assert_eq!(
         json.most_recently_downloaded[0].name,
         "most_recent_downloads"
     );
+    assert_eq!(
+        json.most_recently_downloaded[0].default_version,
+        Some("0.2.0".into())
+    );
     assert_eq!(json.most_recently_downloaded[0].recent_downloads, Some(50));
     assert_eq!(json.popular_keywords[0].keyword, "popular");
     assert_eq!(json.popular_categories[0].category, "Category 1");
     assert_eq!(json.just_updated.len(), 2);
 
     assert_eq!(json.just_updated[0].name, "just_updated_patch");
+    assert_eq!(json.just_updated[0].default_version, Some("0.2.0".into()));
     assert_eq!(json.just_updated[0].max_version, "0.2.0");
     assert_eq!(json.just_updated[0].newest_version, "0.1.1");
 
     assert_eq!(json.just_updated[1].name, "just_updated");
+    assert_eq!(json.just_updated[1].default_version, Some("0.1.2".into()));
     assert_eq!(json.just_updated[1].max_version, "0.1.2");
     assert_eq!(json.just_updated[1].newest_version, "0.1.2");
 
+    assert_eq!(json.new_crates[0].name, "with_downloads");
+    assert_eq!(json.new_crates[0].default_version, Some("0.3.0".into()));
     assert_eq!(json.new_crates.len(), 5);
 }
 
@@ -132,6 +148,7 @@ async fn excluded_crate_id() {
 
     CrateBuilder::new("some_downloads", user.id)
         .version(VersionBuilder::new("0.1.0"))
+        .version(VersionBuilder::new("0.2.0").yanked(true))
         .description("description")
         .keyword("popular")
         .category("cat1")
@@ -151,9 +168,17 @@ async fn excluded_crate_id() {
 
     assert_eq!(json.most_downloaded.len(), 1);
     assert_eq!(json.most_downloaded[0].name, "some_downloads");
+    assert_eq!(
+        json.most_downloaded[0].default_version,
+        Some("0.1.0".into())
+    );
     assert_eq!(json.most_downloaded[0].downloads, 20);
 
     assert_eq!(json.most_recently_downloaded.len(), 1);
     assert_eq!(json.most_recently_downloaded[0].name, "some_downloads");
+    assert_eq!(
+        json.most_recently_downloaded[0].default_version,
+        Some("0.1.0".into())
+    );
     assert_eq!(json.most_recently_downloaded[0].recent_downloads, Some(10));
 }