models/user: Extract insert() fn

Author: Turbo87

src/models/user.rs

@@ -121,6 +121,14 @@ pub struct NewUser<'a> {
 }
 
 impl<'a> NewUser<'a> {
+    /// Inserts the user into the database, or fails if the user already exists.
+    pub async fn insert(&self, conn: &mut AsyncPgConnection) -> QueryResult<User> {
+        diesel::insert_into(users::table)
+            .values(self)
+            .get_result(conn)
+            .await
+    }
+
     /// Inserts the user into the database, or updates an existing one.
     pub async fn insert_or_update(&self, conn: &mut AsyncPgConnection) -> QueryResult<User> {
         diesel::insert_into(users::table)

src/rate_limiter.rs

@@ -183,7 +183,6 @@ struct Bucket {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::schema::users;
     use crates_io_test_db::TestDatabase;
 
     #[tokio::test]
@@ -702,17 +701,14 @@ mod tests {
     async fn new_user(conn: &mut AsyncPgConnection, gh_login: &str) -> QueryResult<i32> {
         use crate::models::NewUser;
 
-        let user = NewUser::builder()
+        NewUser::builder()
             .gh_id(0)
             .gh_login(gh_login)
             .gh_access_token("some random token")
-            .build();
-
-        diesel::insert_into(users::table)
-            .values(user)
-            .returning(users::id)
-            .get_result(conn)
+            .build()
+            .insert(conn)
             .await
+            .map(|user| user.id)
     }
 
     async fn new_user_bucket(

src/tests/owners.rs

@@ -8,7 +8,6 @@ use crate::views::{
     EncodableCrateOwnerInvitationV1, EncodableOwner, EncodablePublicUser, InvitationResponse,
 };
 
-use crate::schema::users;
 use chrono::Utc;
 use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
@@ -770,15 +769,12 @@ async fn inactive_users_dont_get_invitations() {
     let invited_gh_login = "user_bar";
     let krate_name = "inactive_test";
 
-    let user = NewUser::builder()
+    NewUser::builder()
         .gh_id(-1)
         .gh_login(invited_gh_login)
         .gh_access_token("some random token")
-        .build();
-
-    diesel::insert_into(users::table)
-        .values(user)
-        .execute(&mut conn)
+        .build()
+        .insert(&mut conn)
         .await
         .unwrap();
 

src/tests/routes/crates/list.rs

@@ -1,5 +1,5 @@
 use crate::models::Category;
-use crate::schema::{crates, users};
+use crate::schema::crates;
 use crate::tests::builders::{CrateBuilder, VersionBuilder};
 use crate::tests::util::{RequestHelper, TestApp};
 use crate::tests::{new_category, new_user};
@@ -22,11 +22,7 @@ async fn index() -> anyhow::Result<()> {
         assert_eq!(json.meta.total, 0);
     }
 
-    let user_id = insert_into(users::table)
-        .values(new_user("foo"))
-        .returning(users::id)
-        .get_result(&mut conn)
-        .await?;
+    let user_id = new_user("foo").insert(&mut conn).await?.id;
 
     let krate = CrateBuilder::new("fooindex", user_id)
         .expect_build(&mut conn)

src/tests/routes/me/email_notifications.rs

@@ -1,4 +1,4 @@
-use crate::schema::{crate_owners, users};
+use crate::schema::crate_owners;
 use crate::tests::builders::CrateBuilder;
 use crate::tests::new_user;
 use crate::tests::util::{RequestHelper, TestApp};
@@ -115,12 +115,11 @@ async fn test_update_email_notifications_not_owned() {
     let (app, _, user) = TestApp::init().with_user().await;
     let mut conn = app.db_conn().await;
 
-    let user_id = diesel::insert_into(users::table)
-        .values(new_user("arbitrary_username"))
-        .returning(users::id)
-        .get_result(&mut conn)
+    let user_id = new_user("arbitrary_username")
+        .insert(&mut conn)
         .await
-        .unwrap();
+        .unwrap()
+        .id;
 
     let not_my_crate = CrateBuilder::new("test_package", user_id)
         .expect_build(&mut conn)

src/tests/util/test_app.rs

@@ -4,9 +4,8 @@ use crate::config::{
 };
 use crate::middleware::cargo_compat::StatusCodeConfig;
 use crate::models::token::{CrateScope, EndpointScope};
-use crate::models::{NewEmail, User};
+use crate::models::NewEmail;
 use crate::rate_limiter::{LimitedAction, RateLimiterConfig};
-use crate::schema::users;
 use crate::storage::StorageConfig;
 use crate::tests::util::chaosproxy::ChaosProxy;
 use crate::tests::util::github::MOCK_GITHUB_DATA;
@@ -120,15 +119,12 @@ impl TestApp {
     ///
     /// This method updates the database directly
     pub async fn db_new_user(&self, username: &str) -> MockCookieUser {
-        use diesel_async::RunQueryDsl;
-
         let mut conn = self.db_conn().await;
 
         let email = format!("{username}@example.com");
 
-        let user: User = diesel::insert_into(users::table)
-            .values(crate::tests::new_user(username))
-            .get_result(&mut conn)
+        let user = crate::tests::new_user(username)
+            .insert(&mut conn)
             .await
             .unwrap();
 

src/typosquat/test_util.rs

@@ -1,8 +1,6 @@
 use diesel::prelude::*;
-use diesel_async::RunQueryDsl;
 
 use crate::models::{Crate, NewTeam, NewUser, Team, User};
-use crate::schema::users;
 use crate::tests::util::github::next_gh_id;
 
 pub mod faker {
@@ -40,15 +38,12 @@ pub mod faker {
     }
 
     pub async fn user(conn: &mut AsyncPgConnection, login: &str) -> QueryResult<User> {
-        let user = NewUser::builder()
+        NewUser::builder()
             .gh_id(next_gh_id())
             .gh_login(login)
             .gh_access_token("token")
-            .build();
-
-        diesel::insert_into(users::table)
-            .values(user)
-            .get_result(conn)
+            .build()
+            .insert(conn)
             .await
     }
 }

src/worker/jobs/downloads/update_metadata.rs

@@ -106,20 +106,17 @@ async fn batch_update(batch_size: i64, conn: &mut AsyncPgConnection) -> QueryRes
 mod tests {
     use super::*;
     use crate::models::{Crate, NewCrate, NewUser, NewVersion, User, Version};
-    use crate::schema::{crate_downloads, crates, users, versions};
+    use crate::schema::{crate_downloads, crates, versions};
     use crates_io_test_db::TestDatabase;
     use diesel_async::AsyncConnection;
 
     async fn user(conn: &mut AsyncPgConnection) -> User {
-        let user = NewUser::builder()
+        NewUser::builder()
             .gh_id(2)
             .gh_login("login")
             .gh_access_token("access_token")
-            .build();
-
-        diesel::insert_into(users::table)
-            .values(user)
-            .get_result(conn)
+            .build()
+            .insert(conn)
             .await
             .unwrap()
     }