create member type

src/tera/admin/user.rs

@@ -7,7 +7,7 @@ use crate::{
         logbook::Logbook,
         role::Role,
         user::{
-            AdminUser, AllowedToEditPaymentStatusUser, ClubMember, ManageUserUser, User,
+            member::Member, AdminUser, AllowedToEditPaymentStatusUser, ManageUserUser, User,
             UserWithDetails, UserWithMembershipPdf, UserWithRolesAndMembershipPdf, VorstandUser,
         },
     },
@@ -125,7 +125,8 @@ async fn view(
             format!("User mit ID {} gibts ned", user),
         ));
     };
-    let clubmember = ClubMember::new(db, &user).await;
+
+    let member = Member::from(db, user.clone()).await;
 
     let user = UserWithRolesAndMembershipPdf::from_user(db, user).await;
 
@@ -141,7 +142,8 @@ async fn view(
     }
     context.insert("allowed_to_edit", &allowed_to_edit);
     context.insert("user", &user);
-    context.insert("clubmember", &clubmember);
+    context.insert("is_clubmember", &member.is_club_member());
+    context.insert("member", &member);
     context.insert("roles", &roles);
     context.insert("families", &families);
     context.insert(