general code cleanup & openapi fixes

0x7d8 · 0x7d8 · commit ffe931461258 · 2025-04-02T23:10:33.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "api"
-version = "3.2.3"
+version = "3.2.4"
 edition = "2024"
 
 [dependencies]
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
@@ -21,17 +21,17 @@ mod v1;
 mod v2;
 
 #[derive(ToSchema, Serialize)]
-pub struct ApiError {
+pub struct ApiError<'a> {
     #[schema(default = false)]
     pub success: bool,
-    pub errors: Vec<String>,
+    pub errors: &'a [&'a str],
 }
 
-impl ApiError {
-    pub fn new(errors: &[&str]) -> Self {
+impl<'a> ApiError<'a> {
+    pub fn new(errors: &'a [&'a str]) -> Self {
         Self {
             success: false,
-            errors: errors.iter().map(|s| s.to_string()).collect(),
+            errors,
         }
     }
 
diff --git a/src/routes/organization/v1/mod.rs b/src/routes/organization/v1/mod.rs
@@ -40,12 +40,6 @@ mod get {
 
     #[utoipa::path(get, path = "/", responses(
         (status = OK, body = inline(Response)),
-    ), params(
-        (
-            "organization" = u32,
-            description = "The organization ID",
-            example = 1,
-        ),
     ))]
     pub async fn route(
         state: GetState,
diff --git a/src/routes/organization/v1/types.rs b/src/routes/organization/v1/types.rs
@@ -18,12 +18,6 @@ mod get {
 
     #[utoipa::path(get, path = "/", responses(
         (status = OK, body = inline(Response)),
-    ), params(
-        (
-            "organization" = u32,
-            description = "The organization ID",
-            example = 1,
-        ),
     ))]
     pub async fn route(
         state: GetState,
diff --git a/src/routes/user/organizations/_organization_/api_keys/mod.rs b/src/routes/user/organizations/_organization_/api_keys/mod.rs
@@ -23,7 +23,7 @@ mod get {
         (status = OK, body = inline(Response)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -69,7 +69,7 @@ mod post {
         (status = BAD_REQUEST, body = inline(ApiError)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
diff --git a/src/routes/user/organizations/_organization_/icon.rs b/src/routes/user/organizations/_organization_/icon.rs
@@ -20,7 +20,7 @@ mod post {
         (status = BAD_REQUEST, body = inline(ApiError)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
diff --git a/src/routes/user/organizations/_organization_/mod.rs b/src/routes/user/organizations/_organization_/mod.rs
@@ -90,7 +90,7 @@ mod get {
         (status = OK, body = inline(Response)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -138,7 +138,7 @@ mod patch {
         (status = NOT_FOUND, body = inline(ApiError)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -222,7 +222,7 @@ mod delete {
         (status = OK, body = inline(Response)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
diff --git a/src/routes/user/organizations/_organization_/stats.rs b/src/routes/user/organizations/_organization_/stats.rs
@@ -31,7 +31,7 @@ mod get {
         (status = OK, body = inline(Response)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -49,12 +49,12 @@ mod get {
                     let data = sqlx::query(
                         r#"
                         SELECT
-                            COUNT(*) AS requests,
-                            COUNT(DISTINCT requests.user_agent) AS user_agents,
-                            COUNT(DISTINCT requests.ip) AS ips,
-                            COUNT(DISTINCT requests.origin) AS origins,
-                            COUNT(DISTINCT requests.continent) AS continents,
-                            COUNT(DISTINCT requests.country) AS countries
+                            COUNT(*),
+                            COUNT(DISTINCT requests.user_agent),
+                            COUNT(DISTINCT requests.ip),
+                            COUNT(DISTINCT requests.origin),
+                            COUNT(DISTINCT requests.continent),
+                            COUNT(DISTINCT requests.country)
                         FROM requests
                         WHERE requests.organization_id = $1
                         "#,
@@ -65,12 +65,12 @@ mod get {
                     .unwrap();
 
                     Stats {
-                        requests: data.get("requests"),
-                        user_agents: data.get("user_agents"),
-                        ips: data.get("ips"),
-                        origins: data.get("origins"),
-                        continents: data.get("continents"),
-                        countries: data.get("countries"),
+                        requests: data.get(0),
+                        user_agents: data.get(1),
+                        ips: data.get(2),
+                        origins: data.get(3),
+                        continents: data.get(4),
+                        countries: data.get(5),
                     }
                 },
             )
diff --git a/src/routes/user/organizations/_organization_/subusers/_subuser_.rs b/src/routes/user/organizations/_organization_/subusers/_subuser_.rs
@@ -21,7 +21,7 @@ mod get {
         (status = NOT_FOUND, body = inline(ApiError)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -34,7 +34,7 @@ mod get {
     pub async fn route(
         state: GetState,
         organization: GetOrganization,
-        Path((_organization, login)): Path<(u32, String)>,
+        Path((_organization, login)): Path<(i32, String)>,
     ) -> (StatusCode, axum::Json<serde_json::Value>) {
         let user = User::by_login(&state.database, &state.cache, &login).await;
 
@@ -92,7 +92,7 @@ mod delete {
         (status = NOT_FOUND, body = inline(ApiError)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -106,7 +106,7 @@ mod delete {
         state: GetState,
         auth_user: GetUser,
         organization: GetOrganization,
-        Path((_organization, login)): Path<(u32, String)>,
+        Path((_organization, login)): Path<(i32, String)>,
     ) -> (StatusCode, axum::Json<serde_json::Value>) {
         let user = User::by_login(&state.database, &state.cache, &login).await;
 
diff --git a/src/routes/user/organizations/_organization_/subusers/mod.rs b/src/routes/user/organizations/_organization_/subusers/mod.rs
@@ -23,7 +23,7 @@ mod get {
         (status = OK, body = inline(Response)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
@@ -72,7 +72,7 @@ mod post {
         (status = NOT_FOUND, body = inline(ApiError)),
     ), params(
         (
-            "organization" = u32,
+            "organization" = i32,
             description = "The organization ID",
             example = 1,
         ),
diff --git a/src/routes/v1/stats.rs b/src/routes/v1/stats.rs
@@ -2,7 +2,7 @@ use super::State;
 use utoipa_axum::{router::OpenApiRouter, routes};
 
 mod get {
-    use crate::routes::{ApiError, GetState};
+    use crate::routes::GetState;
     use serde::{Deserialize, Serialize};
     use sqlx::Row;
     use utoipa::ToSchema;
@@ -41,30 +41,35 @@ mod get {
 
     #[utoipa::path(get, path = "/", responses(
         (status = OK, body = inline(Response)),
-        (status = NOT_FOUND, body = inline(ApiError)),
     ))]
     pub async fn route(state: GetState) -> axum::Json<serde_json::Value> {
-        let data = state
+        let stats = state
             .cache
             .cached("stats::all", 3600, || async {
                 let (hashes, requests, builds) = tokio::join!(
                     sqlx::query(
                         r#"
-                        SELECT COUNT(*)
+                        SELECT
+                            COUNT(*)
                         FROM build_hashes
                         "#
                     )
                     .fetch_one(state.database.read()),
                     sqlx::query(
                         r#"
-                        SELECT COUNT(*), pg_database_size(current_database())
+                        SELECT
+                            COUNT(*),
+                            pg_database_size(current_database())
                         FROM requests
                         "#
                     )
                     .fetch_one(state.database.read()),
                     sqlx::query(
                         r#"
-                        SELECT COUNT(*), SUM(DISTINCT jar_size), SUM(DISTINCT zip_size)
+                        SELECT
+                            COUNT(*),
+                            SUM(DISTINCT jar_size),
+                            SUM(DISTINCT zip_size)
                         FROM builds
                         "#
                     )
@@ -92,7 +97,7 @@ mod get {
         axum::Json(
             serde_json::to_value(&Response {
                 success: true,
-                stats: data,
+                stats,
             })
             .unwrap(),
         )
diff --git a/src/routes/v1/types.rs b/src/routes/v1/types.rs
@@ -4,7 +4,7 @@ use utoipa_axum::{router::OpenApiRouter, routes};
 mod get {
     use crate::{
         models::r#type::{ESTABLISHED_TYPES, ServerType, ServerTypeInfo},
-        routes::{ApiError, GetState},
+        routes::GetState,
     };
     use indexmap::IndexMap;
     use serde::{Deserialize, Serialize};
@@ -18,7 +18,6 @@ mod get {
 
     #[utoipa::path(get, path = "/", responses(
         (status = OK, body = inline(Response)),
-        (status = NOT_FOUND, body = inline(ApiError)),
     ))]
     pub async fn route(state: GetState) -> axum::Json<serde_json::Value> {
         let data = ServerType::all(&state.database, &state.cache).await;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ mod post {`
`20`	`20`	`(status = BAD_REQUEST, body = inline(ApiError)),`
`21`	`21`	`), params(`
`22`	`22`	`(`
`23`		`- "organization" = u32,`
	`23`	`+ "organization" = i32,`
`24`	`24`	`description = "The organization ID",`
`25`	`25`	`example = 1,`
`26`	`26`	`),`