ModVersion: return status on all endpoints

Author: Fleeym

src/types/models/developer.rs

@@ -1,7 +1,7 @@
 use std::collections::{hash_map::Entry, HashMap};
 
 use serde::{Deserialize, Serialize};
-use sqlx::{query_builder, PgConnection, Postgres, QueryBuilder};
+use sqlx::{PgConnection, Postgres, QueryBuilder};
 
 use crate::types::api::ApiError;
 

src/types/models/mod_entity.rs

@@ -85,6 +85,7 @@ struct ModRecordGetOne {
     early_load: bool,
     api: bool,
     mod_id: String,
+    status: ModVersionStatusEnum,
     about: Option<String>,
     changelog: Option<String>,
     created_at: DateTime<Utc>,
@@ -128,12 +129,12 @@ impl Mod {
             }
         }
         let mut builder: QueryBuilder<Postgres> = QueryBuilder::new(
-            "SELECT q.id, q.repository, q.about, q.changelog, q.download_count, q.featured, q.created_at, q.updated_at
-            FROM (SELECT m.id, m.repository, m.about, m.changelog, m.download_count, m.featured, m.created_at, m.updated_at,
+            r#"SELECT q.id, q.repository, q.about, q.changelog, q.download_count, q.featured, q.created_at, q.updated_at, q.status as "status: _"
+            FROM (SELECT m.id, m.repository, m.about, m.changelog, m.download_count, m.featured, m.created_at, m.updated_at, mvs.status,
             row_number() over (partition by m.id order by mv.id desc) rn FROM mods m
             INNER JOIN mod_versions mv ON m.id = mv.mod_id
             INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id
-            INNER JOIN mod_gd_versions mgv ON mgv.mod_id = mv.id "
+            INNER JOIN mod_gd_versions mgv ON mgv.mod_id = mv.id "#
         );
         let mut counter_builder: QueryBuilder<Postgres> = QueryBuilder::new(
             "SELECT COUNT(DISTINCT m.id) FROM mods m
@@ -281,6 +282,8 @@ impl Mod {
         builder.push(" OFFSET ");
         builder.push_bind(offset);
 
+        log::info!("{}", builder.sql());
+
         let result = builder
             .build_query_as::<ModRecord>()
             .fetch_all(&mut *pool)
@@ -488,14 +491,14 @@ impl Mod {
     pub async fn get_one(id: &str, pool: &mut PgConnection) -> Result<Option<Mod>, ApiError> {
         let records: Vec<ModRecordGetOne> = sqlx::query_as!(
             ModRecordGetOne,
-            "SELECT
+            r#"SELECT
                 m.id, m.repository, m.about, m.changelog, m.featured, m.download_count as mod_download_count, m.created_at, m.updated_at,
                 mv.id as version_id, mv.name, mv.description, mv.version, mv.download_link, mv.download_count as mod_version_download_count,
-                mv.hash, mv.geode, mv.early_load, mv.api, mv.mod_id
+                mv.hash, mv.geode, mv.early_load, mv.api, mv.mod_id, mvs.status as "status: _"
             FROM mods m
             INNER JOIN mod_versions mv ON m.id = mv.mod_id
             INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id
-            WHERE m.id = $1 AND mvs.status = 'accepted'",
+            WHERE m.id = $1 AND mvs.status = 'accepted'"#,
             id
         )
         .fetch_all(&mut *pool)
@@ -517,6 +520,7 @@ impl Mod {
                 geode: x.geode.clone(),
                 early_load: x.early_load,
                 api: x.api,
+                status: x.status,
                 mod_id: x.mod_id.clone(),
                 gd: DetailedGDVersion {
                     win: None,

src/types/models/mod_version.rs

@@ -32,6 +32,7 @@ pub struct ModVersion {
     pub api: bool,
     pub mod_id: String,
     pub gd: DetailedGDVersion,
+    pub status: ModVersionStatusEnum,
     pub dependencies: Option<Vec<ResponseDependency>>,
     pub incompatibilities: Option<Vec<ResponseIncompatibility>>,
     pub developers: Option<Vec<Developer>>,
@@ -51,6 +52,7 @@ struct ModVersionGetOne {
     early_load: bool,
     api: bool,
     mod_id: String,
+    status: ModVersionStatusEnum,
 }
 
 impl ModVersionGetOne {
@@ -67,6 +69,7 @@ impl ModVersionGetOne {
             download_count: self.download_count,
             api: self.api,
             mod_id: self.mod_id.clone(),
+            status: self.status,
             gd: DetailedGDVersion {
                 win: None,
                 android: None,
@@ -100,13 +103,14 @@ impl ModVersion {
 
         let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(
             r#"SELECT q.name, q.id, q.description, q.version, q.download_link, q.hash, q.geode, q.download_count,
-                q.early_load, q.api, q.mod_id FROM (SELECT
-                mv.name, mv.id, mv.description, mv.version, mv.download_link, mv.hash, mv.geode, mv.download_count,
-                mv.early_load, mv.api, mv.mod_id, row_number() over (partition by m.id order by mv.id desc) rn FROM mods m 
-                INNER JOIN mod_versions mv ON m.id = mv.mod_id
-                INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id
-                INNER JOIN mod_gd_versions mgv ON mgv.mod_id = mv.id
-                WHERE mvs.status = 'accepted' 
+                q.early_load, q.api, q.mod_id, q.status FROM (
+                    SELECT
+                    mv.name, mv.id, mv.description, mv.version, mv.download_link, mv.hash, mv.geode, mv.download_count, mvs.status as status,
+                    mv.early_load, mv.api, mv.mod_id, row_number() over (partition by m.id order by mv.id desc) rn FROM mods m 
+                    INNER JOIN mod_versions mv ON m.id = mv.mod_id
+                    INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id
+                    INNER JOIN mod_gd_versions mgv ON mgv.mod_id = mv.id
+                    WHERE mvs.status = 'accepted' 
             "#,
         );
         if let Some(g) = gd {
@@ -169,7 +173,7 @@ impl ModVersion {
         let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(
             r#"SELECT DISTINCT
             mv.name, mv.id, mv.description, mv.version, mv.download_link, mv.hash, mv.geode, mv.download_count,
-            mv.early_load, mv.api, mv.mod_id FROM mod_versions mv 
+            mv.early_load, mv.api, mv.mod_id, mvs.status as "status: _" FROM mod_versions mv 
             INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id
             WHERE mvs.status = 'pending' AND mv.mod_id IN ("#,
         );
@@ -211,8 +215,8 @@ impl ModVersion {
     ) -> Result<ModVersion, ApiError> {
         let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(
             r#"SELECT q.name, q.id, q.description, q.version, q.download_link, q.hash, q.geode, q.download_count,
-            q.early_load, q.api, q.mod_id FROM (SELECT
-            mv.name, mv.id, mv.description, mv.version, mv.download_link, mv.hash, mv.geode, mv.download_count,
+            q.early_load, q.api, q.mod_id, q.status FROM (SELECT
+            mv.name, mv.id, mv.description, mv.version, mv.download_link, mv.hash, mv.geode, mv.download_count, mvs.status,
             mv.early_load, mv.api, mv.mod_id, row_number() over (partition by m.id order by mv.id desc) rn FROM mods m 
             INNER JOIN mod_versions mv ON m.id = mv.mod_id
             INNER JOIN mod_gd_versions mgv ON mgv.mod_id = mv.id
@@ -419,12 +423,12 @@ impl ModVersion {
     ) -> Result<ModVersion, ApiError> {
         let result = sqlx::query_as!(
             ModVersionGetOne,
-            "SELECT
+            r#"SELECT
             mv.id, mv.name, mv.description, mv.version, mv.download_link, mv.download_count,
-            mv.hash, mv.geode, mv.early_load, mv.api, mv.mod_id FROM mod_versions mv
+            mv.hash, mv.geode, mv.early_load, mv.api, mv.mod_id, mvs.status as "status: _" FROM mod_versions mv
             INNER JOIN mods m ON m.id = mv.mod_id
             INNER JOIN mod_version_statuses mvs ON mvs.mod_version_id = mv.id 
-            WHERE mv.mod_id = $1 AND mv.version = $2 AND mvs.status = 'accepted'",
+            WHERE mv.mod_id = $1 AND mv.version = $2 AND mvs.status = 'accepted'"#,
             id,
             version
         )