diff options
Diffstat (limited to 'src/types/user.rs')
-rw-r--r-- | src/types/user.rs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/types/user.rs b/src/types/user.rs index 0013d7d..fcfbe91 100644 --- a/src/types/user.rs +++ b/src/types/user.rs @@ -1,10 +1,9 @@ -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; use tracing::instrument; use crate::api::auth::RegistrationRequet; use crate::database; -use crate::types::http::{Result, ResponseCode}; - +use crate::types::http::{ResponseCode, Result}; #[derive(Serialize, Deserialize, Debug)] pub struct User { @@ -21,7 +20,6 @@ pub struct User { } impl User { - #[instrument()] pub fn from_user_id(user_id: u64, hide_password: bool) -> Result<Self> { let Ok(Some(user)) = database::users::get_user_by_id(user_id, hide_password) else { @@ -33,12 +31,15 @@ impl User { #[instrument()] pub fn from_user_ids(user_ids: Vec<u64>) -> Vec<Self> { - user_ids.iter().filter_map(|user_id| { - let Ok(Some(user)) = database::users::get_user_by_id(*user_id, true) else { + user_ids + .iter() + .filter_map(|user_id| { + let Ok(Some(user)) = database::users::get_user_by_id(*user_id, true) else { return None; }; - Some(user) - }).collect() + Some(user) + }) + .collect() } #[instrument()] @@ -70,13 +71,15 @@ impl User { #[instrument()] pub fn new(request: RegistrationRequet) -> Result<Self> { if Self::from_email(&request.email).is_ok() { - return Err(ResponseCode::BadRequest.text(&format!("Email is already in use by {}", &request.email))) + return Err(ResponseCode::BadRequest + .text(&format!("Email is already in use by {}", &request.email))); } if let Ok(user) = Self::from_password(&request.password) { - return Err(ResponseCode::BadRequest.text(&format!("Password is already in use by {}", user.email))) + return Err(ResponseCode::BadRequest + .text(&format!("Password is already in use by {}", user.email))); } - + let Ok(user) = database::users::add_user(request) else { tracing::error!("Failed to create new user"); return Err(ResponseCode::InternalServerError.text("Failed to create new uesr")) @@ -84,5 +87,4 @@ impl User { Ok(user) } - -}
\ No newline at end of file +} |