From 4da3005b5c67ba94409c332d0dbca25837d84bbb Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 24 Jun 2022 09:57:52 -0600
Subject: [PATCH] Allow users with no invites to be fetched from the API

---
 crates/collab/src/api.rs |  1 +
 crates/collab/src/db.rs  | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/crates/collab/src/api.rs b/crates/collab/src/api.rs
index bf35999b7fb08fa4b5f66c6db2d2baa53986710b..0c91a5a0794020ba548014a242abce4352572175 100644
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@@ -229,6 +229,7 @@ async fn create_users(
     Ok(Json(users))
 }
 
+#[derive(Debug, Deserialize)]
 struct GetUsersWithNoInvites {
     invited_by_another_user: bool,
 }
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 3224e9dbdb59044d29d6e404c9be38db181ab6ba..ce494db59bb6222b90533d0129f86c21e651e697 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -262,15 +262,17 @@ impl Db for PostgresDb {
     }
 
     async fn get_users_with_no_invites(&self, invited_by_another_user: bool) -> Result<Vec<User>> {
-        let query = "
+        let query = format!(
+            "
             SELECT users.*
             FROM users
             WHERE invite_count = 0
-            ";
-        Ok(sqlx::query_as(query)
-            .bind(&ids)
-            .fetch_all(&self.pool)
-            .await?)
+            AND inviter_id IS{} NULL
+            ",
+            if invited_by_another_user { " NOT" } else { "" }
+        );
+
+        Ok(sqlx::query_as(&query).fetch_all(&self.pool).await?)
     }
 
     async fn get_user_by_github_login(&self, github_login: &str) -> Result<Option<User>> {
@@ -2188,6 +2190,10 @@ pub mod tests {
             Ok(ids.iter().filter_map(|id| users.get(id).cloned()).collect())
         }
 
+        async fn get_users_with_no_invites(&self, _: bool) -> Result<Vec<User>> {
+            unimplemented!()
+        }
+
         async fn get_user_by_github_login(&self, github_login: &str) -> Result<Option<User>> {
             Ok(self
                 .users