add total_mod_count field to /v1/stats and fix total_mod_downloads

Author: HJfod

.sqlx/query-96c66a14f97bea3f82b28325d41ed5a299bd78e8f419388be04ac89e70603286.json

@@ -1,6 +1,6 @@
 [package]
 name = "geode-index"
-version = "0.27.0"
+version = "0.28.0"
 edition = "2021"
 
 [dependencies]

.sqlx/query-b79d69323170f1b7396fa5cb294d038bfde1d49cff29a903d1856e2121e522a7.json

@@ -103,10 +103,15 @@ pub enum CheckExistingResult {
     ExistsWithRejected
 }
 
+pub struct ModStats {
+    pub total_count: i64,
+    pub total_downloads: i64,
+}
+
 impl Mod {
-    pub async fn get_total_count(pool: &mut PgConnection) -> Result<i64, ApiError> {
-        match sqlx::query_scalar!("
-            SELECT COUNT(DISTINCT m.id)
+    pub async fn get_stats(pool: &mut PgConnection) -> Result<ModStats, ApiError> {
+        match sqlx::query!("
+            SELECT COUNT(DISTINCT m.id), SUM(mv.download_count)
             FROM mods m
             INNER JOIN mod_versions mv ON mv.mod_id = m.id 
             INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id
@@ -119,7 +124,12 @@ impl Mod {
                 log::error!("{}", e);
                 Err(ApiError::DbError)
             }
-            Ok(r) => Ok(r.flatten().unwrap_or(0)),
+            Ok(r) => if let Some((Some(total_count), Some(total_downloads))) = r.map(|o| (o.count, o.sum)) {
+                Ok(ModStats { total_count, total_downloads })
+            }
+            else {
+                Ok(ModStats { total_count: 0, total_downloads: 0 })
+            }
         }
     }
 

Cargo.lock

@@ -24,26 +24,29 @@ struct GithubReleaseWithAssets {
 #[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct Stats {
     pub total_geode_downloads: i64,
+    pub total_mod_count: i64,
     pub total_mod_downloads: i64,
     pub total_registered_developers: i64,
 }
 
 impl Stats {
     pub async fn get_cached(pool: &mut PgConnection) -> Result<Stats, ApiError> {
+        let mod_stats = Mod::get_stats(&mut *pool).await?;
         Ok(Stats {
-            total_mod_downloads: Mod::get_total_count(&mut *pool).await?,
+            total_mod_count: mod_stats.total_count,
+            total_mod_downloads: mod_stats.total_downloads,
             total_registered_developers: Developer::get_total_count(&mut *pool).await?,
             total_geode_downloads: Self::get_latest_github_release_download_count(&mut *pool).await?,
         })
     }
 
     async fn get_latest_github_release_download_count(pool: &mut PgConnection) -> Result<i64, ApiError> {
         // If release stats were fetched less than a day ago, just use cached stats
-        if let Some((cache_time, total_download_count)) = sqlx::query!("
+        if let Ok((cache_time, total_download_count)) = sqlx::query!("
             SELECT s.checked_at, s.total_download_count
             FROM github_loader_release_stats s
             ORDER BY s.checked_at DESC
-        ").fetch_one(&mut *pool).await.map(|d| (d.checked_at, d.total_download_count)).ok() {
+        ").fetch_one(&mut *pool).await.map(|d| (d.checked_at, d.total_download_count)) {
             if Utc::now().signed_duration_since(cache_time).num_days() < 1 {
                 return Ok(total_download_count);
             }