Reports (#165)

* Reports WIP

* Finish reports

* Clippy fixes

Co-authored-by: Geometrically <geometrically@pop-os.localdomain>

src/routes/moderation.rs

@@ -1,11 +1,9 @@
 use super::ApiError;
 use crate::auth::check_is_moderator_from_headers;
 use crate::database;
-use crate::models::mods::{ModId, ModStatus};
-use crate::models::teams::TeamId;
+use crate::models::mods::{Mod, ModStatus};
 use actix_web::{get, web, HttpRequest, HttpResponse};
-use serde::{Deserialize, Serialize};
-use sqlx::types::chrono::{DateTime, Utc};
+use serde::Deserialize;
 use sqlx::PgPool;
 
 #[derive(Deserialize)]
@@ -18,42 +16,6 @@ fn default_count() -> i16 {
     100
 }
 
-/// A mod returned from the API moderation routes
-#[derive(Serialize)]
-pub struct ModerationMod {
-    /// The ID of the mod, encoded as a base62 string.
-    pub id: ModId,
-    /// The slug of a mod, used for vanity URLs
-    pub slug: Option<String>,
-    /// The team of people that has ownership of this mod.
-    pub team: TeamId,
-    /// The title or name of the mod.
-    pub title: String,
-    /// A short description of the mod.
-    pub description: String,
-    /// The long description of the mod.
-    pub body: String,
-    /// The date at which the mod was first published.
-    pub published: DateTime<Utc>,
-    /// The date at which the mod was first published.
-    pub updated: DateTime<Utc>,
-    /// The status of the mod
-    pub status: ModStatus,
-
-    /// The total number of downloads the mod has had.
-    pub downloads: u32,
-    /// The URL of the icon of the mod
-    pub icon_url: Option<String>,
-    /// An optional link to where to submit bugs or issues with the mod.
-    pub issues_url: Option<String>,
-    /// An optional link to the source code for the mod.
-    pub source_url: Option<String>,
-    /// An optional link to the mod's wiki page or other relevant information.
-    pub wiki_url: Option<String>,
-    /// An optional link to the mod's discord
-    pub discord_url: Option<String>,
-}
-
 #[get("mods")]
 pub async fn mods(
     req: HttpRequest,
@@ -64,9 +26,9 @@ pub async fn mods(
 
     use futures::stream::TryStreamExt;
 
-    let mods = sqlx::query!(
+    let mod_ids = sqlx::query!(
         "
-        SELECT * FROM mods
+        SELECT id FROM mods
         WHERE status = (
             SELECT id FROM statuses WHERE status = $1
         )
@@ -77,28 +39,17 @@ pub async fn mods(
         count.count as i64
     )
     .fetch_many(&**pool)
-    .try_filter_map(|e| async {
-        Ok(e.right().map(|m| ModerationMod {
-            id: database::models::ids::ModId(m.id).into(),
-            slug: m.slug,
-            team: database::models::ids::TeamId(m.team_id).into(),
-            title: m.title,
-            description: m.description,
-            body: m.body,
-            published: m.published,
-            icon_url: m.icon_url,
-            issues_url: m.issues_url,
-            source_url: m.source_url,
-            status: ModStatus::Processing,
-            updated: m.updated,
-            downloads: m.downloads as u32,
-            wiki_url: m.wiki_url,
-            discord_url: m.discord_url,
-        }))
-    })
-    .try_collect::<Vec<ModerationMod>>()
+    .try_filter_map(|e| async { Ok(e.right().map(|m| database::models::ids::ModId(m.id))) })
+    .try_collect::<Vec<database::models::ModId>>()
     .await
     .map_err(|e| ApiError::DatabaseError(e.into()))?;
 
+    let mods: Vec<Mod> = database::models::mod_item::Mod::get_many_full(mod_ids, &**pool)
+        .await
+        .map_err(|e| ApiError::DatabaseError(e.into()))?
+        .into_iter()
+        .map(super::mods::convert_mod)
+        .collect();
+
     Ok(HttpResponse::Ok().json(mods))
 }