philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Pull Requests 1 Actions Activity

clean code with clippy

Browse Source
This commit is contained in:
philipp 2023-04-24 14:34:06 +02:00
parent b92a8fbde3
commit daf8afd731
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model/trip.rs
View File

@ -168,7 +168,7 @@ FROM user_trip WHERE trip_details_id = (SELECT trip_details_id FROM trip WHERE i
trip_id: i64, trip_id: i64,
) -> Result<(), TripDeleteError> { ) -> Result<(), TripDeleteError> {
let registered_rower = Self::get_all_rower_for_id(db, trip_id).await; let registered_rower = Self::get_all_rower_for_id(db, trip_id).await;
if registered_rower.len() > 0 { if registered_rower.is_empty() {
return Err(TripDeleteError::SomebodyAlreadyRegistered); return Err(TripDeleteError::SomebodyAlreadyRegistered);
} }

32
src/model/user.rs
View File

@ -55,37 +55,33 @@ impl User {
} }
pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> { pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
Some( sqlx::query_as!(
sqlx::query_as!( User,
User, "
"
SELECT id, name, pw, is_cox, is_admin, is_guest SELECT id, name, pw, is_cox, is_admin, is_guest
FROM user FROM user
WHERE id like ? WHERE id like ?
", ",
id id
)
.fetch_one(db)
.await
.ok()?,
) )
.fetch_one(db)
.await
.ok()
} }
async fn find_by_name(db: &SqlitePool, name: String) -> Option<Self> { async fn find_by_name(db: &SqlitePool, name: String) -> Option<Self> {
Some( sqlx::query_as!(
sqlx::query_as!( User,
User, "
"
SELECT id, name, pw, is_cox, is_admin, is_guest SELECT id, name, pw, is_cox, is_admin, is_guest
FROM user FROM user
WHERE name like ? WHERE name like ?
", ",
name name
)
.fetch_one(db)
.await
.ok()?,
) )
.fetch_one(db)
.await
.ok()
} }
fn get_hashed_pw(pw: &str) -> String { fn get_hashed_pw(pw: &str) -> String {