Merge pull request #10581 from eth3lbert/expose-num-versions

Expose `num_versions` column on the API

Author: Turbo87

app/components/crate-header.hbs

@@ -54,7 +54,7 @@
   </nav.Tab>
 
   <nav.Tab @link={{link "crate.versions" @crate}} data-test-versions-tab>
-    {{pluralize @crate.versions.length "Version"}}
+    {{pluralize @crate.num_versions "Version"}}
   </nav.Tab>
 
   <nav.Tab

app/models/crate.js

@@ -18,6 +18,7 @@ export default class Crate extends Model {
    * @type {string | null}
    */
   @attr default_version;
+  @attr num_versions;
   @attr yanked;
   @attr max_version;
   @attr max_stable_version;

app/templates/crate/versions.hbs

@@ -2,7 +2,7 @@
 
 <div local-class="results-meta">
   <span local-class="page-description" data-test-page-description>
-    All <strong>{{ this.model.versions.length }}</strong>
+    All <strong>{{ this.model.num_versions }}</strong>
     versions of <strong>{{ this.model.name }}</strong> since
     {{date-format this.model.created_at 'PPP'}}
   </span>

packages/crates-io-msw/handlers/crates/get.test.js

@@ -38,6 +38,7 @@ test('returns a crate object for known crates', async function () {
       max_stable_version: null,
       name: 'rand',
       newest_version: '1.0.0-beta.1',
+      num_versions: 1,
       repository: null,
       recent_downloads: 321,
       updated_at: '2017-02-24T12:34:56Z',
@@ -101,6 +102,7 @@ test('works for non-canonical names', async function () {
       max_stable_version: null,
       name: 'foo-bar',
       newest_version: '1.0.0-beta.1',
+      num_versions: 1,
       repository: null,
       recent_downloads: 321,
       updated_at: '2017-02-24T12:34:56Z',

packages/crates-io-msw/handlers/crates/list.test.js

@@ -55,6 +55,7 @@ test('returns a paginated crates list', async function () {
         max_stable_version: '1.0.0',
         name: 'rand',
         newest_version: '2.0.0-beta.1',
+        num_versions: 2,
         repository: null,
         recent_downloads: 321,
         updated_at: '2017-02-24T12:34:56Z',

packages/crates-io-msw/handlers/summary.test.js

@@ -51,6 +51,7 @@ test('returns the data for the front page', async function () {
     max_stable_version: '1.0.0',
     name: 'crate-1',
     newest_version: '1.0.0',
+    num_versions: 1,
     recent_downloads: 321,
     repository: null,
     updated_at: '2017-02-24T12:34:56Z',
@@ -81,6 +82,7 @@ test('returns the data for the front page', async function () {
     max_stable_version: '1.0.3',
     name: 'crate-4',
     newest_version: '1.0.3',
+    num_versions: 1,
     repository: null,
     recent_downloads: 963,
     updated_at: '2017-02-24T12:34:56Z',
@@ -111,6 +113,7 @@ test('returns the data for the front page', async function () {
     max_stable_version: '1.0.10',
     name: 'crate-11',
     newest_version: '1.0.10',
+    num_versions: 1,
     repository: null,
     recent_downloads: 3852,
     updated_at: '2017-02-24T12:34:56Z',
@@ -141,6 +144,7 @@ test('returns the data for the front page', async function () {
     max_stable_version: '1.0.19',
     name: 'crate-20',
     newest_version: '1.0.19',
+    num_versions: 1,
     repository: null,
     recent_downloads: 1605,
     updated_at: '2017-02-24T12:34:56Z',

packages/crates-io-msw/serializers/crate.js

@@ -27,6 +27,8 @@ export function serializeCrate(
     versionNums.find(it => !versionsByNum[it].yanked) ??
     versionNums[0];
 
+  serialized.num_versions = versions.length;
+
   serialized.yanked = versionsByNum[serialized.default_version]?.yanked ?? false;
 
   serialized.links = {

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<