Merge branch 'main' into gio/fix-archive-field-cache

codecov · Aug 11, 2023 · 1558f14 · 1558f14
2 parents 37a31fc + 3ee8958
commit 1558f14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tasks/tests/unit/test_trial_expiration_cron.py b/tasks/tests/unit/test_trial_expiration_cron.py
@@ -7,7 +7,6 @@
 from database.enums import TrialStatus
 from database.tests.factories.core import OwnerFactory
 from services.billing import BillingPlan
-from tasks.trial_expiration import TrialExpirationTask
 from tasks.trial_expiration_cron import TrialExpirationCronTask
 
 

diff --git a/tasks/trial_expiration_cron.py b/tasks/trial_expiration_cron.py
@@ -5,6 +5,7 @@
 from database.enums import TrialStatus
 from database.models.core import Owner
 from helpers.clock import get_utc_now
+from services.billing import BillingPlan
 from tasks.crontasks import CodecovCronTask
 
 log = logging.getLogger(__name__)
@@ -26,6 +27,7 @@ async def run_cron_task(self, db_session, *args, **kwargs):
         ongoing_trial_owners_that_should_be_expired = (
             db_session.query(Owner.ownerid)
             .filter(
+                Owner.plan == BillingPlan.users_trial.value,
                 Owner.trial_status == TrialStatus.ONGOING.value,
                 Owner.trial_end_date <= now,
             )