diff --git a/src/callers/login.rs b/src/callers/login.rs index 3859f71..5248ca5 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -43,7 +43,6 @@ pub mod request { } } } - } pub mod response { @@ -414,7 +413,10 @@ pub mod endpoint { pub async fn get_user_profile( axum::Extension(pool): axum::Extension, axum::extract::Path(id): axum::extract::Path, - ) -> (axum::http::StatusCode, axum::Json) { + ) -> ( + axum::http::StatusCode, + axum::Json, + ) { let mut response = super::response::get_user_profile::GetUserProfileResponse::default(); if id.is_nil() { response.message = "Invalid request".to_string(); @@ -426,7 +428,7 @@ pub mod endpoint { firstname: user.firstname, lastname: user.lastname, username: user.username, - email: user.email + email: user.email, }; response.message = "SUCCESSFUL".to_string(); @@ -435,7 +437,10 @@ pub mod endpoint { } Err(err) => { response.message = err.to_string(); - (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response)) + ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response), + ) } } } diff --git a/src/main.rs b/src/main.rs index 214b224..aeaf7f2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -128,8 +128,10 @@ mod init { callers::endpoints::REFRESH_TOKEN, post(callers::login::endpoint::refresh_token), ) - .route(callers::endpoints::GET_USER_PROFILE, - get(callers::login::endpoint::get_user_profile)) + .route( + callers::endpoints::GET_USER_PROFILE, + get(callers::login::endpoint::get_user_profile), + ) .layer(cors::configure_cors().await) } diff --git a/src/repo/mod.rs b/src/repo/mod.rs index 1b3c7cf..63ab00a 100644 --- a/src/repo/mod.rs +++ b/src/repo/mod.rs @@ -31,7 +31,6 @@ pub mod user { } } - pub async fn get_with_id( pool: &sqlx::PgPool, id: &uuid::Uuid, @@ -47,43 +46,63 @@ pub mod user { match result { Ok(r) => match r { - Some(roww) => { - parse_row(&roww).await - } - None => { - Err(sqlx::Error::RowNotFound) - } - } + Some(roww) => parse_row(&roww).await, + None => Err(sqlx::Error::RowNotFound), + }, Err(e) => Err(e), } } async fn parse_row(row: &sqlx::postgres::PgRow) -> Result { Ok(simodels::user::User { - id: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - username: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - password: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - email: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - phone: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - firstname: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - lastname: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - email_verified: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - date_created: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - status: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - last_login: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - salt_id: row.try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound).unwrap(), + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + username: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + password: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + email: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + phone: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + firstname: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + lastname: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + email_verified: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + date_created: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + status: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + last_login: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + salt_id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), }) }