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-07-25 13:22:11 +02:00
parent 3765541674
commit a7789af713
10 changed files with 243 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/tera/admin/boat.rs
View File

@ -1,5 +1,5 @@
use crate::model::{
boat::Boat,
boat::{Boat, BoatToAdd, BoatToUpdate},
location::Location,
user::{AdminUser, User},
};
@ -8,7 +8,7 @@ use rocket::{
get, post,
request::FlashMessage,
response::{Flash, Redirect},
routes, FromForm, Route, State,
routes, Route, State,
};
use rocket_dyn_templates::{tera::Context, Template};
use sqlx::SqlitePool;
@ -50,96 +50,39 @@ async fn delete(db: &State<SqlitePool>, _admin: AdminUser, boat: i32) -> Flash<R
}
}
#[derive(FromForm)]
struct BoatEditForm<'r> {
id: i32,
name: &'r str,
amount_seats: i64,
year_built: Option<i64>,
boatbuilder: Option<&'r str>,
default_shipmaster_only_steering: bool,
skull: bool,
external: bool,
location_id: Option<i64>,
owner: Option<i64>,
}
#[post("/boat", data = "<data>")]
async fn update(
db: &State<SqlitePool>,
data: Form<BoatEditForm<'_>>,
data: Form<BoatToUpdate<'_>>,
_admin: AdminUser,
) -> Flash<Redirect> {
let boat = Boat::find_by_id(db, data.id).await;
let Some(boat) = boat else {
return Flash::error(
Redirect::to("/admin/boat"),
format!("Boat with ID {} does not exist!", data.id),
"Boat does not exist!",
)
};
if !boat
.update(
db,
data.name,
data.amount_seats,
data.year_built,
data.boatbuilder,
data.default_shipmaster_only_steering,
data.skull,
data.external,
data.location_id,
data.owner,
)
.await
{
return Flash::error(
Redirect::to("/admin/boat"),
format!("Boat with ID {} could not be updated!", data.id),
);
if !boat.update(db, data.into_inner()).await {
return Flash::error(Redirect::to("/admin/boat"), "Boat could not be updated!");
}
Flash::success(Redirect::to("/admin/boat"), "Successfully updated boat")
}
#[derive(FromForm)]
struct BoatAddForm<'r> {
name: &'r str,
amount_seats: i64,
year_built: Option<i64>,
boatbuilder: Option<&'r str>,
default_shipmaster_only_steering: bool,
skull: bool,
external: bool,
location_id: Option<i64>,
owner: Option<i64>,
}
#[post("/boat/new", data = "<data>")]
async fn create(
db: &State<SqlitePool>,
data: Form<BoatAddForm<'_>>,
data: Form<BoatToAdd<'_>>,
_admin: AdminUser,
) -> Flash<Redirect> {
if Boat::create(
db,
data.name,
data.amount_seats,
data.year_built,
data.boatbuilder,
data.default_shipmaster_only_steering,
data.skull,
data.external,
data.location_id,
data.owner,
)
.await
{
if Boat::create(db, data.into_inner()).await {
Flash::success(Redirect::to("/admin/boat"), "Successfully created boat")
} else {
Flash::error(
Redirect::to("/admin/boat"),
format!("Error while creating boat {} in DB", data.name),
"Error while creating the boat in DB",
)
}
}

32
src/tera/admin/planned_event.rs
View File

@ -4,22 +4,22 @@ use rocket::{
response::{Flash, Redirect},
routes, FromForm, Route, State,
};
use serde::Serialize;
use sqlx::SqlitePool;
use crate::model::{planned_event::PlannedEvent, tripdetails::TripDetails, user::AdminUser};
use crate::model::{
planned_event::PlannedEvent,
tripdetails::{TripDetails, TripDetailsToAdd},
user::AdminUser,
};
//TODO: add constraints (e.g. planned_amount_cox > 0)
#[derive(FromForm)]
#[derive(FromForm, Serialize)]
struct AddPlannedEventForm<'r> {
day: &'r str,
name: &'r str,
planned_amount_cox: i32,
allow_guests: bool,
planned_starting_time: &'r str,
max_people: i32,
always_show: bool,
notes: Option<&'r str>,
trip_type: Option<i64>,
#[serde(flatten)]
tripdetails: TripDetailsToAdd<'r>,
}
#[post("/planned-event", data = "<data>")]
@ -28,17 +28,9 @@ async fn create(
data: Form<AddPlannedEventForm<'_>>,
_admin: AdminUser,
) -> Flash<Redirect> {
let trip_details_id = TripDetails::create(
db,
data.planned_starting_time,
data.max_people,
data.day,
data.notes,
data.allow_guests,
data.trip_type,
data.always_show,
)
.await;
let data = data.into_inner();
let trip_details_id = TripDetails::create(db, data.tripdetails).await;
let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap(); //Okay, bc. we
//just created

49
src/tera/cox.rs
View File

@ -10,52 +10,29 @@ use crate::model::{
log::Log,
planned_event::PlannedEvent,
trip::{CoxHelpError, Trip, TripDeleteError, TripUpdateError},
tripdetails::TripDetails,
tripdetails::{TripDetails, TripDetailsToAdd},
user::CoxUser,
};
#[derive(FromForm)]
struct AddTripForm<'r> {
day: String,
//TODO: properly parse `planned_starting_time`
planned_starting_time: &'r str,
#[field(validate = range(1..))]
max_people: i32,
notes: Option<&'r str>,
trip_type: Option<i64>,
allow_guests: bool,
always_show: bool,
}
#[post("/trip", data = "<data>")]
async fn create(
db: &State<SqlitePool>,
data: Form<AddTripForm<'_>>,
data: Form<TripDetailsToAdd<'_>>,
cox: CoxUser,
) -> Flash<Redirect> {
let trip_details_id = TripDetails::create(
db,
data.planned_starting_time,
data.max_people,
&data.day,
data.notes,
data.allow_guests,
data.trip_type,
data.always_show,
)
.await;
let trip_details_id = TripDetails::create(db, data.into_inner()).await;
let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap(); //Okay, bc just
//created
Trip::new_own(db, &cox, trip_details).await;
Trip::new_own(db, &cox, trip_details).await; //TODO: fix
Log::create(
db,
format!(
"Cox {} created trip on {} @ {} for {} rower",
cox.name, data.day, data.planned_starting_time, data.max_people,
),
)
.await;
//Log::create(
// db,
// format!(
// "Cox {} created trip on {} @ {} for {} rower",
// cox.name, trip_details.day, trip_details.planned_starting_time, trip_details.max_people,
// ),
//)
//.await;
Flash::success(Redirect::to("/"), "Ausfahrt erfolgreich erstellt.")
}
@ -402,7 +379,7 @@ mod test {
login.dispatch().await;
let req = client.get("/join/1");
let response = req.dispatch().await;
let _ = req.dispatch().await;
let req = client.get("/cox/join/1");
let response = req.dispatch().await;

58
src/tera/log.rs
View File

@ -1,10 +1,9 @@
use chrono::NaiveDateTime;
use rocket::{
form::Form,
get, post,
request::FlashMessage,
response::{Flash, Redirect},
routes, FromForm, Route, State,
routes, Route, State,
};
use rocket_dyn_templates::Template;
use sqlx::SqlitePool;
@ -12,7 +11,7 @@ use tera::Context;
use crate::model::{
boat::Boat,
logbook::{Logbook, LogbookCreateError},
logbook::{LogToAdd, LogToFinalize, Logbook, LogbookCreateError},
logtype::LogType,
user::{AdminUser, User},
};
@ -47,40 +46,15 @@ async fn index(
Template::render("log", context.into_json())
}
#[derive(FromForm)]
struct LogAddForm {
boat_id: i32,
shipmaster: i64,
shipmaster_only_steering: bool,
departure: String,
arrival: Option<String>,
destination: Option<String>,
distance_in_km: Option<i64>,
comments: Option<String>,
logtype: Option<i64>,
rower: Vec<i64>,
}
#[post("/", data = "<data>")]
async fn create(
db: &State<SqlitePool>,
data: Form<LogAddForm>,
data: Form<LogToAdd>,
_adminuser: AdminUser,
) -> Flash<Redirect> {
match Logbook::create(
db,
data.boat_id,
data.shipmaster,
data.shipmaster_only_steering,
NaiveDateTime::parse_from_str(&data.departure, "%Y-%m-%dT%H:%M").unwrap(), //TODO: fix
data.arrival
.clone()
.map(|a| NaiveDateTime::parse_from_str(&a, "%Y-%m-%dT%H:%M").unwrap()), //TODO: fix
data.destination.clone(), //TODO: fix
data.distance_in_km,
data.comments.clone(), //TODO: fix
data.logtype,
data.rower.clone(), //TODO: fix
data.into_inner()
)
.await
{
@ -92,19 +66,10 @@ async fn create(
}
}
#[derive(FromForm)]
struct LogHomeForm {
destination: String,
distance_in_km: i64,
comments: Option<String>,
logtype: Option<i64>,
rower: Vec<i64>,
}
#[post("/<logbook_id>", data = "<data>")]
async fn home(
db: &State<SqlitePool>,
data: Form<LogHomeForm>,
data: Form<LogToFinalize>,
logbook_id: i32,
_adminuser: AdminUser,
) -> Flash<Redirect> {
@ -116,18 +81,7 @@ async fn home(
)
};
match logbook
.home(
db,
&_adminuser.user,
data.destination.clone(), //TODO: fixme
data.distance_in_km,
data.comments.clone(), //TODO: fixme
data.logtype,
data.rower.clone(), //TODO: fixme
)
.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"),