Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include waitlist entries w/ unknown platform when summarizing and sending invites

Browse source
This commit is contained in:
Max Brunsfeld 2022-10-14 15:20:23 -07:00
parent c21e0e916c
commit 3a4e802093
3 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/api.rs
View file

@ -1,6 +1,6 @@
use crate::{
auth,
db::{Invite, NewUserParams, ProjectId, Signup, User, UserId, WaitlistSummary},
db::{Invite, NewUserParams, ProjectId, Signup, UnsentInvite, User, UserId, WaitlistSummary},
rpc::{self, ResultExt},
AppState, Error, Result,
};
@ -471,7 +471,7 @@ pub struct GetUnsentInvitesParams {
async fn get_unsent_invites(
Query(params): Query<GetUnsentInvitesParams>,
Extension(app): Extension<Arc<AppState>>,
) -> Result<Json<Vec<Invite>>> {
) -> Result<Json<Vec<UnsentInvite>>> {
Ok(Json(app.db.get_unsent_invites(params.count).await?))
}

40
crates/collab/src/db.rs
View file

@ -45,7 +45,7 @@ pub trait Db: Send + Sync {
async fn create_signup(&self, signup: Signup) -> Result<()>;
async fn get_waitlist_summary(&self) -> Result<WaitlistSummary>;
async fn get_unsent_invites(&self, count: usize) -> Result<Vec<Invite>>;
async fn get_unsent_invites(&self, count: usize) -> Result<Vec<UnsentInvite>>;
async fn record_sent_invites(&self, invites: &[Invite]) -> Result<()>;
async fn create_user_from_invite(
&self,
@ -428,7 +428,8 @@ impl Db for PostgresDb {
COUNT(*) as count,
COALESCE(SUM(CASE WHEN platform_linux THEN 1 ELSE 0 END), 0) as linux_count,
COALESCE(SUM(CASE WHEN platform_mac THEN 1 ELSE 0 END), 0) as mac_count,
COALESCE(SUM(CASE WHEN platform_windows THEN 1 ELSE 0 END), 0) as windows_count
COALESCE(SUM(CASE WHEN platform_windows THEN 1 ELSE 0 END), 0) as windows_count,
COALESCE(SUM(CASE WHEN platform_unknown THEN 1 ELSE 0 END), 0) as unknown_count
FROM (
SELECT *
FROM signups
@ -441,21 +442,33 @@ impl Db for PostgresDb {
.await?)
}
async fn get_unsent_invites(&self, count: usize) -> Result<Vec<Invite>> {
Ok(sqlx::query_as(
async fn get_unsent_invites(&self, count: usize) -> Result<Vec<UnsentInvite>> {
let rows: Vec<(String, String, bool)> = sqlx::query_as(
"
SELECT
email_address, email_confirmation_code
email_address, email_confirmation_code, platform_unknown
FROM signups
WHERE
NOT email_confirmation_sent AND
platform_mac
(platform_mac OR platform_unknown)
LIMIT $1
",
)
.bind(count as i32)
.fetch_all(&self.pool)
.await?)
.await?;
Ok(rows
.into_iter()
.map(
|(email_address, email_confirmation_code, platform_unknown)| UnsentInvite {
invite: Invite {
email_address,
email_confirmation_code,
},
platform_unknown,
},
)
.collect())
}
async fn record_sent_invites(&self, invites: &[Invite]) -> Result<()> {
@ -1720,14 +1733,23 @@ pub struct WaitlistSummary {
pub mac_count: i64,
#[sqlx(default)]
pub windows_count: i64,
#[sqlx(default)]
pub unknown_count: i64,
}
#[derive(FromRow, PartialEq, Debug, Serialize, Deserialize)]
#[derive(Clone, FromRow, PartialEq, Debug, Serialize, Deserialize)]
pub struct Invite {
pub email_address: String,
pub email_confirmation_code: String,
}
#[derive(Serialize, Debug, PartialEq)]
pub struct UnsentInvite {
#[serde(flatten)]
pub invite: Invite,
pub platform_unknown: bool,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct NewUserParams {
pub github_login: String,
@ -1943,7 +1965,7 @@ mod test {
unimplemented!()
}
async fn get_unsent_invites(&self, _count: usize) -> Result<Vec<Invite>> {
async fn get_unsent_invites(&self, _count: usize) -> Result<Vec<UnsentInvite>> {
unimplemented!()
}

29
crates/collab/src/db_tests.rs
View file

@ -1022,6 +1022,7 @@ async fn test_signups() {
mac_count: 8,
linux_count: 4,
windows_count: 2,
unknown_count: 0,
}
);
@ -1029,7 +1030,7 @@ async fn test_signups() {
let signups_batch1 = db.get_unsent_invites(3).await.unwrap();
let addresses = signups_batch1
.iter()
.map(|s| &s.email_address)
.map(|s| &s.invite.email_address)
.collect::<Vec<_>>();
assert_eq!(
addresses,
@ -1040,8 +1041,8 @@ async fn test_signups() {
]
);
assert_ne!(
signups_batch1[0].email_confirmation_code,
signups_batch1[1].email_confirmation_code
signups_batch1[0].invite.email_confirmation_code,
signups_batch1[1].invite.email_confirmation_code
);
// the waitlist isn't updated until we record that the emails
@ -1051,11 +1052,18 @@ async fn test_signups() {
// once the emails go out, we can retrieve the next batch
// of signups.
db.record_sent_invites(&signups_batch1).await.unwrap();
db.record_sent_invites(
&signups_batch1
.iter()
.map(|i| i.invite.clone())
.collect::<Vec<_>>(),
)
.await
.unwrap();
let signups_batch2 = db.get_unsent_invites(3).await.unwrap();
let addresses = signups_batch2
.iter()
.map(|s| &s.email_address)
.map(|s| &s.invite.email_address)
.collect::<Vec<_>>();
assert_eq!(
addresses,
@ -1074,6 +1082,7 @@ async fn test_signups() {
mac_count: 5,
linux_count: 2,
windows_count: 1,
unknown_count: 0,
}
);
@ -1087,8 +1096,8 @@ async fn test_signups() {
} = db
.create_user_from_invite(
&Invite {
email_address: signups_batch1[0].email_address.clone(),
email_confirmation_code: signups_batch1[0].email_confirmation_code.clone(),
email_address: signups_batch1[0].invite.email_address.clone(),
email_confirmation_code: signups_batch1[0].invite.email_confirmation_code.clone(),
},
NewUserParams {
github_login: "person-0".into(),
@ -1108,8 +1117,8 @@ async fn test_signups() {
// cannot redeem the same signup again.
db.create_user_from_invite(
&Invite {
email_address: signups_batch1[0].email_address.clone(),
email_confirmation_code: signups_batch1[0].email_confirmation_code.clone(),
email_address: signups_batch1[0].invite.email_address.clone(),
email_confirmation_code: signups_batch1[0].invite.email_confirmation_code.clone(),
},
NewUserParams {
github_login: "some-other-github_account".into(),
@ -1123,7 +1132,7 @@ async fn test_signups() {
// cannot redeem a signup with the wrong confirmation code.
db.create_user_from_invite(
&Invite {
email_address: signups_batch1[1].email_address.clone(),
email_address: signups_batch1[1].invite.email_address.clone(),
email_confirmation_code: "the-wrong-code".to_string(),
},
NewUserParams {