diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs index a3eceb472cbb6c7d9686b520f0a5f3f13fa4dd90..0c753e30d4d98b3677bd7a0543b9463f994fe3aa 100644 --- a/crates/collab/src/db.rs +++ b/crates/collab/src/db.rs @@ -385,7 +385,6 @@ pub struct NewUserParams { #[derive(Debug)] pub struct NewUserResult { pub user_id: UserId, - pub metrics_id: String, pub inviting_user_id: Option, pub signup_device_id: Option, } diff --git a/crates/collab/src/db/queries/users.rs b/crates/collab/src/db/queries/users.rs index 2e04e27fdcbe3ae507a58c06acd8db2f79507eb1..acd7bdf558d256ee15d4b943b14ef1b4b156f756 100644 --- a/crates/collab/src/db/queries/users.rs +++ b/crates/collab/src/db/queries/users.rs @@ -1,4 +1,3 @@ -use anyhow::Context as _; use chrono::NaiveDateTime; use super::*; @@ -20,7 +19,6 @@ impl Database { github_login: ActiveValue::set(params.github_login.clone()), github_user_id: ActiveValue::set(params.github_user_id), admin: ActiveValue::set(admin), - metrics_id: ActiveValue::set(Uuid::new_v4()), ..Default::default() }) .on_conflict( @@ -37,7 +35,6 @@ impl Database { Ok(NewUserResult { user_id: user.id, - metrics_id: user.metrics_id.to_string(), signup_device_id: None, inviting_user_id: None, }) @@ -136,7 +133,6 @@ impl Database { github_user_id: ActiveValue::set(github_user_id), github_user_created_at: ActiveValue::set(Some(github_user_created_at)), admin: ActiveValue::set(false), - metrics_id: ActiveValue::set(Uuid::new_v4()), ..Default::default() }) .exec_with_returning(tx) @@ -198,26 +194,6 @@ impl Database { .await } - /// Returns the metrics id for the user. - pub async fn get_user_metrics_id(&self, id: UserId) -> Result { - #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] - enum QueryAs { - MetricsId, - } - - self.transaction(|tx| async move { - let metrics_id: Uuid = user::Entity::find_by_id(id) - .select_only() - .column(user::Column::MetricsId) - .into_values::<_, QueryAs>() - .one(&*tx) - .await? - .context("could not find user")?; - Ok(metrics_id.to_string()) - }) - .await - } - /// Sets "connected_once" on the user for analytics. pub async fn set_user_connected_once(&self, id: UserId, connected_once: bool) -> Result<()> { self.transaction(|tx| async move { diff --git a/crates/collab/src/db/tables/user.rs b/crates/collab/src/db/tables/user.rs index 6807ad4cf1597ad525954e111eae22cd55261ab1..1a5ddac8b7a4319b6f9c67b5ea119ab4a10b7073 100644 --- a/crates/collab/src/db/tables/user.rs +++ b/crates/collab/src/db/tables/user.rs @@ -16,7 +16,6 @@ pub struct Model { pub name: Option, pub admin: bool, pub connected_once: bool, - pub metrics_id: Uuid, pub created_at: NaiveDateTime, } diff --git a/crates/collab/src/db/tests/db_tests.rs b/crates/collab/src/db/tests/db_tests.rs index 2f0bda1cc6e5b69c115d217a46a4061c328a784f..17a2edfa509779ff6bd309cafd86dce17f0c3734 100644 --- a/crates/collab/src/db/tests/db_tests.rs +++ b/crates/collab/src/db/tests/db_tests.rs @@ -12,7 +12,6 @@ test_both_dbs!( async fn test_get_users(db: &Arc) { let mut user_ids = Vec::new(); - let mut user_metric_ids = Vec::new(); for i in 1..=4 { let user = db .create_user( @@ -27,7 +26,6 @@ async fn test_get_users(db: &Arc) { .await .unwrap(); user_ids.push(user.user_id); - user_metric_ids.push(user.metrics_id); } assert_eq!(