Skip to content

Commit aa29653

Browse files
committed
models/email: Add NewEmail::verified field
1 parent 06a8430 commit aa29653

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/controllers/user/update.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ pub async fn update_user(
9696
let new_email = NewEmail {
9797
user_id: user.id,
9898
email: user_email,
99+
verified: false,
99100
};
100101

101102
let token = diesel::insert_into(emails::table)

src/models/email.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ pub struct Email {
2121
pub struct NewEmail<'a> {
2222
pub user_id: i32,
2323
pub email: &'a str,
24+
pub verified: bool,
2425
}

src/models/user.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ impl<'a> NewUser<'a> {
174174
let new_email = NewEmail {
175175
user_id: user.id,
176176
email: user_email,
177+
verified: false,
177178
};
178179

179180
let token = insert_into(emails::table)

src/tests/util/test_app.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::config::{
44
};
55
use crate::middleware::cargo_compat::StatusCodeConfig;
66
use crate::models::token::{CrateScope, EndpointScope};
7-
use crate::models::User;
7+
use crate::models::{NewEmail, User};
88
use crate::rate_limiter::{LimitedAction, RateLimiterConfig};
99
use crate::schema::users;
1010
use crate::storage::StorageConfig;
@@ -121,7 +121,6 @@ impl TestApp {
121121
/// This method updates the database directly
122122
pub async fn db_new_user(&self, username: &str) -> MockCookieUser {
123123
use crate::schema::emails;
124-
use diesel::prelude::*;
125124
use diesel_async::RunQueryDsl;
126125

127126
let mut conn = self.db_conn().await;
@@ -134,12 +133,14 @@ impl TestApp {
134133
.await
135134
.unwrap();
136135

136+
let new_email = NewEmail {
137+
user_id: user.id,
138+
email: &email,
139+
verified: true,
140+
};
141+
137142
diesel::insert_into(emails::table)
138-
.values((
139-
emails::user_id.eq(user.id),
140-
emails::email.eq(email),
141-
emails::verified.eq(true),
142-
))
143+
.values(new_email)
143144
.execute(&mut conn)
144145
.await
145146
.unwrap();

0 commit comments

Comments
 (0)