Add /family/{id}/users route

geneit_backend/src/services/families_service.rs

@@ -5,6 +5,7 @@ use crate::models::{
     Family, FamilyID, FamilyMembership, Membership, NewFamily, NewMembership, UserID,
 };
 use crate::schema::{families, memberships};
+use crate::services::users_service;
 use crate::utils::string_utils::rand_str;
 use crate::utils::time_utils::time;
 use diesel::prelude::*;
@@ -88,6 +89,36 @@ pub async fn get_membership(family_id: FamilyID, user_id: UserID) -> anyhow::Res
     })
 }
 
+#[derive(serde::Serialize)]
+pub struct FamilyMember {
+    #[serde(flatten)]
+    membership: Membership,
+    user_name: String,
+    user_mail: String,
+}
+
+/// Get information about the users of a family
+pub async fn get_memberships_of_family(family_id: FamilyID) -> anyhow::Result<Vec<FamilyMember>> {
+    let memberships = db_connection::execute(|conn| {
+        memberships::table
+            .filter(memberships::dsl::family_id.eq(family_id.0))
+            .get_results::<Membership>(conn)
+    })?;
+
+    let mut out = Vec::with_capacity(memberships.len());
+
+    for m in memberships {
+        let user = users_service::get_by_id(m.user_id()).await?;
+        out.push(FamilyMember {
+            user_name: user.name,
+            user_mail: user.email,
+            membership: m,
+        })
+    }
+
+    Ok(out)
+}
+
 /// Get information about a membership of a user, joined with family information
 pub async fn get_family_membership(
     family_id: FamilyID,

geneit_backend/src/services/users_service.rs

@@ -177,7 +177,7 @@ pub async fn delete_account(user: &User) -> anyhow::Result<()> {
     login_token_service::disconnect_user_from_all_devices(user.id()).await?;
 
     db_connection::execute(|conn| {
-        diesel::delete(users::dsl::users.filter(users::dsl::id.eq(user.id))).execute(conn)?;
+        diesel::delete(users::dsl::users.filter(users::dsl::id.eq(user.id().0))).execute(conn)?;
         Ok(())
     })
 }
@@ -186,8 +186,8 @@ pub async fn delete_account(user: &User) -> anyhow::Result<()> {
 pub async fn validate_account(user: &mut User) -> anyhow::Result<()> {
     if user.time_activate > 0 {
         log::debug!(
-            "Did not activate account {} because it is already activated!",
-            user.id
+            "Did not activate account {:?} because it is already activated!",
+            user.id()
         );
         return Ok(());
     }
@@ -212,7 +212,7 @@ pub async fn validate_account(user: &mut User) -> anyhow::Result<()> {
 /// Update account information
 pub async fn update_account(user: &User) -> anyhow::Result<()> {
     db_connection::execute(|conn| {
-        diesel::update(users::dsl::users.filter(users::dsl::id.eq(user.id)))
+        diesel::update(users::dsl::users.filter(users::dsl::id.eq(user.id().0)))
             .set((
                 users::dsl::name.eq(user.name.clone()),
                 users::dsl::admin.eq(user.admin),