Add 'accepted' field to TeamMember

src/database/models/team_item.rs

@@ -93,7 +93,7 @@ impl TeamMember {
             "
             SELECT id, user_id, role, permissions, accepted
             FROM team_members
-            WHERE (team_id = $1 AND accepted = TRUE)
+            WHERE team_id = $1
             ",
             id as TeamId,
         )

src/models/teams.rs

@@ -51,4 +51,6 @@ pub struct TeamMember {
     pub role: String,
     /// A bitset containing the user's permissions in this team
     pub permissions: Option<Permissions>,
+    /// Whether the user has joined the team or is just invited to it
+    pub accepted: bool,
 }

src/routes/teams.rs

@@ -30,6 +30,7 @@ pub async fn team_members_get(
                     user_id: data.user_id.into(),
                     role: data.role,
                     permissions: Some(data.permissions),
+                    accepted: data.accepted,
                 })
                 .collect();
 
@@ -37,14 +38,20 @@ pub async fn team_members_get(
         }
     }
 
-    let team_members: Vec<crate::models::teams::TeamMember> = members_data
-        .into_iter()
-        .map(|data| crate::models::teams::TeamMember {
-            user_id: data.user_id.into(),
-            role: data.role,
-            permissions: None,
-        })
-        .collect();
+    let mut team_members: Vec<crate::models::teams::TeamMember> = Vec::new();
+
+    for team_member in members_data {
+        if team_member.accepted {
+            team_members.push(
+                crate::models::teams::TeamMember {
+                    user_id: team_member.user_id.into(),
+                    role: team_member.role,
+                    permissions: None,
+                    accepted: team_member.accepted
+                }
+            )
+        }
+    }
 
     Ok(HttpResponse::Ok().json(team_members))
 }

src/routes/users.rs

@@ -182,6 +182,7 @@ pub async fn teams(
             } else {
                 None
             },
+            accepted: data.accepted
         })
         .collect();