From c4556e99099f2e5f5b289d32583a748b22f13338 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 2 May 2025 11:07:49 -0400 Subject: [PATCH] collab: Fix adding users to feature flags when migrating to new billing (#29795) This PR fixes an issue where users were not being added to the feature flags when being migrated to the new billing. Release Notes: - N/A --- crates/collab/src/api/billing.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/collab/src/api/billing.rs b/crates/collab/src/api/billing.rs index 15c213c71cb0c0f44284aa39d707f443302102ee..3824e834c30422d0281d387fbde48a68b3d81821 100644 --- a/crates/collab/src/api/billing.rs +++ b/crates/collab/src/api/billing.rs @@ -673,15 +673,16 @@ async fn migrate_to_new_billing( None }; - let feature_flags = app.db.list_feature_flags().await?; + let all_feature_flags = app.db.list_feature_flags().await?; + let user_feature_flags = app.db.get_user_flags(user.id).await?; for feature_flag in ["new-billing", "assistant2"] { - let already_in_feature_flag = feature_flags.iter().any(|flag| flag.flag == feature_flag); + let already_in_feature_flag = user_feature_flags.iter().any(|flag| flag == feature_flag); if already_in_feature_flag { continue; } - let feature_flag = feature_flags + let feature_flag = all_feature_flags .iter() .find(|flag| flag.flag == feature_flag) .context("failed to find feature flag: {feature_flag:?}")?;