Implement proration by charleslpan · Pull Request #1 · charleslpan/cal.com

charleslpan · 2026-01-17T18:54:34Z

What does this PR do?

Fixes #XXXX (GitHub issue number)
Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Visual Demo (For contributors especially)

A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).

Video Demo (if applicable):

Show screen recordings of the issue or feature.
Demonstrate how to reproduce the issue, the behavior before and after the change.

Image Demo (if applicable):

Add side-by-side screenshots of the original and updated change.
Highlight any significant change(s).

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my changes generate no new warnings

- skip sub updates monthy proration - seat change logs for new user invites - cron month key params

- Add operationId field to SeatChangeLog for idempotency (prevents duplicate seat change logs from race conditions) - Add voidInvoice method to billing service (prevents double charging on retry) - Add days_until_due for send_invoice collection method (ensures invoices have proper due dates) - Fix type error in stripe-subscription-utils (null to undefined conversion) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

…#26824) Addresses Cubic AI feedback: silent error suppression could lead to double charging if the Stripe API call fails. Now the error is logged and re-thrown so callers can handle failures appropriately. Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Co-Authored-By: sean@cal.com <Sean@brydon.io>

…sitory Co-Authored-By: sean@cal.com <Sean@brydon.io>

dastratakos

comment review

dastratakos · 2026-02-20T23:08:51Z

 import { getBillingProviderService } from "@calcom/ee/billing/di/containers/Billing";
 import { getTeamBillingServiceFactory } from "@calcom/ee/billing/di/containers/Billing";
+import { extractBillingDataFromStripeSubscription } from "@calcom/features/ee/billing/lib/stripe-subscription-utils";
 import { Plan, SubscriptionStatus } from "@calcom/features/ee/billing/repository/billing/IBillingRepository";


inline comment with markdown

Markdown comment

header 2

bold and italics

code

quote

link

numbered

list

[]

[]

[]

[]

[]

[]

bullet

list

task

list

Note
This is a note. It highlights information that users should take into account, even when skimming.

dastratakos

asdf

dastratakos · 2026-02-24T02:37:56Z

@@ -0,0 +1,131 @@
+import process from "node:process";
+import { getMonthlyProrationTasker } from "@calcom/features/ee/billing/di/tasker/MonthlyProrationTasker.container";
+import { formatMonthKey } from "@calcom/features/ee/billing/lib/month-key";


test comment

dastratakos · 2026-02-26T03:58:23Z

+  const monthKey = requestedMonthKey || defaultMonthKey;
+
+  // Validate monthKey is not in the future and is within a reasonable range (12 months)
+  if (requestedMonthKey) {


what's going on here?

dastratakos · 2026-02-26T22:08:54Z

+
+  log.info(`Scheduling monthly proration tasks for ${monthKey}`);
+
+  const teamRepository = new MonthlyProrationTeamRepository(prisma);


pending comment

pending reply

pending reply 2

dastratakos · 2026-02-26T22:25:42Z

@@ -124,7 +125,11 @@ const handler = async (data: SWHMap["invoice.paid"]["data"]) => {
    // Get the Stripe subscription object
    const stripeSubscription = await stripe.subscriptions.retrieve(paymentSubscriptionId);
    const billingService = getBillingProviderService();


pending on left

dastratakos · 2026-02-26T23:02:06Z

+  quantity: number;
+  prorationBehavior?: ProrationBehavior;
+  logger?: ISimpleLogger;
+}): Promise<void> {


dastratakos

test comment

dastratakos

test comment

dastratakos · 2026-03-02T14:43:37Z

+      subscriptionEnd,
+      subscriptionTrialEnd,
+      billingPeriod,
+      pricePerSeat,
+      paidSeats,


pending reply

dastratakos

comment

dastratakos · 2026-03-02T15:53:25Z

  linkType: hard

-"@opentelemetry/api-logs@npm:0.209.0":
-  version: 0.209.0


pending comment

pending reply

direct reply

dastratakos · 2026-03-02T15:53:38Z

  dependencies:
    "@opentelemetry/api": "npm:^1.3.0"
-  checksum: 10/bd270d8b60b2fb8124174f0ec0babe7b57eca69f58feb6f4e1394714591324939dd4049a29499f435e948011cc8e5bdc9d0da2a2a96bd8be8ee9e5a3d297dfa0
+  checksum: 10/fc9bf8693105f73162d8e6999443d5f15b2b3226f36a88815d5c5cc5a9771ecec92a808356087da062c24a4ad467891b33d8ae884fbe515cb1711bb7b192e371


pending comment to existing

dastratakos · 2026-03-03T04:58:04Z

-"@opentelemetry/api-logs@npm:0.209.0":
-  version: 0.209.0
-  resolution: "@opentelemetry/api-logs@npm:0.209.0"
+"@opentelemetry/api-logs@npm:0.210.0":


test pending reply

start review

dastratakos

review comment no inlines

dastratakos · 2026-03-06T15:54:58Z

@@ -0,0 +1,131 @@
+import process from "node:process";
+import { getMonthlyProrationTasker } from "@calcom/features/ee/billing/di/tasker/MonthlyProrationTasker.container";
+import { formatMonthKey } from "@calcom/features/ee/billing/lib/month-key";


dastratakos · 2026-03-06T15:56:56Z

+  const isEnabled = await featuresRepository.checkIfFeatureIsEnabledGlobally(
+    "monthly-proration"
+  );
+


dastratakos

pending

dastratakos · 2026-03-06T16:31:48Z

dastratakos · 2026-03-06T16:35:30Z

@@ -3000,6 +3003,7 @@ model SeatChangeLog {
  organizationBillingId String?
  organizationBilling   OrganizationBilling? @relation(fields: [organizationBillingId], references: [id])



dastratakos · 2026-03-06T16:50:47Z

+    organizationBilling: {
+      findUnique: vi.fn(),
+      update: vi.fn(),
+    },


dastratakos

approve

dastratakos

cmon

dastratakos

cmon

dastratakos

dog

dastratakos

x

dastratakos · 2026-03-06T17:32:36Z

+    } = params;
+    const monthKey = providedMonthKey || formatMonthKey(new Date());

    const { teamBillingId, organizationBillingId } = await this.repository.getTeamBillingIds(teamId);


dastratakos

a

dastratakos · 2026-03-06T18:46:27Z

@@ -3000,6 +3003,7 @@ model SeatChangeLog {
  organizationBillingId String?
  organizationBilling   OrganizationBilling? @relation(fields: [organizationBillingId], references: [id])



dastratakos

a

dastratakos

x

dastratakos · 2026-03-09T16:21:59Z

LaTeX
This sentence uses $ delimiters to show math inline: $\sqrt{3x-1}+(1+x)^2$

This sentence uses $` and `$ delimiters to show math inline: $\sqrt{3x-1}+(1+x)^2$

The Cauchy-Schwarz Inequality
$$\left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right)$$

The Cauchy-Schwarz Inequality

$$ \left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right) $$

