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

switch from cox to steeringuser, which contains both cox + bootsfuehrer
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details
CI/CD Pipeline / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
philipp
2024-10-25 18:29:50 +02:00
parent 4d4c680e59
commit de567eedec
11 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/model/notification.rs
View File

@ -195,7 +195,7 @@ mod test {
notification::Notification,
trip::Trip,
tripdetails::{TripDetails, TripDetailsToAdd},
user::{CoxUser, User},
user::{SteeringUser, User},
usertrip::UserTrip,
},
testdb,
@ -231,7 +231,7 @@ mod test {
UserTrip::create(&pool, &rower, &trip_details, None)
.await
.unwrap();
let cox = CoxUser::new(&pool, User::find_by_name(&pool, "cox").await.unwrap())
let cox = SteeringUser::new(&pool, User::find_by_name(&pool, "cox").await.unwrap())
.await
.unwrap();
Trip::new_join(&pool, &cox, &event).await.unwrap();

34
src/model/trip.rs
View File

@ -9,7 +9,7 @@ use super::{
notification::Notification,
tripdetails::TripDetails,
triptype::TripType,
user::{CoxUser, User},
user::{SteeringUser, User},
usertrip::UserTrip,
};
@ -38,7 +38,7 @@ pub struct TripWithUserAndType {
}
pub struct TripUpdate<'a> {
pub cox: &'a CoxUser,
pub cox: &'a SteeringUser,
pub trip: &'a Trip,
pub max_people: i32,
pub notes: Option<&'a str>,
@ -62,7 +62,7 @@ impl TripWithUserAndType {
impl Trip {
/// Cox decides to create own trip.
pub async fn new_own(db: &SqlitePool, cox: &CoxUser, trip_details: TripDetails) {
pub async fn new_own(db: &SqlitePool, cox: &SteeringUser, trip_details: TripDetails) {
let _ = sqlx::query!(
"INSERT INTO trip (cox_id, trip_details_id) VALUES(?, ?)",
cox.id,
@ -207,7 +207,7 @@ WHERE trip.id=?
/// Cox decides to help in a event.
pub async fn new_join(
db: &SqlitePool,
cox: &CoxUser,
cox: &SteeringUser,
event: &Event,
) -> Result<(), CoxHelpError> {
if event.is_rower_registered(db, cox).await {
@ -360,7 +360,7 @@ WHERE day=?
pub async fn delete_by_planned_event(
db: &SqlitePool,
cox: &CoxUser,
cox: &SteeringUser,
event: &Event,
) -> Result<(), TripHelpDeleteError> {
if event.trip_details(db).await.is_locked {
@ -387,7 +387,7 @@ WHERE day=?
pub(crate) async fn delete(
&self,
db: &SqlitePool,
user: &CoxUser,
user: &SteeringUser,
) -> Result<(), TripDeleteError> {
let registered_rower = Registration::all_rower(db, self.trip_details_id.unwrap()).await;
if !registered_rower.is_empty() {
@ -473,7 +473,7 @@ mod test {
event::Event,
trip::{self, TripDeleteError},
tripdetails::TripDetails,
user::{CoxUser, User},
user::{SteeringUser, User},
usertrip::UserTrip,
},
testdb,
@ -488,7 +488,7 @@ mod test {
fn test_new_own() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)
@ -515,7 +515,7 @@ mod test {
fn test_new_succ_join() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox2".into()).await.unwrap(),
)
@ -531,7 +531,7 @@ mod test {
fn test_new_failed_join_already_cox() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox2".into()).await.unwrap(),
)
@ -548,7 +548,7 @@ mod test {
fn test_succ_update_own() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)
@ -576,7 +576,7 @@ mod test {
fn test_succ_update_own_with_triptype() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)
@ -604,7 +604,7 @@ mod test {
fn test_fail_update_own_not_your_trip() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox2".into()).await.unwrap(),
)
@ -629,7 +629,7 @@ mod test {
fn test_succ_delete_by_planned_event() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)
@ -652,7 +652,7 @@ mod test {
fn test_succ_delete() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)
@ -670,7 +670,7 @@ mod test {
fn test_fail_delete_diff_cox() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox2".into()).await.unwrap(),
)
@ -692,7 +692,7 @@ mod test {
fn test_fail_delete_someone_registered() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)

6
src/model/user.rs
View File

@ -50,16 +50,20 @@ pub struct UserWithDetails {
#[serde(flatten)]
pub user: User,
pub amount_unread_notifications: i32,
pub allowed_to_steer: bool,
pub on_water: bool,
pub roles: Vec<String>,
}
impl UserWithDetails {
pub async fn from_user(user: User, db: &SqlitePool) -> Self {
let allowed_to_steer =
user.has_role(db, "cox").await || user.has_role(db, "Bootsführer").await;
Self {
on_water: user.on_water(db).await,
roles: user.roles(db).await,
amount_unread_notifications: user.amount_unread_notifications(db).await,
allowed_to_steer,
user,
}
}
@ -1153,7 +1157,7 @@ macro_rules! special_user {
}
special_user!(TechUser, +"tech");
special_user!(CoxUser, +"cox");
special_user!(SteeringUser, +"cox", +"Bootsführer");
special_user!(AdminUser, +"admin");
special_user!(AllowedForPlannedTripsUser, +"Donau Linz", +"scheckbuch");
special_user!(DonauLinzUser, +"Donau Linz", -"Unterstützend", -"Förderndes Mitglied");

8
src/model/usertrip.rs
View File

@ -5,7 +5,7 @@ use super::{
notification::Notification,
trip::{Trip, TripWithUserAndType},
tripdetails::TripDetails,
user::{CoxUser, User},
user::{SteeringUser, User},
};
use crate::model::tripdetails::{Action, CoxAtTrip::Yes};
@ -197,7 +197,7 @@ impl UserTrip {
let mut add_info = "";
if let Some(trip) = &trip_to_delete {
let cox = User::find_by_id(db, trip.cox_id as i32).await.unwrap();
trip.delete(db, &CoxUser::new(db, cox).await.unwrap())
trip.delete(db, &SteeringUser::new(db, cox).await.unwrap())
.await
.unwrap();
add_info = " Das war die letzte angemeldete Person. Nachdem nun alle Bescheid wissen, wird die Ausfahrt ab sofort nicht mehr angezeigt.";
@ -270,7 +270,7 @@ pub enum UserTripDeleteError {
mod test {
use crate::{
model::{
event::Event, trip::Trip, tripdetails::TripDetails, user::CoxUser,
event::Event, trip::Trip, tripdetails::TripDetails, user::SteeringUser,
usertrip::UserTripError,
},
testdb,
@ -353,7 +353,7 @@ mod test {
fn test_fail_create_is_cox_planned_event() {
let pool = testdb!();
let cox = CoxUser::new(
let cox = SteeringUser::new(
&pool,
User::find_by_name(&pool, "cox".into()).await.unwrap(),
)

4
src/tera/boatdamage.rs
View File

@ -13,7 +13,7 @@ use crate::{
model::{
boat::Boat,
boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
user::{CoxUser, DonauLinzUser, TechUser, User, UserWithDetails},
user::{DonauLinzUser, SteeringUser, TechUser, User, UserWithDetails},
},
tera::log::KioskCookie,
};
@ -133,7 +133,7 @@ async fn fixed<'r>(
db: &State<SqlitePool>,
data: Form<FormBoatDamageFixed<'r>>,
boatdamage_id: i32,
coxuser: CoxUser,
coxuser: SteeringUser,
) -> Flash<Redirect> {
let boatdamage = BoatDamage::find_by_id(db, boatdamage_id).await.unwrap(); //TODO: Fix
let boatdamage_fixed = BoatDamageFixed {

16
src/tera/cox.rs
View File

@ -11,14 +11,14 @@ use crate::model::{
log::Log,
trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
tripdetails::{TripDetails, TripDetailsToAdd},
user::{AllowedToUpdateTripToAlwaysBeShownUser, CoxUser},
user::{AllowedToUpdateTripToAlwaysBeShownUser, SteeringUser},
};
#[post("/trip", data = "<data>")]
async fn create(
db: &State<SqlitePool>,
data: Form<TripDetailsToAdd<'_>>,
cox: CoxUser,
cox: SteeringUser,
) -> Flash<Redirect> {
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
@ -50,7 +50,7 @@ async fn update(
db: &State<SqlitePool>,
data: Form<EditTripForm<'_>>,
trip_id: i64,
cox: CoxUser,
cox: SteeringUser,
) -> Flash<Redirect> {
if let Some(trip) = Trip::find_by_id(db, trip_id).await {
let update = trip::TripUpdate {
@ -96,7 +96,7 @@ async fn toggle_always_show(
}
#[get("/join/<planned_event_id>")]
async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: SteeringUser) -> Flash<Redirect> {
if let Some(planned_event) = Event::find_by_id(db, planned_event_id).await {
match Trip::new_join(db, &cox, &planned_event).await {
Ok(_) => {
@ -130,7 +130,7 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
}
#[get("/remove/trip/<trip_id>")]
async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flash<Redirect> {
async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: SteeringUser) -> Flash<Redirect> {
let trip = Trip::find_by_id(db, trip_id).await;
match trip {
None => Flash::error(Redirect::to("/planned"), "Trip gibt's nicht!"),
@ -151,7 +151,11 @@ async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flas
}
#[get("/remove/<planned_event_id>")]
async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
async fn remove(
db: &State<SqlitePool>,
planned_event_id: i64,
cox: SteeringUser,
) -> Flash<Redirect> {
if let Some(planned_event) = Event::find_by_id(db, planned_event_id).await {
match Trip::delete_by_planned_event(db, &cox, &planned_event).await {
Ok(_) => {