From fdd6bca31118ea0a40675890c06c047333ab2ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Tue, 14 Mar 2023 17:17:20 +0100 Subject: [PATCH] httpd: Fix status code in commit history endpoint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rūdolfs Ošiņš --- radicle-httpd/src/api/v1/projects.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/radicle-httpd/src/api/v1/projects.rs b/radicle-httpd/src/api/v1/projects.rs index d81b7562..ebe51cbc 100644 --- a/radicle-httpd/src/api/v1/projects.rs +++ b/radicle-httpd/src/api/v1/projects.rs @@ -138,12 +138,12 @@ async fn history_handler( per_page, } = qs; - let (sha, fallback_to_head) = match parent { - Some(commit) => (commit, false), + let sha = match parent { + Some(commit) => commit, None => { let info = ctx.project_info(project)?; - (info.head.to_string(), true) + info.head.to_string() } }; @@ -201,10 +201,6 @@ async fn history_handler( "stats": repo.stats()?, }); - if fallback_to_head { - return Ok::<_, Error>((StatusCode::FOUND, Json(response))); - } - Ok::<_, Error>((StatusCode::OK, Json(response))) } @@ -689,7 +685,7 @@ mod routes { let app = super::router(test::seed(tmp.path())); let response = get(&app, format!("/projects/{RID}/commits")).await; - assert_eq!(response.status(), StatusCode::FOUND); + assert_eq!(response.status(), StatusCode::OK); assert_eq!( response.json().await, json!({