Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

more clippy :-)

Browse Source
This commit is contained in:
philipp 2023-07-25 13:32:20 +02:00
parent a7789af713
commit e5f22ae070
5 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/model/logbook.rs
View File

@ -101,7 +101,7 @@ impl Logbook {
boat: Boat::find_by_id(db, log.boat_id as i32).await.unwrap(),
shipmaster_user: User::find_by_id(db, log.shipmaster as i32).await.unwrap(),
logbook: log,
})
});
}
ret
}
@ -127,18 +127,15 @@ impl Logbook {
boat: Boat::find_by_id(db, log.boat_id as i32).await.unwrap(),
shipmaster_user: User::find_by_id(db, log.shipmaster as i32).await.unwrap(),
logbook: log,
})
});
}
ret
}
pub async fn create(db: &SqlitePool, log: LogToAdd) -> Result<(), LogbookCreateError> {
let boat = match Boat::find_by_id(db, log.boat_id).await {
Some(b) => b,
None => {
return Err(LogbookCreateError::BoatNotFound);
}
};
let Some(boat) = Boat::find_by_id(db, log.boat_id).await else {
return Err(LogbookCreateError::BoatNotFound);
};
if boat.is_locked(db).await {
return Err(LogbookCreateError::BoatLocked);

27
src/model/mod.rs
View File

@ -31,19 +31,20 @@ pub struct Day {
impl Day {
pub async fn new(db: &SqlitePool, day: NaiveDate, is_pinned: bool) -> Self {
let planned_events = match is_pinned {
true => PlannedEvent::get_pinned_for_day(db, day).await,
false => PlannedEvent::get_for_day(db, day).await,
};
let trips = match is_pinned {
true => Trip::get_pinned_for_day(db, day).await,
false => Trip::get_for_day(db, day).await,
};
Self {
day,
planned_events,
trips,
is_pinned,
if is_pinned {
Self {
day,
planned_events: PlannedEvent::get_pinned_for_day(db, day).await,
trips: Trip::get_pinned_for_day(db, day).await,
is_pinned,
}
} else {
Self {
day,
planned_events: PlannedEvent::get_for_day(db, day).await,
trips: Trip::get_for_day(db, day).await,
is_pinned,
}
}
}
pub async fn new_guest(db: &SqlitePool, day: NaiveDate, is_pinned: bool) -> Self {

23
src/model/user.rs
View File

@ -161,20 +161,17 @@ ORDER BY last_access DESC
//been deleted
}
match user.pw.as_ref() {
Some(user_pw) => {
let password_hash = &Self::get_hashed_pw(pw);
if password_hash == user_pw {
Log::create(db, format!("User {name} successfully logged in")).await;
return Ok(user);
}
Log::create(db, format!("User {name} supplied the wrong PW")).await;
Err(LoginError::InvalidAuthenticationCombo)
}
None => {
info!("User {name} has no PW set");
Err(LoginError::NoPasswordSet(user))
if let Some(user_pw) = user.pw.as_ref() {
let password_hash = &Self::get_hashed_pw(pw);
if password_hash == user_pw {
Log::create(db, format!("User {name} successfully logged in")).await;
return Ok(user);
}
Log::create(db, format!("User {name} supplied the wrong PW")).await;
Err(LoginError::InvalidAuthenticationCombo)
} else {
info!("User {name} has no PW set");
Err(LoginError::NoPasswordSet(user))
}
}

2
src/tera/auth.rs
View File

@ -113,7 +113,7 @@ async fn updatepw(
}
#[get("/logout")]
fn logout(cookies: &CookieJar<'_>, _user: User) -> Flash<Redirect> {
fn logout(cookies: &CookieJar<'_>, _user: &User) -> Flash<Redirect> {
cookies.remove_private(Cookie::named("loggedin_user"));
Flash::success(Redirect::to("/auth"), "Logout erfolgreich")

4
src/tera/log.rs
View File

@ -71,7 +71,7 @@ async fn home(
db: &State<SqlitePool>,
data: Form<LogToFinalize>,
logbook_id: i32,
_adminuser: AdminUser,
adminuser: AdminUser,
) -> Flash<Redirect> {
let logbook = Logbook::find_by_id(db, logbook_id).await;
let Some(logbook) = logbook else {
@ -81,7 +81,7 @@ async fn home(
)
};
match logbook.home(db, &_adminuser.user, data.into_inner()).await {
match logbook.home(db, &adminuser.user, data.into_inner()).await {
Ok(_) => Flash::success(Redirect::to("/log"), "Successfully updated log"),
Err(_) => Flash::error(
Redirect::to("/log"),