clean code with clippy
This commit is contained in:
@ -27,7 +27,7 @@ async fn create(
|
||||
_admin: AdminUser,
|
||||
) -> Flash<Redirect> {
|
||||
//TODO: fix clones()
|
||||
let trip_details_id = TripDetails::new(
|
||||
let trip_details_id = TripDetails::create(
|
||||
db,
|
||||
data.planned_starting_time.clone(),
|
||||
data.max_people,
|
||||
@ -37,7 +37,7 @@ async fn create(
|
||||
.await;
|
||||
|
||||
//TODO: fix clone()
|
||||
PlannedEvent::new(
|
||||
PlannedEvent::create(
|
||||
db,
|
||||
data.name.clone(),
|
||||
data.planned_amount_cox,
|
||||
|
@ -44,14 +44,11 @@ async fn update(
|
||||
_admin: AdminUser,
|
||||
) -> Flash<Redirect> {
|
||||
let user = User::find_by_id(db, data.id).await;
|
||||
let user = match user {
|
||||
Ok(user) => user,
|
||||
Err(_) => {
|
||||
let Ok(user) = user else {
|
||||
return Flash::error(
|
||||
Redirect::to("/admin/user"),
|
||||
format!("User with ID {} does not exist!", data.id),
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
user.update(db, data.is_cox, data.is_admin, data.is_guest)
|
||||
|
@ -14,7 +14,7 @@ use sqlx::SqlitePool;
|
||||
use crate::model::user::{LoginError, User};
|
||||
|
||||
#[get("/")]
|
||||
async fn index(flash: Option<FlashMessage<'_>>) -> Template {
|
||||
fn index(flash: Option<FlashMessage<'_>>) -> Template {
|
||||
let mut context = tera::Context::new();
|
||||
|
||||
if let Some(msg) = flash {
|
||||
@ -59,7 +59,7 @@ async fn login(
|
||||
}
|
||||
|
||||
#[get("/set-pw/<userid>")]
|
||||
async fn setpw(userid: i32) -> Template {
|
||||
fn setpw(userid: i32) -> Template {
|
||||
Template::render("auth/set-pw", context!(userid))
|
||||
}
|
||||
|
||||
@ -77,14 +77,11 @@ async fn updatepw(
|
||||
cookies: &CookieJar<'_>,
|
||||
) -> Flash<Redirect> {
|
||||
let user = User::find_by_id(db, updatepw.userid).await;
|
||||
let user = match user {
|
||||
Ok(user) => user,
|
||||
Err(_) => {
|
||||
let Ok(user) = user else{
|
||||
return Flash::error(
|
||||
Redirect::to("/auth"),
|
||||
format!("User with ID {} does not exist!", updatepw.userid),
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
if updatepw.password != updatepw.password_confirm {
|
||||
@ -106,7 +103,7 @@ async fn updatepw(
|
||||
}
|
||||
|
||||
#[get("/logout")]
|
||||
async 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")
|
||||
|
@ -20,7 +20,7 @@ struct AddTripForm {
|
||||
#[post("/trip", data = "<data>")]
|
||||
async fn create(db: &State<SqlitePool>, data: Form<AddTripForm>, cox: CoxUser) -> Flash<Redirect> {
|
||||
//TODO: fix clones()
|
||||
let trip_details_id = TripDetails::new(
|
||||
let trip_details_id = TripDetails::create(
|
||||
db,
|
||||
data.planned_starting_time.clone(),
|
||||
data.max_people,
|
||||
|
@ -47,7 +47,7 @@ async fn join(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash
|
||||
return Flash::error(Redirect::to("/"), "Bereits ausgebucht!");
|
||||
}
|
||||
|
||||
if UserTrip::new(db, user.id, trip_details_id).await {
|
||||
if UserTrip::create(db, user.id, trip_details_id).await {
|
||||
Flash::success(Redirect::to("/"), "Erfolgreich angemeldet!")
|
||||
} else {
|
||||
Flash::error(Redirect::to("/"), "Du nimmst bereits teil!")
|
||||
|
Reference in New Issue
Block a user