collab: Fix adding users to feature flags when migrating to new billing (#29795)

Marshall Bowers created 7 months ago

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

Change summary

crates/collab/src/api/billing.rs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Detailed changes

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:?}")?;