Merge pull request 'proper log for registering guests' (#325) from staging into main
Reviewed-on: #325
This commit is contained in:
commit
1caced26d6
@ -11,7 +11,7 @@ impl UserTrip {
|
||||
user: &User,
|
||||
trip_details: &TripDetails,
|
||||
user_note: Option<String>,
|
||||
) -> Result<(), UserTripError> {
|
||||
) -> Result<String, UserTripError> {
|
||||
if trip_details.is_full(db).await {
|
||||
return Err(UserTripError::EventAlreadyFull);
|
||||
}
|
||||
@ -81,7 +81,7 @@ impl UserTrip {
|
||||
.await;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
Ok(name_newly_registered_person)
|
||||
}
|
||||
|
||||
pub async fn delete(
|
||||
|
@ -63,7 +63,8 @@ async fn join(
|
||||
};
|
||||
|
||||
match UserTrip::create(db, &user, &trip_details, user_note).await {
|
||||
Ok(_) => {
|
||||
Ok(registered_user) => {
|
||||
if registered_user == user.name {
|
||||
Log::create(
|
||||
db,
|
||||
format!(
|
||||
@ -72,6 +73,15 @@ async fn join(
|
||||
),
|
||||
)
|
||||
.await;
|
||||
}else{
|
||||
Log::create(
|
||||
db,
|
||||
format!(
|
||||
"User {} registered the guest '{}' for trip_details.id={}",
|
||||
user.name, registered_user, trip_details_id
|
||||
),
|
||||
).await;
|
||||
}
|
||||
Flash::success(Redirect::to("/planned"), "Erfolgreich angemeldet!")
|
||||
}
|
||||
Err(UserTripError::EventAlreadyFull) => {
|
||||
|
Loading…
Reference in New Issue
Block a user