Preserve metrics_id from signup to user record

Max Brunsfeld created 3 years ago

Change summary

crates/collab/migrations/20220913211150_create_signups.down.sql | 2 
crates/collab/migrations/20220913211150_create_signups.up.sql   | 3 +
crates/collab/src/db.rs                                         | 9 +-
3 files changed, 10 insertions(+), 4 deletions(-)

Detailed changes

crates/collab/migrations/20220913211150_create_signups.down.sql

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

crates/collab/migrations/20220913211150_create_signups.up.sql

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

crates/collab/src/db.rs

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