From 6354a463401d529c0a1d02264d1fa8ff4e251af5 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Fri, 3 Jan 2025 23:39:00 +0100 Subject: Add more tests Use project_check_maintainer correctly, should not panic (by .unwrap) but forward the error (by ?). --- server/src/main.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'server/src/main.rs') diff --git a/server/src/main.rs b/server/src/main.rs index 53cdb89..6f66866 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -272,9 +272,7 @@ async fn project_update( projectid: u64, data: Json>, ) -> Result<&'static str, Custom<&'static str>> { - project_check_maintainer(&mut db, session, projectid) - .await - .unwrap(); + project_check_maintainer(&mut db, session, projectid).await?; if data.title.is_none() && data.description.is_none() { // Nothing to update. Treat as "success". @@ -319,9 +317,7 @@ async fn project_user_add( userid: u64, data: Json, ) -> Result<&'static str, Custom<&'static str>> { - project_check_maintainer(&mut db, session, projectid) - .await - .unwrap(); + project_check_maintainer(&mut db, session, projectid).await?; sqlx::query!( "INSERT INTO project_users (project, user, default_role, maintainer) VALUES (?, ?, ?, ?)", @@ -361,9 +357,7 @@ async fn project_user_update( let need_maintainer = data.maintainer.is_some() || userid != session.user_id; if need_maintainer { - project_check_maintainer(&mut db, session, projectid) - .await - .unwrap(); + project_check_maintainer(&mut db, session, projectid).await?; } if data.default_role.is_none() && data.maintainer.is_none() { @@ -412,9 +406,7 @@ async fn project_user_del( let need_maintainer = userid != session.user_id; if need_maintainer { - project_check_maintainer(&mut db, session, projectid) - .await - .unwrap(); + project_check_maintainer(&mut db, session, projectid).await?; } sqlx::query!( -- cgit v1.2.3-70-g09d2