models/default_version: Save num_versions value

Author: eth3lbert

src/models/default_versions.rs

@@ -60,7 +60,7 @@ pub async fn update_default_version(
     crate_id: i32,
     conn: &mut AsyncPgConnection,
 ) -> QueryResult<()> {
-    let default_version = calculate_default_version(crate_id, conn).await?;
+    let (default_version, num_versions) = calculate_default_version(crate_id, conn).await?;
 
     debug!(
         "Updating default version to {} (id: {})…",
@@ -74,7 +74,10 @@ pub async fn update_default_version(
         ))
         .on_conflict(default_versions::crate_id)
         .do_update()
-        .set(default_versions::version_id.eq(default_version.id))
+        .set((
+            default_versions::version_id.eq(default_version.id),
+            default_versions::num_versions.eq(num_versions as i32),
+        ))
         .execute(conn)
         .await?;
 
@@ -87,22 +90,22 @@ pub async fn verify_default_version(
     crate_id: i32,
     conn: &mut AsyncPgConnection,
 ) -> QueryResult<()> {
-    let calculated = calculate_default_version(crate_id, conn).await?;
+    let (calculated, num_versions) = calculate_default_version(crate_id, conn).await?;
 
     let saved = default_versions::table
-        .select(default_versions::version_id)
+        .select((default_versions::version_id, default_versions::num_versions))
         .filter(default_versions::crate_id.eq(crate_id))
-        .first::<i32>(conn)
+        .first::<(i32, i32)>(conn)
         .await
         .optional()?;
 
-    if let Some(saved) = saved {
-        if saved == calculated.id {
+    if let Some((saved_id, saved_num_versions)) = saved {
+        if saved_id == calculated.id && saved_num_versions == (num_versions as i32) {
             debug!("Default version for crate {crate_id} is up to date");
         } else {
             warn!(
-                "Default version for crate {crate_id} is outdated (expected: {saved}, actual: {})",
-                calculated.id,
+                "Default version for crate {crate_id} is outdated (expected: {saved_id} with num_versions: {:?}, actual: {} with num_versions: {:?})",
+                saved_num_versions, calculated.id, num_versions
             );
         }
     } else {
@@ -118,7 +121,7 @@ pub async fn verify_default_version(
 async fn calculate_default_version(
     crate_id: i32,
     conn: &mut AsyncPgConnection,
-) -> QueryResult<Version> {
+) -> QueryResult<(Version, usize)> {
     use diesel::result::Error::NotFound;
 
     debug!("Loading all versions for the crate…");
@@ -128,9 +131,14 @@ async fn calculate_default_version(
         .load::<Version>(conn)
         .await?;
 
-    debug!("Found {} versions", versions.len());
+    let num_versions = versions.len();
+    debug!("Found {} versions", num_versions);
 
-    versions.into_iter().max().ok_or(NotFound)
+    versions
+        .into_iter()
+        .max()
+        .map(|version| (version, num_versions))
+        .ok_or(NotFound)
 }
 
 #[cfg(test)]