models/user: Derive bon::Builder for NewUser struct

Author: Turbo87

src/models/user.rs

@@ -1,3 +1,4 @@
+use bon::Builder;
 use chrono::NaiveDateTime;
 use diesel::prelude::*;
 use diesel_async::scoped_futures::ScopedFutureExt;
@@ -106,7 +107,7 @@ impl User {
 }
 
 /// Represents a new user record insertable to the `users` table
-#[derive(Insertable, Debug, Default)]
+#[derive(Insertable, Debug, Builder)]
 #[diesel(table_name = users, check_for_backend(diesel::pg::Pg))]
 pub struct NewUser<'a> {
     pub gh_id: i32,
@@ -124,13 +125,13 @@ impl<'a> NewUser<'a> {
         gh_avatar: Option<&'a str>,
         gh_access_token: &'a str,
     ) -> Self {
-        NewUser {
-            gh_id,
-            gh_login,
-            name,
-            gh_avatar,
-            gh_access_token,
-        }
+        NewUser::builder()
+            .gh_id(gh_id)
+            .gh_login(gh_login)
+            .maybe_name(name)
+            .maybe_gh_avatar(gh_avatar)
+            .gh_access_token(gh_access_token)
+            .build()
     }
 
     /// Inserts the user into the database, or updates an existing one.

src/rate_limiter.rs

@@ -702,10 +702,11 @@ mod tests {
     async fn new_user(conn: &mut AsyncPgConnection, gh_login: &str) -> QueryResult<i32> {
         use crate::models::NewUser;
 
-        let user = NewUser {
-            gh_login,
-            ..NewUser::default()
-        };
+        let user = NewUser::builder()
+            .gh_id(0)
+            .gh_login(gh_login)
+            .gh_access_token("some random token")
+            .build();
 
         diesel::insert_into(users::table)
             .values(user)

src/tests/mod.rs

@@ -93,13 +93,11 @@ pub struct OwnerResp {
 }
 
 fn new_user(login: &str) -> NewUser<'_> {
-    NewUser {
-        gh_id: next_gh_id(),
-        gh_login: login,
-        name: None,
-        gh_avatar: None,
-        gh_access_token: "some random token",
-    }
+    NewUser::builder()
+        .gh_id(next_gh_id())
+        .gh_login(login)
+        .gh_access_token("some random token")
+        .build()
 }
 
 fn new_team(login: &str) -> NewTeam<'_> {

src/tests/owners.rs

@@ -770,13 +770,11 @@ async fn inactive_users_dont_get_invitations() {
     let invited_gh_login = "user_bar";
     let krate_name = "inactive_test";
 
-    let user = NewUser {
-        gh_id: -1,
-        gh_login: invited_gh_login,
-        name: None,
-        gh_avatar: None,
-        gh_access_token: "some random token",
-    };
+    let user = NewUser::builder()
+        .gh_id(-1)
+        .gh_login(invited_gh_login)
+        .gh_access_token("some random token")
+        .build();
 
     diesel::insert_into(users::table)
         .values(user)

src/tests/user.rs

@@ -76,12 +76,13 @@ async fn github_without_email_does_not_overwrite_email() -> anyhow::Result<()> {
         .await;
 
     // Simulate the same user logging in via GitHub again, still with no email in GitHub.
-    let u = NewUser {
+    let u = NewUser::builder()
         // Use the same github ID to link to the existing account
-        gh_id: user_without_github_email_model.gh_id,
-        // new_user uses a None email; the rest of the fields are arbitrary
-        ..new_user("arbitrary_username")
-    };
+        .gh_id(user_without_github_email_model.gh_id)
+        .gh_login("arbitrary_username")
+        .gh_access_token("some random token")
+        .build();
+
     let u = u
         .create_or_update(None, &app.as_inner().emails, &mut conn)
         .await?;
@@ -115,12 +116,13 @@ async fn github_with_email_does_not_overwrite_email() -> anyhow::Result<()> {
 
     let emails = app.as_inner().emails.clone();
 
-    let u = NewUser {
+    let u = NewUser::builder()
         // Use the same github ID to link to the existing account
-        gh_id: model.gh_id,
-        // the rest of the fields are arbitrary
-        ..new_user("arbitrary_username")
-    };
+        .gh_id(model.gh_id)
+        .gh_login("arbitrary_username")
+        .gh_access_token("some random token")
+        .build();
+
     let u = u
         .create_or_update(Some(new_github_email), &emails, &mut conn)
         .await?;