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

clean code with clippy

Browse Source
This commit is contained in:
philipp
2023-10-02 12:39:05 +02:00
parent 23ba9d11b5
commit bb142a0969
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/model/boat.rs
View File

@ -148,8 +148,7 @@ ORDER BY amount_seats DESC
if user.is_admin {
return Self::all(db).await;
}
let boats;
if user.is_cox {
let boats = if user.is_cox {
boats = sqlx::query_as!(
Boat,
"
@ -162,9 +161,9 @@ ORDER BY amount_seats DESC
)
.fetch_all(db)
.await
.unwrap(); //TODO: fixme
.unwrap() //TODO: fixme
} else {
boats = sqlx::query_as!(
sqlx::query_as!(
Boat,
"
SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, skull, external
@ -176,8 +175,8 @@ ORDER BY amount_seats DESC
)
.fetch_all(db)
.await
.unwrap(); //TODO: fixme
}
.unwrap() //TODO: fixme
};
Self::boats_to_details(db, boats).await
}

4
src/model/logbook.rs
View File

@ -1,4 +1,4 @@
use chrono::{Local, NaiveDateTime, TimeZone};
use chrono::{NaiveDateTime, TimeZone};
use chrono_tz::Europe::Vienna;
use rocket::FromForm;
use serde::Serialize;
@ -196,7 +196,7 @@ ORDER BY departure DESC
if let Some(arrival) = &log.arrival {
let dep = NaiveDateTime::parse_from_str(&log.departure, "%Y-%m-%dT%H:%M").unwrap();
let arr = NaiveDateTime::parse_from_str(&arrival, "%Y-%m-%dT%H:%M").unwrap();
let arr = NaiveDateTime::parse_from_str(arrival, "%Y-%m-%dT%H:%M").unwrap();
if arr <= dep {
return Err(LogbookCreateError::ArrivalNotAfterDeparture);
}