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

Compare commits

base: Ruderverein-Donau-Linz:7193760f0507b2ac40e64b44f4013d3e569bb0ab
Branches Tags
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:test
...
compare: Ruderverein-Donau-Linz:58943bd4e2b0c983d96a4b0f6e7bd1c8808f4252
Branches Tags
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:test

2 Commits
7193760f05 ... 58943bd4e2

Author SHA1 Message Date
philipp
58943bd4e2 Merge pull request 'cleaner code' (#92) from cleaner-code into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m52s
Details
CI/CD Pipeline / deploy-staging (push) Has been skipped
Details
CI/CD Pipeline / deploy-main (push) Successful in 14m33s
Details 
Reviewed-on: #92
 2023-12-01 10:11:17 +01:00
philipp
e081c7a31f cleaner code
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m28s
Details
CI/CD Pipeline / deploy-staging (push) Has been skipped
Details
CI/CD Pipeline / deploy-main (push) Has been skipped
Details
2023-12-01 10:10:18 +01:00
1 changed files with 1 additions and 12 deletions
Show Stats Expand all files Collapse all files

13
src/model/trip.rs
View File

@ -76,10 +76,6 @@ WHERE trip.id=?
return Err(CoxHelpError::DetailsLocked); return Err(CoxHelpError::DetailsLocked);
} }
if planned_event.is_rower_registered(db, cox).await {
return Err(CoxHelpError::AlreadyRegisteredAsRower);
}
match sqlx::query!( match sqlx::query!(
"INSERT INTO trip (cox_id, planned_event_id) VALUES(?, ?)", "INSERT INTO trip (cox_id, planned_event_id) VALUES(?, ?)",
cox.id, cox.id,
@ -140,14 +136,7 @@ WHERE day=?
return Err(TripUpdateError::NotYourTrip); return Err(TripUpdateError::NotYourTrip);
} }
let trip_details = sqlx::query!( let Some(trip_details_id) = trip.trip_details_id else {
"SELECT trip_details_id as id FROM trip WHERE id = ?",
trip.id
)
.fetch_one(db)
.await
.unwrap(); //Okay, as trip can only be created with proper DB backing
let Some(trip_details_id) = trip_details.id else {
return Err(TripUpdateError::TripDetailsDoesNotExist); //TODO: Remove? return Err(TripUpdateError::TripDetailsDoesNotExist); //TODO: Remove?
}; };