Merge branch 'main' into boat-water-check

src/model/event.rs

@@ -8,7 +8,10 @@ use ics::{
 use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
-use super::{notification::Notification, tripdetails::TripDetails, triptype::TripType, user::User};
+use super::{
+    notification::Notification, role::Role, tripdetails::TripDetails, triptype::TripType,
+    user::User,
+};
 
 #[derive(Serialize, Clone, FromRow, Debug, PartialEq)]
 pub struct Event {
@@ -213,12 +216,35 @@ WHERE trip_details.id=?
         .ok()
     }
 
+    async fn advertise(db: &SqlitePool, day: &str, planned_starting_time: &str, name: &str) {
+        let donau = Role::find_by_name(db, "Donau Linz").await.unwrap();
+        Notification::create_for_role(
+                db,
+                &donau,
+                &format!("Am {} um {} wurde ein neues Event angelegt: {} Wir freuen uns wenn du dabei mitmachst, die Anmeldung ist ab sofort offen :-)", day, planned_starting_time, name),
+                "Neues Event",
+                Some(&format!("/planned#{day}")),
+                None,
+            )
+            .await;
+    }
+
     pub async fn create(
         db: &SqlitePool,
         name: &str,
         planned_amount_cox: i32,
         trip_details: &TripDetails,
     ) {
+        if trip_details.always_show {
+            Self::advertise(
+                db,
+                &trip_details.day,
+                &trip_details.planned_starting_time,
+                name,
+            )
+            .await;
+        }
+
         sqlx::query!(
             "INSERT INTO planned_event(name, planned_amount_cox, trip_details_id) VALUES(?, ?, ?)",
             name,
@@ -258,6 +284,16 @@ WHERE trip_details.id=?
         .await
         .unwrap(); //Okay, as planned_event can only be created with proper DB backing
 
+        if !tripdetails.always_show && update.always_show {
+            Self::advertise(
+                db,
+                &tripdetails.day,
+                &tripdetails.planned_starting_time,
+                update.name,
+            )
+            .await;
+        }
+
         if update.max_people == 0 && !was_already_cancelled {
             let coxes = Registration::all_cox(db, self.id).await;
             for user in coxes {

src/model/user.rs

@@ -29,6 +29,7 @@ const REGULAR: i32 = 22000;
 const UNTERSTUETZEND: i32 = 2500;
 const FOERDERND: i32 = 8500;
 pub const SCHECKBUCH: i32 = 3000;
+const EINSCHREIBGEBUEHR: i32 = 3000;
 
 #[derive(FromRow, Serialize, Deserialize, Clone, Debug, Eq, Hash, PartialEq)]
 pub struct User {
@@ -361,6 +362,17 @@ ASKÖ Ruderverein Donau Linz", self.name),
             );
         }
 
+        if let Some(member_since_date) = &self.member_since_date {
+            if let Ok(member_since_date) = NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
+            {
+                if member_since_date.year() == Local::now().year()
+                    && !self.has_role(db, "no-einschreibgebuehr").await
+                {
+                    fee.add("Einschreibgebühr".into(), EINSCHREIBGEBUEHR);
+                }
+            }
+        }
+
         let halfprice = if let Some(member_since_date) = &self.member_since_date {
             if let Ok(member_since_date) = NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
             {

src/tera/admin/user.rs

@@ -437,6 +437,10 @@ async fn schnupper_to_scheckbuch(
     let scheckbuch = Role::find_by_name(db, "scheckbuch").await.unwrap();
     user.add_role(db, &scheckbuch).await;
 
+    if let Some(no_einschreibgebuehr) = Role::find_by_name(db, "no-einschreibgebuehr").await {
+        user.add_role(db, &no_einschreibgebuehr).await;
+    }
+
     user.send_welcome_email(db, &config.smtp_pw).await.unwrap();
 
     Log::create(