From 7a6bea3c46e254f0ce80f01032bb396f7e5fd67d Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Tue, 5 Mar 2024 09:35:08 +0100
Subject: [PATCH 1/6] fix ci (#245)

Reviewed-on: https://git.hofer.link/Ruderverein-Donau-Linz/rowt/pulls/245
---
 src/tera/log.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tera/log.rs b/src/tera/log.rs
index e2dca51..3ff330b 100644
--- a/src/tera/log.rs
+++ b/src/tera/log.rs
@@ -86,7 +86,7 @@ async fn index(
     Template::render("log", context.into_json())
 }
 
-#[get("/show", rank = 2)]
+#[get("/show", rank = 3)]
 async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     let logs = Logbook::completed(db).await;
 
@@ -96,7 +96,7 @@ async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     )
 }
 
-#[get("/show?<year>")]
+#[get("/show?<year>", rank = 2)]
 async fn show_for_year(db: &State<SqlitePool>, user: AdminUser, year: i32) -> Template {
     let logs = Logbook::completed_in_year(db, year).await;
 

From aadc1b315ee7fe5aba2d5ed87f20df21b8a3260e Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Tue, 5 Mar 2024 09:46:53 +0100
Subject: [PATCH 2/6] staging (#246)

Reviewed-on: https://git.hofer.link/Ruderverein-Donau-Linz/rowt/pulls/246
---
 templates/log.completed.html.tera | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/log.completed.html.tera b/templates/log.completed.html.tera
index 1edaefa..0b2b75c 100644
--- a/templates/log.completed.html.tera
+++ b/templates/log.completed.html.tera
@@ -5,7 +5,7 @@
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">
             Logbuch
-            {% if "admin" in loggedin_user.roles %}
+            {% if loggedin_user and "admin" in loggedin_user.roles %}
                 <select id="yearSelect"
                         onchange="changeYear()"
                         style="background: transparent;

From 9fdc1f82bd4266b3a655de6590d353f201ed67b0 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 20:59:41 +0100
Subject: [PATCH 3/6] add membership pdf

---
 migration.sql                        |  3 +-
 src/model/family.rs                  |  2 +-
 src/model/rower.rs                   |  2 +-
 src/model/user.rs                    | 47 +++++++++++++++++++++-------
 src/tera/admin/user.rs               | 34 ++++++++++++++++----
 templates/admin/user/index.html.tera | 10 ++++--
 6 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/migration.sql b/migration.sql
index 11c7494..421ca30 100644
--- a/migration.sql
+++ b/migration.sql
@@ -16,7 +16,8 @@ CREATE TABLE IF NOT EXISTS "user" (
 	"notes" text,
 	"phone" text,
 	"address" text,
-	"family_id" INTEGER REFERENCES family(id)
+	"family_id" INTEGER REFERENCES family(id),
+	"membership_pdf" BLOB
 );
 
 CREATE TABLE IF NOT EXISTS "family" (
diff --git a/src/model/family.rs b/src/model/family.rs
index f648cfd..6bff530 100644
--- a/src/model/family.rs
+++ b/src/model/family.rs
@@ -75,7 +75,7 @@ GROUP BY family.id;"
     }
 
     pub async fn members(&self, db: &SqlitePool) -> Vec<User> {
-        sqlx::query_as!(User, "SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id FROM user WHERE family_id = ?", self.id)
+        sqlx::query_as!(User, "SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf FROM user WHERE family_id = ?", self.id)
             .fetch_all(db)
             .await
             .unwrap()
diff --git a/src/model/rower.rs b/src/model/rower.rs
index 796a2ad..a953738 100644
--- a/src/model/rower.rs
+++ b/src/model/rower.rs
@@ -16,7 +16,7 @@ impl Rower {
         sqlx::query_as!(
             User,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user
 WHERE id in (SELECT rower_id FROM rower WHERE logbook_id=?)
         ",
diff --git a/src/model/user.rs b/src/model/user.rs
index ca6b710..e4f7eb3 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -1,13 +1,19 @@
-use std::ops::{Deref, DerefMut};
+use std::{
+    fs::File,
+    io::Read,
+    ops::{Deref, DerefMut},
+};
 
 use argon2::{password_hash::SaltString, Argon2, PasswordHasher};
 use chrono::{Datelike, Local, NaiveDate};
 use log::info;
 use rocket::{
     async_trait,
-    http::{Cookie, Status},
+    data::ToByteUnit,
+    http::{ext::IntoCollection, Cookie, Status},
     request::{self, FromRequest, Outcome},
     time::{Duration, OffsetDateTime},
+    tokio::io::AsyncReadExt,
     Request,
 };
 use serde::{Deserialize, Serialize};
@@ -43,6 +49,7 @@ pub struct User {
     pub phone: Option<String>,
     pub address: Option<String>,
     pub family_id: Option<i64>,
+    pub membership_pdf: Option<Vec<u8>>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -285,7 +292,7 @@ impl User {
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user 
 WHERE id like ?
         ",
@@ -300,7 +307,7 @@ WHERE id like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user 
 WHERE id like ?
         ",
@@ -315,7 +322,7 @@ WHERE id like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user 
 WHERE name like ?
         ",
@@ -357,7 +364,7 @@ WHERE name like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user
 WHERE deleted = 0
 ORDER BY last_access DESC
@@ -372,7 +379,7 @@ ORDER BY last_access DESC
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user u
 JOIN user_role ur ON u.id = ur.user_id
 WHERE ur.role_id = ? AND deleted = 0
@@ -388,14 +395,14 @@ ORDER BY name;
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id FROM user 
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf FROM user 
 WHERE family_id IS NOT NULL
 GROUP BY family_id
 
 UNION
 
 -- Select users with a null family_id, without grouping
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id  FROM user 
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf  FROM user 
 WHERE family_id IS NULL;
         "
         )
@@ -408,7 +415,7 @@ WHERE family_id IS NULL;
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user
 WHERE deleted = 0 AND dob != '' and weight != '' and sex != ''
 ORDER BY name 
@@ -423,7 +430,7 @@ ORDER BY name
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id, membership_pdf
 FROM user
 WHERE deleted = 0 AND (SELECT COUNT(*) FROM user_role WHERE user_id=user.id AND role_id = (SELECT id FROM role WHERE name = 'cox')) > 0
 ORDER BY last_access DESC
@@ -441,13 +448,29 @@ ORDER BY last_access DESC
             .is_ok()
     }
 
-    pub async fn update(&self, db: &SqlitePool, data: UserEditForm) {
+    pub async fn update(&self, db: &SqlitePool, data: UserEditForm<'_>) {
         let mut family_id = data.family_id;
 
         if family_id.is_some_and(|x| x == -1) {
             family_id = Some(Family::insert(db).await)
         }
 
+        if self.membership_pdf.is_none() {
+            if let Some(membership_pdf) = data.membership_pdf {
+                let mut stream = membership_pdf.open().await.unwrap();
+                let mut buffer = Vec::new();
+                stream.read_to_end(&mut buffer).await.unwrap();
+                sqlx::query!(
+                    "UPDATE user SET membership_pdf = ? where id = ?",
+                    buffer,
+                    self.id
+                )
+                .execute(db)
+                .await
+                .unwrap(); //Okay, because we can only create a User of a valid id
+            }
+        }
+
         sqlx::query!(
             "UPDATE user SET dob = ?, weight = ?, sex = ?, member_since_date=?, birthdate=?, mail=?, nickname=?, notes=?, phone=?, address=?, family_id = ? where id = ?",
             data.dob,
diff --git a/src/tera/admin/user.rs b/src/tera/admin/user.rs
index 7a55d85..ea0eb56 100644
--- a/src/tera/admin/user.rs
+++ b/src/tera/admin/user.rs
@@ -10,11 +10,12 @@ use crate::model::{
 use futures::future::join_all;
 use rocket::{
     form::Form,
+    fs::TempFile,
     get,
-    http::Status,
+    http::{ContentType, Status},
     post,
     request::{FlashMessage, FromRequest, Outcome},
-    response::{Flash, Redirect},
+    response::{content, Flash, Redirect},
     routes, FromForm, Request, Route, State,
 };
 use rocket_dyn_templates::{tera::Context, Template};
@@ -231,7 +232,7 @@ async fn delete(db: &State<SqlitePool>, admin: AdminUser, user: i32) -> Flash<Re
 }
 
 #[derive(FromForm, Debug)]
-pub struct UserEditForm {
+pub struct UserEditForm<'a> {
     pub(crate) id: i32,
     pub(crate) dob: Option<String>,
     pub(crate) weight: Option<String>,
@@ -245,12 +246,13 @@ pub struct UserEditForm {
     pub(crate) phone: Option<String>,
     pub(crate) address: Option<String>,
     pub(crate) family_id: Option<i64>,
+    pub(crate) membership_pdf: Option<TempFile<'a>>,
 }
 
-#[post("/user", data = "<data>")]
+#[post("/user", data = "<data>", format = "multipart/form-data")]
 async fn update(
     db: &State<SqlitePool>,
-    data: Form<UserEditForm>,
+    data: Form<UserEditForm<'_>>,
     admin: AdminUser,
 ) -> Flash<Redirect> {
     let user = User::find_by_id(db, data.id).await;
@@ -271,6 +273,25 @@ async fn update(
     Flash::success(Redirect::to("/admin/user"), "Successfully updated user")
 }
 
+#[get("/user/<user>/membership")]
+async fn download_membership_pdf(
+    db: &State<SqlitePool>,
+    admin: AdminUser,
+    user: i32,
+) -> (ContentType, Vec<u8>) {
+    let user = User::find_by_id(db, user).await.unwrap();
+    Log::create(
+        db,
+        format!(
+            "{} downloaded membership application for user: {user:?}",
+            admin.user.name
+        ),
+    )
+    .await;
+
+    (ContentType::PDF, user.membership_pdf.unwrap())
+}
+
 #[derive(FromForm, Debug)]
 struct UserAddForm<'r> {
     name: &'r str,
@@ -307,6 +328,7 @@ pub fn routes() -> Vec<Route> {
         delete,
         fees,
         fees_paid,
-        scheckbuch
+        scheckbuch,
+        download_membership_pdf
     ]
 }
diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 068ce64..5da8e7b 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -33,7 +33,7 @@
                    name="name"
                    id="filter-js"
                    class="search-bar"
-                   placeholder="Suchen nach (Name, [yes|no]-role:<name>)" />
+                   placeholder="Suchen nach (Name, [yes|no]-role:<name>, has-[no-]membership-pdf)" />
         </div>
         <!-- END filterBar -->
         <div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4">
@@ -41,9 +41,10 @@
                  class="text-primary-950 dark:text-white text-right"></div>
             {% for user in users %}
                 <div data-filterable="true"
-                     data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %}  ">
+                     data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %} {% if user.membership_pdf %}has-membership-pdf{% else %}has-no-membership-pdf{% endif %} ">
                     <form action="/admin/user"
                           method="post"
+                          enctype="multipart/form-data"
                           class="bg-white dark:bg-primary-900 p-3 rounded-md w-full">
                         <div class="w-full grid gap-3">
                             <input type="hidden" name="id" value="{{ user.id }}" />
@@ -62,6 +63,11 @@
                                 {% for role in roles %}
                                     {{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }}
                                 {% endfor %}
+                                {% if user.membership_pdf %}
+                                    <a href="/admin/user/{{ user.id }}/membership"
+                                       class="text-black dark:text-white">Beitrittserklärung herunterladen</a>
+                                {% endif %}
+                                {{ macros::input(label='Beitrittserklärung', name='membership_pdf', id=loop.index, type="file", readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob, readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight, readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex, readonly=allowed_to_edit == false) }}

From 35900f3059b3ad04e47d3a13a8dc601ea7b959b7 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 21:16:55 +0100
Subject: [PATCH 4/6] fix ci

---
 src/model/user.rs      | 10 +++-------
 src/tera/admin/user.rs |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/model/user.rs b/src/model/user.rs
index e4f7eb3..5057f23 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -1,16 +1,11 @@
-use std::{
-    fs::File,
-    io::Read,
-    ops::{Deref, DerefMut},
-};
+use std::ops::{Deref, DerefMut};
 
 use argon2::{password_hash::SaltString, Argon2, PasswordHasher};
 use chrono::{Datelike, Local, NaiveDate};
 use log::info;
 use rocket::{
     async_trait,
-    data::ToByteUnit,
-    http::{ext::IntoCollection, Cookie, Status},
+    http::{Cookie, Status},
     request::{self, FromRequest, Outcome},
     time::{Duration, OffsetDateTime},
     tokio::io::AsyncReadExt,
@@ -1069,6 +1064,7 @@ mod test {
                 phone: None,
                 address: None,
                 family_id: None,
+                membership_pdf: None,
             },
         )
         .await;
diff --git a/src/tera/admin/user.rs b/src/tera/admin/user.rs
index ea0eb56..aca09e9 100644
--- a/src/tera/admin/user.rs
+++ b/src/tera/admin/user.rs
@@ -15,7 +15,7 @@ use rocket::{
     http::{ContentType, Status},
     post,
     request::{FlashMessage, FromRequest, Outcome},
-    response::{content, Flash, Redirect},
+    response::{Flash, Redirect},
     routes, FromForm, Request, Route, State,
 };
 use rocket_dyn_templates::{tera::Context, Template};

From 868847f778d386a7cf81cb722791863bd3c2a100 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 21:40:08 +0100
Subject: [PATCH 5/6] only accept pdf

---
 templates/admin/user/index.html.tera | 2 +-
 templates/includes/macros.html.tera  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 5da8e7b..cc26f46 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -67,7 +67,7 @@
                                     <a href="/admin/user/{{ user.id }}/membership"
                                        class="text-black dark:text-white">Beitrittserklärung herunterladen</a>
                                 {% endif %}
-                                {{ macros::input(label='Beitrittserklärung', name='membership_pdf', id=loop.index, type="file", readonly=allowed_to_edit == false) }}
+                                {{ macros::input(label='Beitrittserklärung', name='membership_pdf', id=loop.index, type="file", readonly=allowed_to_edit == false, accept='application/pdf') }}
                                 {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob, readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight, readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex, readonly=allowed_to_edit == false) }}
diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index b958f4f..497b872 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -115,7 +115,7 @@
         </header>
         <div class="h-8"></div>
     {% endmacro header %}
-    {% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false) %}
+    {% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='') %}
         <div class="{{ wrapper_class }}">
             <label for="{{ name }}"
                    class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">
@@ -131,6 +131,7 @@
                    placeholder="{% if hide_label %}{{ label }}{% endif %}"
                    {% if min is defined %}min="{{ min }}"{% endif %}
                    {% if autofocus %}autofocus{% endif %}
+                   {% if accept %}accept="{{ accept }}"{% endif %}
                    {% if pattern %}pattern="{{ pattern }}"{% endif %}
                    {% if readonly %}readonly{% endif %}>
         </div>

From ac90dbedeab4309965ab8c16821d69bb8139a758 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 22:13:18 +0100
Subject: [PATCH 6/6] push

---
 templates/admin/user/index.html.tera | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index cc26f46..985ce62 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -66,8 +66,9 @@
                                 {% if user.membership_pdf %}
                                     <a href="/admin/user/{{ user.id }}/membership"
                                        class="text-black dark:text-white">Beitrittserklärung herunterladen</a>
+                                {% else %}
+                                    {{ macros::input(label='Beitrittserklärung', name='membership_pdf', id=loop.index, type="file", readonly=allowed_to_edit == false, accept='application/pdf') }}
                                 {% endif %}
-                                {{ macros::input(label='Beitrittserklärung', name='membership_pdf', id=loop.index, type="file", readonly=allowed_to_edit == false, accept='application/pdf') }}
                                 {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob, readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight, readonly=allowed_to_edit == false) }}
                                 {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex, readonly=allowed_to_edit == false) }}