models/email: Derive bon::Builder for NewEmail

Author: Turbo87

src/controllers/user/update.rs

@@ -93,11 +93,10 @@ pub async fn update_user(
             .parse::<Address>()
             .map_err(|_| bad_request("invalid email address"))?;
 
-        let new_email = NewEmail {
-            user_id: user.id,
-            email: user_email,
-            verified: false,
-        };
+        let new_email = NewEmail::builder()
+            .user_id(user.id)
+            .email(user_email)
+            .build();
 
         let token = new_email.insert_or_update(&mut conn).await;
         let token = token.map_err(|_| server_error("Error in creating token"))?;

src/models/email.rs

@@ -1,3 +1,4 @@
+use bon::Builder;
 use chrono::NaiveDateTime;
 use diesel::{OptionalExtension, QueryResult};
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
@@ -18,11 +19,12 @@ pub struct Email {
     pub token_generated_at: Option<NaiveDateTime>,
 }
 
-#[derive(Debug, Insertable, AsChangeset)]
+#[derive(Debug, Insertable, AsChangeset, Builder)]
 #[diesel(table_name = emails, check_for_backend(diesel::pg::Pg))]
 pub struct NewEmail<'a> {
     pub user_id: i32,
     pub email: &'a str,
+    #[builder(default = false)]
     pub verified: bool,
 }
 

src/models/user.rs

@@ -170,11 +170,10 @@ impl<'a> NewUser<'a> {
 
                 // To send the user an account verification email
                 if let Some(user_email) = email {
-                    let new_email = NewEmail {
-                        user_id: user.id,
-                        email: user_email,
-                        verified: false,
-                    };
+                    let new_email = NewEmail::builder()
+                        .user_id(user.id)
+                        .email(user_email)
+                        .build();
 
                     if let Some(token) = new_email.insert_if_missing(conn).await? {
                         // Swallows any error. Some users might insert an invalid email address here.

src/tests/util/test_app.rs

@@ -132,11 +132,11 @@ impl TestApp {
             .await
             .unwrap();
 
-        let new_email = NewEmail {
-            user_id: user.id,
-            email: &email,
-            verified: true,
-        };
+        let new_email = NewEmail::builder()
+            .user_id(user.id)
+            .email(&email)
+            .verified(true)
+            .build();
 
         new_email.insert(&mut conn).await.unwrap();