first draft
This commit is contained in:
@ -162,15 +162,6 @@ async fn create_logbook(
|
||||
data: Form<LogToAdd>,
|
||||
user: &NonGuestUser,
|
||||
) -> Flash<Redirect> {
|
||||
Log::create(
|
||||
db,
|
||||
format!(
|
||||
"User {} tries to create log entry={:?}",
|
||||
user.user.name, data
|
||||
),
|
||||
)
|
||||
.await;
|
||||
|
||||
match Logbook::create(
|
||||
db,
|
||||
data.into_inner(),
|
||||
@ -201,6 +192,15 @@ async fn create(
|
||||
data: Form<LogToAdd>,
|
||||
user: NonGuestUser,
|
||||
) -> Flash<Redirect> {
|
||||
Log::create(
|
||||
db,
|
||||
format!(
|
||||
"User {} tries to create log entry={:?}",
|
||||
user.user.name, data
|
||||
),
|
||||
)
|
||||
.await;
|
||||
|
||||
create_logbook(db, data, &user).await
|
||||
}
|
||||
|
||||
@ -515,7 +515,7 @@ mod test {
|
||||
let req = client
|
||||
.post("/log")
|
||||
.header(ContentType::Form)
|
||||
.body("boat_id=1&shipmaster=4&departure=2199-12-31T10:00");
|
||||
.body("boat_id=1&shipmaster=4&departure=2199-12-31T10:00&steering_person=4");
|
||||
let response = req.dispatch().await;
|
||||
|
||||
assert_eq!(response.status(), Status::SeeOther);
|
||||
@ -546,7 +546,7 @@ mod test {
|
||||
let req = client
|
||||
.post("/log/1")
|
||||
.header(ContentType::Form)
|
||||
.body("destination=Ottensheim&distance_in_km=25");
|
||||
.body("destination=Ottensheim&distance_in_km=25&shipmaster=1&steering_person=1&departure=1990-01-01T10:00&arrival=1990-01-01T12:00");
|
||||
let response = req.dispatch().await;
|
||||
|
||||
assert_eq!(response.status(), Status::SeeOther);
|
||||
@ -655,7 +655,7 @@ mod test {
|
||||
let shipmaster_id = User::find_by_name(&db, "rower2".into()).await.unwrap().id;
|
||||
|
||||
let req = client.post("/log").header(ContentType::Form).body(format!(
|
||||
"boat_id={boat_id}&shipmaster={shipmaster_id}&departure=1199-12-31T10:00"
|
||||
"boat_id={boat_id}&shipmaster={shipmaster_id}&departure=1199-12-31T10:00&steering_person={shipmaster_id}"
|
||||
));
|
||||
let response = req.dispatch().await;
|
||||
|
||||
@ -684,7 +684,7 @@ mod test {
|
||||
let req = client
|
||||
.post(format!("/log/{log_id}"))
|
||||
.header(ContentType::Form)
|
||||
.body("destination=Ottensheim&distance_in_km=25");
|
||||
.body(format!("destination=Ottensheim&distance_in_km=25&shipmaster={shipmaster_id}&steering_person={shipmaster_id}&departure=1990-01-01T10:00&arrival=1990-01-01T12:00"));
|
||||
let response = req.dispatch().await;
|
||||
|
||||
assert_eq!(response.status(), Status::SeeOther);
|
||||
@ -875,7 +875,7 @@ mod test {
|
||||
let req = client
|
||||
.post("/log/1")
|
||||
.header(ContentType::Form)
|
||||
.body("destination=Ottensheim&distance_in_km=25");
|
||||
.body("destination=Ottensheim&distance_in_km=25&shipmaster=1&steering_person=1&departure=1199-12-12T10:00&arrival=1199-12-12T12:00");
|
||||
let response = req.dispatch().await;
|
||||
|
||||
assert_eq!(response.status(), Status::SeeOther);
|
||||
@ -902,7 +902,7 @@ mod test {
|
||||
let shipmaster_id = User::find_by_name(db, &shipmaster_name).await.unwrap().id;
|
||||
|
||||
let req = client.post("/log").header(ContentType::Form).body(format!(
|
||||
"boat_id={boat_id}&shipmaster={shipmaster_id}&departure=1199-12-31T10:00"
|
||||
"boat_id={boat_id}&shipmaster={shipmaster_id}&departure=1199-12-31T10:00&steering_person={shipmaster_id}"
|
||||
));
|
||||
let response = req.dispatch().await;
|
||||
|
||||
@ -924,7 +924,7 @@ mod test {
|
||||
let req = client
|
||||
.post(format!("/log/{log_id}"))
|
||||
.header(ContentType::Form)
|
||||
.body("destination=Ottensheim&distance_in_km=25");
|
||||
.body(format!("destination=Ottensheim&distance_in_km=25&shipmaster={shipmaster_id}&steering_person={shipmaster_id}&departure=1199-12-31T10:00&arrival=1199-12-31T12:00"));
|
||||
let response = req.dispatch().await;
|
||||
|
||||
assert_eq!(response.status(), Status::SeeOther);
|
||||
@ -952,7 +952,7 @@ mod test {
|
||||
let shipmaster_id = User::find_by_name(db, &shipmaster_name).await.unwrap().id;
|
||||
|
||||
let req = client.post("/log").header(ContentType::Form).body(format!(
|
||||
"boat_id={boat_id}&shipmaster={shipmaster_id}&departure=2199-12-31T10:00"
|
||||
"boat_id={boat_id}&shipmaster={shipmaster_id}&departure=2199-12-31T10:00&steering_person={shipmaster_id}"
|
||||
));
|
||||
let response = req.dispatch().await;
|
||||
|
||||
|
Reference in New Issue
Block a user