collab: Only create a Zed Free subscription if there is no other active subscription (#31023)

Marshall Bowers and Max Brunsfeld created 6 months ago

This PR makes it so we only create a Zed Free subscription if there is
no other active subscription, rather than just having another Zed Free
subscription.

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <[e-mail]>

Change summary

crates/collab/src/stripe_billing.rs | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

Detailed changes

crates/collab/src/stripe_billing.rs

@@ -320,19 +320,15 @@ impl StripeBilling {
         )
         .await?;
 
-        let existing_zed_free_subscription =
+        let existing_active_subscription =
             existing_subscriptions
                 .data
                 .into_iter()
                 .find(|subscription| {
                     subscription.status == SubscriptionStatus::Active
-                        && subscription.items.data.iter().any(|item| {
-                            item.price
-                                .as_ref()
-                                .map_or(false, |price| price.id == zed_free_price_id)
-                        })
+                        || subscription.status == SubscriptionStatus::Trialing
                 });
-        if let Some(subscription) = existing_zed_free_subscription {
+        if let Some(subscription) = existing_active_subscription {
             return Ok(subscription);
         }