From 58d8b911319f67c63ea44f473a15d27d28da7b93 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 17 Apr 2025 14:19:34 -0400 Subject: [PATCH] collab: Treat `trialing` subscriptions as `active` (#28992) This PR makes it so billing subscriptions in the `trialing` state are considered `active`. Release Notes: - N/A --- crates/collab/src/db/queries/billing_subscriptions.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crates/collab/src/db/queries/billing_subscriptions.rs b/crates/collab/src/db/queries/billing_subscriptions.rs index 0d49aa9048..1107d0753e 100644 --- a/crates/collab/src/db/queries/billing_subscriptions.rs +++ b/crates/collab/src/db/queries/billing_subscriptions.rs @@ -119,8 +119,15 @@ impl Database { .filter( Condition::all() .add( - billing_subscription::Column::StripeSubscriptionStatus - .eq(StripeSubscriptionStatus::Active), + Condition::any() + .add( + billing_subscription::Column::StripeSubscriptionStatus + .eq(StripeSubscriptionStatus::Active), + ) + .add( + billing_subscription::Column::StripeSubscriptionStatus + .eq(StripeSubscriptionStatus::Trialing), + ), ) .add(billing_subscription::Column::Kind.is_not_null()), )