MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(backend): moderation locking logic fix (#5979)

Browse Source 
* fix(backend): moderation locking logic fix

* fix: clippy
This commit is contained in:
Calum H.
2026-05-03 19:29:05 +01:00
committed by GitHub
parent 2da2035a6f
commit 8a72ee9968
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/labrinth/tests/moderation_lock.rs
View File

@@ -769,9 +769,9 @@ async fn test_http_delete_all_locks_admin() {
.await;
}
/// Moderator without a lock cannot move a project out of processing (401 + lock message).
/// Moderator without a lock can move a project out of processing when nobody else has a lock.
#[actix_rt::test]
async fn test_complete_review_requires_lock() {
async fn test_complete_review_without_lock_succeeds() {
with_test_environment(None, |test_env: TestEnvironment<common::api_v3::ApiV3>| async move {
let api = &test_env.api;
let alpha_id = &test_env.dummy.project_alpha.project_id;
@@ -793,8 +793,8 @@ async fn test_complete_review_requires_lock() {
let resp = api.call(req).await;
assert_eq!(
resp.status(),
StatusCode::UNAUTHORIZED,
"moderator without lock should not be able to complete review: {}",
StatusCode::NO_CONTENT,
"moderator without lock should be able to complete review when no active lock exists: {}",
String::from_utf8_lossy(test::read_body(resp).await.as_ref())
);
})
@@ -849,7 +849,7 @@ async fn test_complete_review_blocked_when_other_holds_lock() {
}
#[actix_rt::test]
async fn test_complete_review_fails_when_lock_expired() {
async fn test_complete_review_succeeds_when_other_lock_expired() {
with_test_environment(
None,
|test_env: TestEnvironment<common::api_v3::ApiV3>| async move {
@@ -858,7 +858,6 @@ async fn test_complete_review_fails_when_lock_expired() {
let project_id = DBProjectId(
test_env.dummy.project_alpha.project_id_parsed.0 as i64,
);
let mod_id = DBUserId(MOD_USER_ID_PARSED);
let pool = &test_env.db.pool;
set_project_processing(
@@ -868,7 +867,11 @@ async fn test_complete_review_fails_when_lock_expired() {
&test_env.db.redis_pool,
)
.await;
DBModerationLock::acquire(project_id, mod_id, pool)
DBModerationLock::acquire(
project_id,
DBUserId(ADMIN_USER_ID_PARSED),
pool,
)
.await
.unwrap()
.unwrap();
@@ -881,7 +884,12 @@ async fn test_complete_review_fails_when_lock_expired() {
.to_request();
let resp = api.call(req).await;
assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
assert_eq!(
resp.status(),
StatusCode::NO_CONTENT,
"moderator should be able to complete review when another moderator's lock expired: {}",
String::from_utf8_lossy(test::read_body(resp).await.as_ref())
);
},
)
.await;