The Cauchy-Schwarz Inequality

$$\left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right)$$

This expression uses \$ to display a dollar sign: $\sqrt{\$4}$

To split $100 in half, we calculate $100/2$

dastratakos · 2026-04-17T20:42:19Z

test

stage-review · 2026-05-11T01:48:06Z

Ready to review this PR? Stage has broken it down into 12 individual chapters for you:

	Title
1	Add idempotency key to SeatChangeLog schema
2	Extract shared billing utilities and types
3	Extend Stripe billing provider with invoice and payment APIs
4	Add idempotent upsert and member count to repositories
5	Thread operationId through seat change tracking service
6	Harden MonthlyProrationService with payment checks and failure recovery
7	Skip real-time seat updates when monthly proration is active
8	Instrument all membership entry and exit points with seat tracking
9	Wire proration into webhooks, cron, and team lifecycle APIs
10	Register proration cron in Vercel and Trigger.dev
11	Add comprehensive tests for proration and billing services
12	Other changes

_{Chapters generated by Stage for commit c9b4c77 on May 11, 2026 1:48am UTC.}

sean-brydon and others added 30 commits January 12, 2026 13:45

feat: track creation for team billing + add logging for seat tracking

efb0f8a

track payment failures and successes on proration

10e1aec

test: wip on tests for webhooks and services

2510d2e

feat: add cron job

f81e784

collect invoice automatically with payment method

7b357a7

feat: add auto charge + testing

d144c3d

fix test

2f2dbbe

Merge branch 'main' into feat/proration

81bfebb

feat: proration auto charge

fb2ba75

- skip sub updates monthy proration - seat change logs for new user invites - cron month key params

fix type error + add additional test case

6cd796b

Link proration item directly to line item

7522a81

feat: don't charge invoice + stripe incremnt for current year

4ede883

chore: cleanup utils and tidy up + refactors:

3533ee1

tasker

b3c313c

chore: Move tasker to DI

0957d03

fix type error

6132ade

feat: tasker implementation working

a5cfb71

feat: monthly-proration-taskerh

5498cff

remove cronjob from tasker implementation

f34d7a1

Merge branch 'main' into feat/monthly-proration-tasker

4aa400a

Merge branch 'feat/monthly-proration-tasker' into feat/proration

c3591ce

fix: tidy up slop

7b883f9

chore: tidy up stripe error handling

9d48c8c

feat: add scheduled trigger.dev task for monthly proration

8e43fac

Co-Authored-By: sean@cal.com <Sean@brydon.io>

refactor: use existing FeaturesRepository DI instead of separate repo…

9302f10

…sitory Co-Authored-By: sean@cal.com <Sean@brydon.io>

Merge branch 'main' into feat/proration

94e8946

fix types

b22f03b

fix tests to use

c9b4c77

dastratakos reviewed Feb 17, 2026

View reviewed changes

dastratakos reviewed Feb 20, 2026

View reviewed changes

Comment thread apps/web/app/api/cron/monthly-proration/route.ts

dastratakos reviewed Feb 20, 2026

View reviewed changes

dastratakos reviewed Feb 24, 2026

View reviewed changes

dastratakos reviewed Feb 27, 2026

View reviewed changes

Comment thread apps/web/app/api/cron/monthly-proration/route.ts

dastratakos reviewed Mar 2, 2026

View reviewed changes

dastratakos reviewed Mar 3, 2026

View reviewed changes

dastratakos reviewed Mar 6, 2026

View reviewed changes

Comment thread apps/web/app/api/cron/monthly-proration/route.ts

dastratakos reviewed Mar 6, 2026

View reviewed changes

Comment thread apps/web/app/api/cron/monthly-proration/route.ts

Comment thread apps/web/app/api/cron/monthly-proration/route.ts

Comment thread apps/web/app/api/cron/monthly-proration/route.ts