use Developer struct for sending devs

geode-sdk · Feb 17, 2024 · 10996c7 · 10996c7
1 parent badbb78
commit 10996c7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 53 deletions.
diff --git a/src/types/mod_json.rs b/src/types/mod_json.rs
@@ -1,20 +1,14 @@
-use std::{
-    fs::{remove_file, File},
-    io::{Cursor, Read, Seek},
-    os::unix::fs::MetadataExt,
-};
+use std::io::{Cursor, Read, Seek};
 
-use actix_web::{web::Bytes, CustomizeResponder};
+use actix_web::web::Bytes;
 use image::{
     codecs::png::{PngDecoder, PngEncoder},
-    io::Reader,
-    DynamicImage, EncodableLayout, GenericImageView, ImageDecoder, ImageEncoder,
+    DynamicImage, GenericImageView, ImageEncoder,
 };
 use semver::Version;
 use serde::Deserialize;
 use std::io::BufReader;
-use uuid::Uuid;
-use zip::read::{self, ZipFile};
+use zip::read::ZipFile;
 
 use super::{
     api::ApiError,

diff --git a/src/types/models/developer.rs b/src/types/models/developer.rs
@@ -5,10 +5,12 @@ use sqlx::{PgConnection, Postgres, QueryBuilder};
 
 use crate::types::api::ApiError;
 
+#[derive(Serialize, Clone, Debug)]
 pub struct Developer {
     pub id: i32,
     pub username: String,
     pub display_name: String,
+    pub is_owner: bool,
 }
 
 pub struct FetchedDeveloper {
@@ -19,16 +21,6 @@ pub struct FetchedDeveloper {
     pub admin: bool,
 }
 
-#[derive(Serialize, Clone, Debug)]
-pub struct ModDeveloper {
-    pub id: i32,
-    pub username: String,
-    pub display_name: String,
-    pub verified: bool,
-    pub admin: bool,
-    pub is_owner: bool
-}
-
 impl Developer {
     pub async fn create(
         github_id: i64,
@@ -60,10 +52,10 @@ impl Developer {
     pub async fn get_by_github_id(
         github_id: i64,
         pool: &mut PgConnection,
-    ) -> Result<Option<Developer>, ApiError> {
+    ) -> Result<Option<FetchedDeveloper>, ApiError> {
         let result = sqlx::query_as!(
-            Developer,
-            "SELECT id, username, display_name
+            FetchedDeveloper,
+            "SELECT id, username, display_name, verified, admin
             FROM developers WHERE github_user_id = $1",
             github_id
         )
@@ -149,27 +141,28 @@ impl Developer {
     pub async fn fetch_for_mod(
         mod_id: &str,
         pool: &mut PgConnection,
-    ) -> Result<Vec<ModDeveloper>, ApiError> {
+    ) -> Result<Vec<Developer>, ApiError> {
         match sqlx::query_as!(
-            ModDeveloper, 
-            "SELECT dev.id, dev.username, dev.display_name, dev.verified, dev.admin, md.is_owner FROM developers dev
-            INNER JOIN mods_developers md ON md.developer_id = dev.id WHERE md.mod_id = $1", 
+            Developer,
+            "SELECT dev.id, dev.username, dev.display_name, md.is_owner FROM developers dev
+            INNER JOIN mods_developers md ON md.developer_id = dev.id WHERE md.mod_id = $1",
             mod_id
-        ).fetch_all(&mut *pool)
-        .await 
+        )
+        .fetch_all(&mut *pool)
+        .await
         {
             Err(e) => {
                 log::error!("{}", e);
                 Err(ApiError::DbError)
-            },
-            Ok(r) => Ok(r)
+            }
+            Ok(r) => Ok(r),
         }
     }
 
     pub async fn fetch_for_mods(
         mod_ids: &Vec<&str>,
-        pool: &mut PgConnection
-    ) -> Result<HashMap<String, Vec<ModDeveloper>>, ApiError> {
+        pool: &mut PgConnection,
+    ) -> Result<HashMap<String, Vec<Developer>>, ApiError> {
         if mod_ids.is_empty() {
             return Ok(HashMap::new());
         }
@@ -179,13 +172,11 @@ impl Developer {
             pub id: i32,
             pub username: String,
             pub display_name: String,
-            pub verified: bool,
-            pub admin: bool,
-            pub is_owner: bool
+            pub is_owner: bool,
         }
 
         let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(
-            "SELECT dev.id, dev.username, dev.display_name, dev.verified, dev.admin, md.is_owner, md.mod_id FROM developers dev 
+            "SELECT dev.id, dev.username, dev.display_name, dev.verified, md.is_owner, md.mod_id FROM developers dev 
             INNER JOIN mods_developers md ON md.developer_id = dev.id WHERE md.mod_id IN ("
         );
 
@@ -195,30 +186,30 @@ impl Developer {
         }
         split.push_unseparated(")");
 
-        let result = match query_builder.build_query_as::<QueryResult>()
+        let result = match query_builder
+            .build_query_as::<QueryResult>()
             .fetch_all(&mut *pool)
-            .await {
-                Err(e) => {
-                    log::error!("{}", e);
-                    return Err(ApiError::DbError);
-                },
-                Ok(r) => r
-            };
-
+            .await
+        {
+            Err(e) => {
+                log::error!("{}", e);
+                return Err(ApiError::DbError);
+            }
+            Ok(r) => r,
+        };
+
         let mut ret = HashMap::new();
 
         for result_item in result {
-            let mod_dev = ModDeveloper {
+            let mod_dev = Developer {
                 id: result_item.id,
                 username: result_item.username,
                 display_name: result_item.display_name,
-                verified: result_item.verified,
-                admin: result_item.admin,
-                is_owner: result_item.is_owner
+                is_owner: result_item.is_owner,
             };
             match ret.entry(result_item.mod_id) {
                 Entry::Vacant(e) => {
-                    let vector: Vec<ModDeveloper> = vec![mod_dev];
+                    let vector: Vec<Developer> = vec![mod_dev];
                     e.insert(vector);
                 }
                 Entry::Occupied(mut e) => e.get_mut().push(mod_dev),

diff --git a/src/types/models/mod_entity.rs b/src/types/models/mod_entity.rs
@@ -12,7 +12,7 @@ use sqlx::{PgConnection, Postgres, QueryBuilder};
 use std::{io::Cursor, str::FromStr};
 
 use super::{
-    developer::{Developer, FetchedDeveloper, ModDeveloper},
+    developer::{Developer, FetchedDeveloper},
     mod_gd_version::{DetailedGDVersion, ModGDVersion, VerPlatform},
     tag::Tag,
 };
@@ -23,7 +23,7 @@ pub struct Mod {
     pub repository: Option<String>,
     pub latest_version: String,
     pub validated: bool,
-    pub developers: Vec<ModDeveloper>,
+    pub developers: Vec<Developer>,
     pub versions: Vec<ModVersion>,
     pub tags: Vec<String>,
     pub about: Option<String>,