From 005f1d69e5a2e1eb23471f959029ef8ba23415ee Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sun, 17 Nov 2024 23:56:03 +0100
Subject: [PATCH] models/user: Remove unused sync `find()` fn

---
 src/auth.rs                               | 4 ++--
 src/bin/crates-admin/verify_token.rs      | 2 +-
 src/controllers/github/secret_scanning.rs | 2 +-
 src/models/user.rs                        | 8 +-------
 src/tests/user.rs                         | 2 +-
 src/worker/jobs/expiry_notification.rs    | 2 +-
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/auth.rs b/src/auth.rs
index 1d973b4bc20..5d5d314da94 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -185,7 +185,7 @@ async fn authenticate_via_cookie(
         return Ok(None);
     };
 
-    let user = User::async_find(conn, id).await.map_err(|err| {
+    let user = User::find(conn, id).await.map_err(|err| {
         parts.request_log().add("cause", err);
         internal("user_id from cookie not found in database")
     })?;
@@ -223,7 +223,7 @@ async fn authenticate_via_token(
             forbidden("authentication failed")
         })?;
 
-    let user = User::async_find(conn, token.user_id).await.map_err(|err| {
+    let user = User::find(conn, token.user_id).await.map_err(|err| {
         parts.request_log().add("cause", err);
         internal("user_id from token not found in database")
     })?;
diff --git a/src/bin/crates-admin/verify_token.rs b/src/bin/crates-admin/verify_token.rs
index 5e2cc8b1b0a..9fd5f1adbe0 100644
--- a/src/bin/crates-admin/verify_token.rs
+++ b/src/bin/crates-admin/verify_token.rs
@@ -22,7 +22,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
 
     let token = HashedToken::parse(&opts.api_token)?;
     let token = ApiToken::find_by_api_token(&mut conn, &token).await?;
-    let user = User::async_find(&mut conn, token.user_id).await?;
+    let user = User::find(&mut conn, token.user_id).await?;
     println!("The token belongs to user {}", user.gh_login);
     Ok(())
 }
diff --git a/src/controllers/github/secret_scanning.rs b/src/controllers/github/secret_scanning.rs
index b0d8ff40d4e..3426712b90a 100644
--- a/src/controllers/github/secret_scanning.rs
+++ b/src/controllers/github/secret_scanning.rs
@@ -183,7 +183,7 @@ async fn send_notification_email(
     state: &AppState,
     conn: &mut AsyncPgConnection,
 ) -> anyhow::Result<()> {
-    let user = User::async_find(conn, token.user_id)
+    let user = User::find(conn, token.user_id)
         .await
         .context("Failed to find user")?;
 
diff --git a/src/models/user.rs b/src/models/user.rs
index 1dfe85bed28..2113471da00 100644
--- a/src/models/user.rs
+++ b/src/models/user.rs
@@ -30,13 +30,7 @@ pub struct User {
 }
 
 impl User {
-    pub fn find(conn: &mut impl Conn, id: i32) -> QueryResult<User> {
-        use diesel::RunQueryDsl;
-
-        users::table.find(id).first(conn)
-    }
-
-    pub async fn async_find(conn: &mut AsyncPgConnection, id: i32) -> QueryResult<User> {
+    pub async fn find(conn: &mut AsyncPgConnection, id: i32) -> QueryResult<User> {
         use diesel_async::RunQueryDsl;
 
         users::table.find(id).first(conn).await
diff --git a/src/tests/user.rs b/src/tests/user.rs
index e9e6e4c9ce4..9c31d0c7039 100644
--- a/src/tests/user.rs
+++ b/src/tests/user.rs
@@ -37,7 +37,7 @@ async fn updating_existing_user_doesnt_change_api_token() {
     // Use the original API token to find the now updated user
     let hashed_token = assert_ok!(HashedToken::parse(token.expose_secret()));
     let api_token = assert_ok!(ApiToken::find_by_api_token(&mut conn, &hashed_token).await);
-    let user = assert_ok!(User::async_find(&mut conn, api_token.user_id).await);
+    let user = assert_ok!(User::find(&mut conn, api_token.user_id).await);
 
     assert_eq!(user.gh_login, "bar");
     assert_eq!(user.gh_access_token, "bar_token");
diff --git a/src/worker/jobs/expiry_notification.rs b/src/worker/jobs/expiry_notification.rs
index e7c31bbefb2..5a07de5a144 100644
--- a/src/worker/jobs/expiry_notification.rs
+++ b/src/worker/jobs/expiry_notification.rs
@@ -72,7 +72,7 @@ async fn handle_expiring_token(
     emails: &Emails,
 ) -> Result<(), anyhow::Error> {
     debug!("Looking up user {} for token {}…", token.user_id, token.id);
-    let user = User::async_find(conn, token.user_id).await?;
+    let user = User::find(conn, token.user_id).await?;
 
     debug!("Looking up email address for user {}…", user.id);
     let recipient = user.async_email(conn).await?;