Skip to content

Apply discounts to existing subscriptions #8780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
pieterbeulque wants to merge 5 commits into from
Closed

Apply discounts to existing subscriptions #8780

pieterbeulque wants to merge 5 commits into from
+201 −42

Conversation

@pieterbeulque
Copy link
Contributor

@pieterbeulque pieterbeulque commented Jan 6, 2026

Issue #8714.
Replaced #8776.

Original PR description:

The original issue was that discounts applied to existing subscriptions mid-billing-cycle were immediately considered expired and never actually applied. The root cause was that is_repetition_expired() was using the subscription start date to calculate discount expiration, which doesn't work when a discount is added after the subscription started.

The fix involved tracking when a discount is first actually applied to a billing entry. For this I added a new discount_applied_at field on the Subscription model. This field is null when a discount is added but hasn't been used yet, and gets set during cycle() when the discount is first applied to a billing entry. The is_repetition_expired() method now uses this field to determine if "once" discounts have been used up and when "repeating" discount durations should start counting. This PR also fixes subscription.amount to only reflect the discounted price after the discount is actually applied, not immediately when added mid-cycle.

@vercel
Copy link

vercel bot commented Jan 6, 2026 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for GitHub.

2 Skipped Deployments
Project Deployment Review Updated (UTC)
polar Ignored Ignored Preview Jan 8, 2026 3:30pm
polar-sandbox Ignored Ignored Preview Jan 8, 2026 3:30pm

pieterbeulque
pieterbeulque commented Jan 6, 2026
View reviewed changes
@pieterbeulque pieterbeulque mentioned this pull request Jan 6, 2026
Closed
@pieterbeulque pieterbeulque mentioned this pull request Jan 6, 2026
Open
frankie567
frankie567 approved these changes Jan 7, 2026
View reviewed changes
Copy link
Member

@frankie567 frankie567 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, makes a lot of sense :) Good to go!!

claude and others added 4 commits January 8, 2026 15:46
@claude @pieterbeulque
Fix discount expiration when applied to existing subscriptions
7b659b5 
The discount expiration logic was using subscription.started_at as the
reference point, which caused discounts applied mid-subscription to
expire immediately (since started_at could be months in the past).

This commit:
- Adds discount_applied_at field to track when a discount was first
  applied to a billing cycle
- Updates is_repetition_expired() to use discount_applied_at instead
  of subscription.started_at
- Sets discount_applied_at at checkout for non-trial subscriptions
- Sets discount_applied_at on first cycle() for mid-subscription
  discount applications
- Updates subscription.amount immediately when discount is assigned
  (already handled by existing event listener)
@claude @pieterbeulque
Add test for repeating discounts with trial periods
c194ad9 
Verifies that when a discount is applied at checkout with a trial period:
- discount_applied_at remains null during the trial
- discount_applied_at is set on the first billing cycle after trial ends
- The discount duration is counted from the first billing cycle, not trial start
@pieterbeulque
Update server/polar/models/subscription.py
07b1a56
@claude @pieterbeulque
Add data backfill for discount_applied_at
77b3c29 
Populates discount_applied_at for existing subscriptions by finding
the first order that used each subscription's current discount.
@pieterbeulque pieterbeulque force-pushed the claude/refactor-pr-changes-Am84s branch from a9dc25a to 77b3c29 Compare January 8, 2026 14:46
@github-actions
Copy link
Contributor

github-actions bot commented Jan 8, 2026 •
edited
Loading

⚠️ Migration Isolation Check Failed

This PR contains database migrations along with other code changes. To ensure safe deployments, please split this into separate PRs,
or verify that your changes will not break. Keep in mind that the API is deployed before the workers.

  1. Migration PR: Only model changes and the migration file
  2. Code PR: All other changes (can be merged after migration PR)

Files that should be in a separate PR:

  • server/polar/subscription/service.py
  • server/tests/discount/test_service.py
  • server/tests/fixtures/random_objects.py
  • server/tests/subscription/test_service.py

Why?

Migrations are deployed separately and run before code changes. Mixing them can cause deployment issues if the new code depends on the migration.

This was referenced Jan 8, 2026
Merged
Merged
@pieterbeulque
Copy link
Contributor Author

pieterbeulque commented Jan 9, 2026

Split in #8826 and #8827

@pieterbeulque pieterbeulque deleted the claude/refactor-pr-changes-Am84s branch January 9, 2026 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@frankie567 frankie567 frankie567 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pieterbeulque @frankie567 @claude