Expose num_versions column on the API

Author: eth3lbert

src/controllers/krate/metadata.rs

@@ -75,21 +75,27 @@ pub async fn find_crate(
         .transpose()?
         .unwrap_or_default();
 
-    let (krate, downloads, default_version, yanked): (Crate, i64, Option<String>, Option<bool>) =
-        Crate::by_name(&path.name)
-            .inner_join(crate_downloads::table)
-            .left_join(default_versions::table)
-            .left_join(versions::table.on(default_versions::version_id.eq(versions::id)))
-            .select((
-                Crate::as_select(),
-                crate_downloads::downloads,
-                versions::num.nullable(),
-                versions::yanked.nullable(),
-            ))
-            .first(&mut conn)
-            .await
-            .optional()?
-            .ok_or_else(|| crate_not_found(&path.name))?;
+    let (krate, downloads, default_version, yanked, num_versions): (
+        Crate,
+        i64,
+        Option<String>,
+        Option<bool>,
+        Option<i32>,
+    ) = Crate::by_name(&path.name)
+        .inner_join(crate_downloads::table)
+        .left_join(default_versions::table)
+        .left_join(versions::table.on(default_versions::version_id.eq(versions::id)))
+        .select((
+            Crate::as_select(),
+            crate_downloads::downloads,
+            versions::num.nullable(),
+            versions::yanked.nullable(),
+            default_versions::num_versions.nullable(),
+        ))
+        .first(&mut conn)
+        .await
+        .optional()?
+        .ok_or_else(|| crate_not_found(&path.name))?;
 
     let mut versions_publishers_and_audit_actions = if include.versions {
         let versions_and_publishers: Vec<(Version, Option<User>)> = Version::belonging_to(&krate)
@@ -183,6 +189,7 @@ pub async fn find_crate(
     let encodable_crate = EncodableCrate::from(
         krate.clone(),
         default_version.as_deref(),
+        num_versions.unwrap_or_default(),
         yanked,
         top_versions.as_ref(),
         ids,

src/controllers/krate/publish.rs

@@ -436,11 +436,12 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
         let existing_default_version = default_versions::table
             .inner_join(versions::table)
             .filter(default_versions::crate_id.eq(krate.id))
-            .select(DefaultVersion::as_select())
-            .first(conn)
+            .select((DefaultVersion::as_select(), default_versions::num_versions))
+            .first::<(DefaultVersion, Option<i32>)>(conn)
             .await
             .optional()?;
 
+        let num_versions = existing_default_version.as_ref().and_then(|t|t.1).unwrap_or_default();
         let mut default_version = None;
         // Upsert the `default_value` determined by the existing `default_value` and the
         // published version. Note that this could potentially write an outdated version
@@ -450,7 +451,7 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
         // Compared to only using a background job, this prevents us from getting into a
         // situation where a crate exists in the `crates` table but doesn't have a default
         // version in the `default_versions` table.
-        if let Some(existing_default_version) = existing_default_version {
+        if let Some((existing_default_version, _)) = existing_default_version {
             let published_default_version = DefaultVersion {
                 id: version.id,
                 num: semver,
@@ -562,6 +563,7 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
             krate: EncodableCrate::from_minimal(
                 krate,
                 default_version.or(Some(version_string)).as_deref(),
+                num_versions,
                 Some(false),
                 Some(&top_versions),
                 false,

src/controllers/krate/search.rs

@@ -82,6 +82,7 @@ pub async fn list_crates(
         0_f32.into_sql::<Float>(),
         versions::num.nullable(),
         versions::yanked.nullable(),
+        default_versions::num_versions.nullable(),
     );
 
     let mut seek: Option<Seek> = None;
@@ -113,6 +114,7 @@ pub async fn list_crates(
                     rank,
                     versions::num.nullable(),
                     versions::yanked.nullable(),
+                    default_versions::num_versions.nullable(),
                 ));
                 seek = Some(Seek::Relevance);
                 query = query.then_order_by(rank.desc())
@@ -125,6 +127,7 @@ pub async fn list_crates(
                     0_f32.into_sql::<Float>(),
                     versions::num.nullable(),
                     versions::yanked.nullable(),
+                    default_versions::num_versions.nullable(),
                 ));
                 seek = Some(Seek::Query);
             }
@@ -227,6 +230,7 @@ pub async fn list_crates(
             EncodableCrate::from_minimal(
                 record.krate,
                 record.default_version.as_deref(),
+                record.num_versions.unwrap_or_default(),
                 record.yanked,
                 Some(&max_version),
                 record.exact_match,
@@ -704,6 +708,7 @@ struct Record {
     rank: f32,
     default_version: Option<String>,
     yanked: Option<bool>,
+    num_versions: Option<i32>,
 }
 
 type QuerySource = LeftJoinQuerySource<

src/controllers/summary.rs

@@ -135,6 +135,8 @@ struct Record {
     default_version: Option<String>,
     #[diesel(select_expression = versions::columns::yanked.nullable())]
     yanked: Option<bool>,
+    #[diesel(select_expression = default_versions::columns::num_versions.nullable())]
+    num_versions: Option<i32>,
 }
 
 fn encode_crates(
@@ -165,6 +167,7 @@ fn encode_crates(
                 Ok(EncodableCrate::from_minimal(
                     record.krate,
                     record.default_version.as_deref(),
+                    record.num_versions.unwrap_or_default(),
                     record.yanked,
                     Some(&top_versions),
                     false,

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_new",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "2.0.0",
     "name": "foo_twice",
     "newest_version": "2.0.0",
+    "num_versions": 2,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice_alt.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "2.0.0",
     "name": "foo_twice",
     "newest_version": "0.99.0",
+    "num_versions": 2,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_weird_version.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "0.0.0-pre",
     "name": "foo_weird",
     "newest_version": "0.0.0-pre",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_with_token.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_new",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__build_metadata__version_with_build_metadata@build_metadata_1.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0+foo",
     "name": "foo",
     "newest_version": "1.0.0+foo",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__build_metadata__version_with_build_metadata@build_metadata_2.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0-beta.1",
     "name": "foo",
     "newest_version": "1.0.0-beta.1",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__build_metadata__version_with_build_metadata@build_metadata_3.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0+foo",
     "name": "foo",
     "newest_version": "1.0.0+foo",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__categories__good_categories.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_good_cat",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__dependencies__dep_limit-2.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__edition__edition_is_saved.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__keywords__good_keywords.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_good_key",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__links__crate_with_links_field.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__boolean_readme.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__manifest__lib_and_bin_crate.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__max_size__tarball_between_default_axum_limit_and_max_upload_size.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.1.0",
     "name": "foo",
     "newest_version": "1.1.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__readme__new_krate_with_empty_readme.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_readme",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__readme__new_krate_with_readme.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_readme",
     "newest_version": "1.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__readme__new_krate_with_readme_and_plus_version.snap

@@ -27,6 +27,7 @@ expression: response.json()
     "max_version": "1.0.0+foo",
     "name": "foo_readme",
     "newest_version": "1.0.0+foo",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/routes/crates/snapshots/crates_io__tests__routes__crates__read__include_default_version.snap

@@ -28,6 +28,7 @@ expression: response.json()
     "max_version": "0.0.0",
     "name": "foo_default_version",
     "newest_version": "0.0.0",
+    "num_versions": 3,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/routes/crates/snapshots/crates_io__tests__routes__crates__read__new_name.snap

@@ -28,6 +28,7 @@ expression: response.json()
     "max_version": "0.0.0",
     "name": "new",
     "newest_version": "0.0.0",
+    "num_versions": 1,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/routes/crates/snapshots/crates_io__tests__routes__crates__read__show.snap

@@ -30,6 +30,7 @@ expression: response.json()
     "max_version": "1.0.0",
     "name": "foo_show",
     "newest_version": "0.5.1",
+    "num_versions": 3,
     "recent_downloads": 10,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/routes/crates/snapshots/crates_io__tests__routes__crates__read__show_all_yanked.snap

@@ -30,6 +30,7 @@ expression: response.json()
     "max_version": "0.0.0",
     "name": "foo_show",
     "newest_version": "0.0.0",
+    "num_versions": 2,
     "recent_downloads": 10,
     "repository": null,
     "updated_at": "[datetime]",

src/tests/routes/crates/snapshots/crates_io__tests__routes__crates__read__show_minimal.snap

@@ -28,6 +28,7 @@ expression: response.json()
     "max_version": "0.0.0",
     "name": "foo_show_minimal",
     "newest_version": "0.0.0",
+    "num_versions": 3,
     "recent_downloads": null,
     "repository": null,
     "updated_at": "[datetime]",

src/views.rs

@@ -207,6 +207,7 @@ pub struct EncodableCrate {
     pub downloads: i64,
     pub recent_downloads: Option<i64>,
     pub default_version: Option<String>,
+    pub num_versions: i32,
     pub yanked: bool,
     // NOTE: Used by shields.io, altering `max_version` requires a PR with shields.io
     pub max_version: String,
@@ -225,6 +226,7 @@ impl EncodableCrate {
     pub fn from(
         krate: Crate,
         default_version: Option<&str>,
+        num_versions: i32,
         yanked: Option<bool>,
         top_versions: Option<&TopVersions>,
         versions: Option<Vec<i32>>,
@@ -297,6 +299,7 @@ impl EncodableCrate {
             categories: category_ids,
             badges: [],
             default_version,
+            num_versions,
             yanked,
             max_version,
             newest_version,
@@ -317,9 +320,11 @@ impl EncodableCrate {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn from_minimal(
         krate: Crate,
         default_version: Option<&str>,
+        num_versions: i32,
         yanked: Option<bool>,
         top_versions: Option<&TopVersions>,
         exact_match: bool,
@@ -329,6 +334,7 @@ impl EncodableCrate {
         Self::from(
             krate,
             default_version,
+            num_versions,
             yanked,
             top_versions,
             None,
@@ -823,6 +829,7 @@ mod tests {
             downloads: 0,
             recent_downloads: None,
             default_version: None,
+            num_versions: 0,
             yanked: false,
             max_version: "".to_string(),
             newest_version: "".to_string(),