feat: add monthly proration processing#27002
Merged
sean-brydon merged 14 commits intomainfrom Jan 22, 2026
Merged
Conversation
This was referenced Jan 19, 2026
emrysal
pushed a commit
that referenced
this pull request
Jan 19, 2026
Part 1 of monthly proration feature. Adds seat change tracking infrastructure with operationId for idempotency. **Dependency chain:** - This PR (seat tracking) - PR #27002 depends on this
Add seat change logging infrastructure with operationId for idempotency. This PR adds the foundation for monthly proration billing by tracking seat additions and removals, gated behind the monthly-proration feature flag. - Add operationId field to SeatChangeLog for idempotency - Update SeatChangeLogRepository to support upsert with operationId - Add feature flag guard in SeatChangeTrackingService - Integrate seat tracking in team member invites - Integrate seat tracking in bulk user deletions - Integrate seat tracking in team service operations - Integrate seat tracking in DSYNC user creation When monthly-proration feature flag is disabled, seat logging is skipped and behavior remains unchanged. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Add monthly proration billing processing that works on top of the seat tracking infrastructure. This PR implements the core proration logic, webhook handlers, and integration with Stripe billing. - Enhance MonthlyProrationService to process seat change logs - Add payment webhook handlers (invoice.payment_succeeded, invoice.payment_failed) - Update subscription webhook to sync billing period on renewals - Update TeamBillingService to skip real-time updates when proration enabled - Enhance StripeBillingService with proration capabilities - Add Tasker enhancements for processing queues - Update team creation/upgrade routes Depends on: feat/monthly-proration-seat-tracking Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
sean-brydon
force-pushed
the
feat/monthly-proration-processing
branch
from
fb62dea to
1917746
Compare
Contributor
Devin AI is resolving merge conflictsThis PR has merge conflicts with the Devin will:
If you prefer to resolve conflicts manually, you can close the Devin session and handle it yourself. |
Resolved conflicts in: - packages/features/ee/billing/service/billingProvider/IBillingProviderService.ts - packages/features/ee/billing/service/billingProvider/StripeBillingService.ts Both branches added independent methods to the billing interface: - PR branch: voidInvoice, getPaymentIntentFailureReason, hasDefaultPaymentMethod - main branch: createSubscriptionUsageRecord All methods from both branches have been preserved. Co-Authored-By: unknown <>
…er.devin.ai/proxy/github.com/calcom/cal.com into feat/monthly-proration-processing
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
eunjae-lee
previously approved these changes
Jan 21, 2026
|
|
||
| const { billingPeriod, pricePerSeat, paidSeats } = extractBillingDataFromStripeSubscription(subscription); | ||
|
|
||
| const teamBilling = await prisma.teamBilling.findUnique({ |
Contributor
There was a problem hiding this comment.
perhaps we use a repository here?
Contributor
There was a problem hiding this comment.
I'm actually going to make this blocking since we don't need to rush this out.
joeauyeung
requested changes
Jan 21, 2026
Contributor
joeauyeung
left a comment
joeauyeung
left a comment
There was a problem hiding this comment.
Tested this out and it's working as expected.
I think we should ensure that we don't call prisma directly in any handlers so I'm making that a blocking comment before merging.
|
|
||
| const { billingPeriod, pricePerSeat, paidSeats } = extractBillingDataFromStripeSubscription(subscription); | ||
|
|
||
| const teamBilling = await prisma.teamBilling.findUnique({ |
Contributor
There was a problem hiding this comment.
I'm actually going to make this blocking since we don't need to rush this out.
joeauyeung
previously approved these changes
Jan 21, 2026
Contributor
joeauyeung
left a comment
joeauyeung
left a comment
There was a problem hiding this comment.
Chatted with @sean-brydon about some feedback on ensuring we're checking the feature flag properly at every entry point into Cal.
Great job!
joeauyeung
previously approved these changes
Jan 21, 2026
Contributor
E2E results are ready! |
sean-brydon
force-pushed
the
feat/monthly-proration-processing
branch
from
610df62 to
535775c
Compare
eunjae-lee
approved these changes
Jan 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part 2 of monthly proration feature.
Adds monthly proration billing processing that works on top of the seat tracking infrastructure.
Dependency chain:
Testing locally
--analyzecommandmonthly-prorationfeature flag