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

Preserve metrics_id from signup to user record

Browse source
This commit is contained in:
Max Brunsfeld 2022-09-16 15:45:10 -07:00
parent 3dd8845bd8
commit 963ced1dd8
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/migrations/20220913211150_create_signups.down.sql
View file

@ -4,3 +4,5 @@ ALTER TABLE users
DROP COLUMN metrics_id; DROP COLUMN metrics_id;
DROP SEQUENCE metrics_id_seq; DROP SEQUENCE metrics_id_seq;
DROP INDEX index_users_on_email_address;

3
crates/collab/migrations/20220913211150_create_signups.up.sql
View file

@ -25,3 +25,6 @@ CREATE INDEX "index_signups_on_email_confirmation_sent" ON "signups" ("email_con
ALTER TABLE "users" ALTER TABLE "users"
ADD "metrics_id" INTEGER DEFAULT nextval('metrics_id_seq'); ADD "metrics_id" INTEGER DEFAULT nextval('metrics_id_seq');
UPDATE users
SET metrics_id = nextval('metrics_id_seq');

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

@ -448,9 +448,9 @@ impl Db for PostgresDb {
) -> Result<(UserId, Option<UserId>)> { ) -> Result<(UserId, Option<UserId>)> {
let mut tx = self.pool.begin().await?; let mut tx = self.pool.begin().await?;
let (signup_id, inviting_user_id): (i32, Option<UserId>) = sqlx::query_as( let (signup_id, metrics_id, inviting_user_id): (i32, i32, Option<UserId>) = sqlx::query_as(
" "
SELECT id, inviting_user_id SELECT id, metrics_id, inviting_user_id
FROM signups FROM signups
WHERE WHERE
email_address = $1 AND email_address = $1 AND
@ -467,9 +467,9 @@ impl Db for PostgresDb {
let user_id: UserId = sqlx::query_scalar( let user_id: UserId = sqlx::query_scalar(
" "
INSERT INTO users INSERT INTO users
(email_address, github_login, admin, invite_count, invite_code) (email_address, github_login, admin, invite_count, invite_code, metrics_id)
VALUES VALUES
($1, $2, 'f', $3, $4) ($1, $2, 'f', $3, $4, $5)
RETURNING id RETURNING id
", ",
) )
@ -477,6 +477,7 @@ impl Db for PostgresDb {
.bind(&user.github_login) .bind(&user.github_login)
.bind(&user.invite_count) .bind(&user.invite_count)
.bind(random_invite_code()) .bind(random_invite_code())
.bind(metrics_id)
.fetch_one(&mut tx) .fetch_one(&mut tx)
.await?; .await?;