fix(developer): fix for developer index

Author: Fleeym

src/database/repository/developers.rs

@@ -5,15 +5,21 @@ use std::collections::HashMap;
 use uuid::Uuid;
 
 pub async fn index(
-    query: Option<&String>,
+    query: &str,
     page: i64,
     per_page: i64,
     conn: &mut PgConnection,
 ) -> Result<PaginatedData<Developer>, ApiError> {
     let limit = per_page;
     let offset = (page - 1) * per_page;
 
-    let display_name_query = query.map(|str| format!("%{}%", str));
+    let display_name_query = {
+        if query.is_empty() {
+            "".into()
+        } else {
+            format!("%{}%", query)
+        }
+    };
 
     let result = sqlx::query_as!(
         Developer,
@@ -32,7 +38,7 @@ pub async fn index(
         LIMIT $3
         OFFSET $4",
         query,
-        display_name_query,
+        &display_name_query,
         limit,
         offset
     )
@@ -51,8 +57,14 @@ pub async fn index(
     })
 }
 
-pub async fn index_count(query: Option<&String>, conn: &mut PgConnection) -> Result<i64, ApiError> {
-    let display_name_query = query.map(|str| format!("%{}%", str));
+pub async fn index_count(query: &str, conn: &mut PgConnection) -> Result<i64, ApiError> {
+    let display_name_query = {
+        if query.is_empty() {
+            "".into()
+        } else {
+            format!("%{}%", query)
+        }
+    };
 
     Ok(sqlx::query!(
         "SELECT COUNT(id)

src/endpoints/developers.rs

@@ -80,9 +80,11 @@ pub async fn developer_index(
     let page: i64 = query.page.unwrap_or(1).max(1);
     let per_page = query.per_page.unwrap_or(10).clamp(1, 100);
 
+    let query = query.query.clone().unwrap_or_default();
+
     Ok(web::Json(ApiResponse {
         error: "".into(),
-        payload: developers::index(query.query.as_ref(), page, per_page, &mut pool).await?,
+        payload: developers::index(&query, page, per_page, &mut pool).await?,
     }))
 }
 

src/types/models/stats.rs

@@ -34,7 +34,7 @@ impl Stats {
         Ok(Stats {
             total_mod_count: mod_stats.total_count,
             total_mod_downloads: mod_stats.total_downloads,
-            total_registered_developers: developers::index_count(None, &mut *pool).await?,
+            total_registered_developers: developers::index_count("", &mut *pool).await?,
             total_geode_downloads: Self::get_latest_github_release_download_count(&mut *pool)
                 .await?,
         })