feat: Handle team subscription update events by joeauyeung · Pull Request #24390 · calcom/cal.com

joeauyeung · 2025-10-09T16:38:15Z

Stacked on #24518

What does this PR do?

Adds comprehensive Stripe webhook handling for team and organization subscription events to Cal.com. This extends the existing customer.subscription.updated webhook handler to process subscription updates for teams and organizations, while maintaining backwards compatibility with existing phone number subscription handling.

Key additions:

Modular webhook handler architecture with separate handlers for different product types
Team/organization subscription event processing via _teamAndOrgUpdateHandler.ts
Cal AI phone number subscription handling via _calAIPhoneNumberUpdateHandler.ts
New TeamSubscriptionEventHandler service class for subscription management
Billing repository methods for subscription lookup and updates
Status mapping utility between Stripe and Cal.com subscription statuses
Migration logic for existing subscriptions not yet in billing database
Comprehensive test coverage for all new components

Updates since last revision

Merged main into this branch and resolved 12 merge conflicts:

Updated webhook handlers to use DI pattern (getBillingProviderService()) instead of static methods from the deleted stripe-billing-service.ts
Preserved this branch's modular webhook handler architecture while adopting main's interface changes
Adapted to main's repository refactoring (method name changes: getBySubscriptionId → findBySubscriptionId, update → updateById)
Updated IBillingRepository interface with new fields from main (billingPeriod, pricePerSeat, paidSeats)

Visual Demo (For contributors especially)

https://www.loom.com/share/31035b700fe74f2397cdb0c96b99d425?sid=ca463f26-32ae-4d83-952c-a2506614d9e8

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?

Environment variables required:

STRIPE_TEAM_PRODUCT_ID - Stripe product ID for team subscriptions
STRIPE_ORG_PRODUCT_ID - Stripe product ID for organization subscriptions
STRIPE_CAL_AI_PHONE_NUMBER_PRODUCT_ID - Stripe product ID for Cal AI phone numbers

Database requirements:

Ensure TeamBilling and OrganizationBilling models exist in Prisma schema
Run yarn prisma generate to update TypeScript types

Testing scenarios:

New team subscription webhook: Send webhook with team product ID, verify billing record is created
Existing subscription status update: Send webhook for subscription already in database, verify status is updated
Migration scenario: Send webhook for subscription not in billing table but team exists with subscriptionId in metadata
Phone number subscription: Send webhook with phone number product ID, verify it's handled by _calAIPhoneNumberUpdateHandler
Fallback behavior: Send webhook without recognized product ID, verify appropriate handling

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have checked if my changes generate no new warnings

Human Review Checklist

Critical items to verify:

Import paths in tests: Verify TeamSubscriptionEventHandler.test.ts imports from correct path (../repository/billing/IBillingRepository vs ../repository/IBillingRepository)
DI pattern migration: Confirm all handlers use getBillingProviderService() instead of static StripeBillingService methods
Handler routing: Verify _handler.ts correctly routes to appropriate handler based on product ID
Database schema: Confirm TeamBilling and OrganizationBilling models exist in packages/prisma/schema.prisma
Environment variables: Verify all three Stripe product ID env vars are properly configured in deployment
Backwards compatibility: Verify phone number subscription handling still works when no team/org product ID is present

Link to Devin run: https://app.devin.ai/sessions/2e1197c2397b44e2b1308638447969b5
Requested by: @joeauyeung

This PR resolves the issue where Stripe webhook events for team and organization subscriptions were not being properly handled, ensuring subscription status synchronization between Stripe and Cal.com's billing system.

github-actions · 2025-10-09T16:38:26Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Handle stripe webhook events". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

coderabbitai · 2025-10-09T16:39:07Z

Walkthrough

Adds typed, lazy-loaded Stripe webhook handling and a single runtime-facing stripeWebhookHandler; introduces a customer.subscription.updated handler that dispatches per-product sub-handlers (team/org and Cal AI phone-number), plus a new TeamSubscriptionEventHandler to manage subscription migrations and updates. Billing model and repositories gain subscriptionStart, subscriptionTrialEnd, subscriptionEnd fields and new getBySubscriptionId/update methods. TeamRepository adds findBySubscriptionId. API routes and invoice/checkout handlers propagate the extra subscription date fields. New environment constants and tests for webhook flows and subscription handling are included. A Stripe status-mapping method was renamed.

Possibly related PRs

feat: Add subscription start, trial end, and dates to billing tables #24408: Adds extraction and propagation of subscriptionStart/subscriptionTrialEnd/subscriptionEnd through StripeBillingService into saveTeamBilling and DB layers (direct overlap in date fields).
feat: Cal.ai Self Serve #2 #22995: Introduces STRIPE_CAL_AI_PHONE_NUMBER_PRODUCT_ID and phone-number subscription handling and wiring (direct overlap in Cal AI phone-number product handling).
feat: Add team billing tables #24148: Modifies team/org billing persistence and checkout/create flows related to team billing records and repository usage (overlaps in billing persistence and team migration).

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title Check	✅ Passed	Title communicates the primary feature addition of handling team subscription update events, aligning with most of the webhook enhancements in this PR. It correctly identifies a central change area—subscription update handling via Stripe webhooks—and is concise and clear. Although it doesn’t mention organization subscription support, it still accurately reflects a significant part of the changeset without using vague terms.
Description Check	✅ Passed	The description provides detailed information on the scope and purpose of the changes, including environment variables, database requirements, and testing scenarios, and it directly relates to the enhancements made to Stripe webhook handling. It clearly outlines new features such as team and organization subscription processing, migration logic, and comprehensive test coverage. Therefore, it is neither off-topic nor too generic.
Docstring Coverage	✅ Passed	No functions found in the changes. Docstring coverage check skipped.

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch handle-stripe-webhook-events

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

vercel · 2025-10-09T16:39:35Z

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

2 Skipped Deployments

Project	Deployment	Preview	Comments	Updated (UTC)
cal	Ignored			Oct 15, 2025 7:48pm
cal-eu	Ignored			Oct 15, 2025 7:48pm

joeauyeung · 2025-10-15T01:36:20Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts

+  const teamOrOrgSubscriptionItem = orgSubscriptionItem || teamSubscriptionItem;
+
+  // A subscription will either have a team/org item or a cal.ai phone number item
+  const calAiPhoneNumberItem = subscription.items.data.find(


Subscriptions for cal.ai phone numbers are handled in the same webhook endpoint. So we only run cal.ai logic if the phone number product id is a part of the subscription. CC @Udit-takkar

joeauyeung · 2025-10-15T01:37:09Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts

+  const billingRepository = BillingRepositoryFactory.getRepository(isOrganization);
+  const teamRepository = new TeamRepository(prisma);
+  const teamSubscriptionEventHandler = new TeamSubscriptionEventHandler(billingRepository, teamRepository);


Initialize dependencies for TeamSubscriptionEventHandler

joeauyeung · 2025-10-15T01:37:23Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts

+  const status = StripeBillingService.mapSubscriptionStatusToCalStatus({
+    stripeStatus: subscription.status,
+    subscriptionId: subscription.id,
+  });
+
+  const { subscriptionStart, subscriptionTrialEnd, subscriptionEnd } =
+    StripeBillingService.extractSubscriptionDates(subscription);


Handle stripe specific data before passing to the service

joeauyeung · 2025-10-15T01:42:21Z

packages/features/ee/billing/repository/IBillingRepository.ts

+export type IBillingRepositoryCreateArgs = Omit<BillingRecord, "id">;
+
+export type IBillingRepositoryUpdateArgs = Omit<


Have the args extend from the BillingRecord type so it acts as the source of truth.

joeauyeung · 2025-10-15T01:44:04Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts

+    StripeBillingService.extractSubscriptionDates(subscription);
+
+  try {
+    await teamSubscriptionEventHandler.handleUpdate({


With the preprocessing in the Stripe webhook handler, the teamSubscriptionEventHandler doesn't depend on any specific data from Stripe.

joeauyeung · 2025-10-15T01:44:52Z

packages/features/ee/billing/service/TeamSubscriptionEventHandler.ts

+    }
+
+    // if (teamSubscriptionInDb && teamSubscriptionInDb.status !== subscriptionStatus) {
+    if (this.hasSubscriptionChanged({ subscription, dbSubscription: teamSubscriptionInDb })) {


Only update the subscription in the DB if any of the fields have changed from Stripe vs in the DB

joeauyeung · 2025-10-15T01:46:11Z

packages/features/ee/billing/service/TeamSubscriptionEventHandler.ts

+    const teamSubscriptionInDb = await this.billingRepository.getBySubscriptionId(subscriptionId);
+
+    // If the subscription doesn't exist in the DB, migrate it
+    if (!teamSubscriptionInDb) {


If the subscription is not in the DB then take this opportunity to migrate the subscription to the billing tables.

I think it would be a good idea to mark it in metadata that this has been migrated. This makes it convenient to check whether a particular metadata is migrated or not.

Also, It allows us to identify when the migration is fully complete and thus we can do cleanup.

joeauyeung · 2025-10-15T01:51:51Z

packages/features/ee/billing/service/TeamSubscriptionEventHandler.ts

+    subscription: TSubscriptionUpdate;
+    dbSubscription: BillingRecord;
+  }) {
+    const fieldsToCompare = ["status", "subscriptionTrialEnd", "subscriptionEnd"];


These are the only fields that should be changed for a subscription

I wonder what's the harm in checking all the fields or just updating the DB without checking if Stripe is sending updated event. This kind of whitelisting could make us out of sync with Stripe data for certain fields.

Cursor recommends allowing update for atleast subscriptionItemId also as that could change due to upgrade/downgrade.

Unable to authenticate your request. Please make sure to connect your GitHub account to Cursor. Go to Cursor

joeauyeung · 2025-10-15T01:52:18Z

packages/lib/server/repository/team.ts

    return !conflictingTeam;
  }

+  async findBySubscriptionId(subscriptionId: string) {


Used to find teams where the subscriptionId is still in the team metadata

joeauyeung · 2025-10-15T01:52:37Z

.env.example

 STRIPE_PRIVATE_KEY=
 STRIPE_CLIENT_ID=

+STRIPE_CAL_AI_PHONE_NUMBER_PRODUCT_ID=


Need this to determine if the subscription is for cal.ai phone number

github-actions · 2025-10-15T03:11:33Z

E2E results are ready!

Workflow #83564.1 latest results

joeauyeung · 2025-10-15T18:42:54Z

...ures/ee/billing/api/webhook/_customer.subscription.updated/_calAIPhoneNumberUpdateHandler.ts

Create custom product handlers for the _customer.subscription.updated event so we can lazy load the handlers similar to what we're doing in _customer.subscription.deleted

All this logic is moved out of _customer.subscription.updated handler.

@Udit-takkar moved cal.ai subscription update logic here.

joeauyeung · 2025-10-15T18:43:46Z

...ures/ee/billing/api/webhook/_customer.subscription.updated/_calAIPhoneNumberUpdateHandler.ts

+import { HttpCode } from "../../../lib/httpCode";
+import type { SWHMap } from "../../../lib/types";


Moved the types and HttpCode class out of the __handler into their own files.

joeauyeung · 2025-10-15T18:44:49Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated/_handler.ts

Main handler for the _custpmer.subscription.updated event. Moved this and all product update handlers into a separate folder.

Keeping this layer thin by moving product handlers into their own files.

joeauyeung · 2025-10-15T18:53:27Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated/_handler.ts

+
+  const results = [];
+
+  for (const item of subscription.items.data) {


There could be the possibility of a subscription containing multiple tracked products (ex. org sub item and cal ai sub item). If that happens we should handle all possibilities since they will share the same subscription status.

joeauyeung · 2025-10-15T18:53:57Z

packages/features/ee/billing/api/webhook/_customer.subscription.updated/_handler.ts

+  }
+
+  if (results.length > 0) {
+    log.warn(`Subscription ${subscription.id} contains multiple tracked products`);


Will need to add this log statement as an alert

joeauyeung · 2025-10-15T18:57:04Z

packages/features/ee/billing/api/webhook/__handler.ts

-/** Stripe Webhook Handler Mappings */
-export type SWHMap = {
-  [T in Stripe.DiscriminatedEvent as T["type"]]: {
-    [K in keyof T as Exclude<K, "type">]: T[K];
-  };
-};
-
-export type LazyModule<D> = Promise<{
-  default: (data: D) => unknown | Promise<unknown>;
-}>;
-
-type SWHandlers = {
-  [K in keyof SWHMap]?: () => LazyModule<SWHMap[K]["data"]>;
-};
-
-/** Just a shorthand for HttpError  */
-export class HttpCode extends HttpError {
-  constructor(statusCode: number, message: string) {
-    super({ statusCode, message });
-  }
-}


Abstracted these to their own files so we're not importing from the main _handler file

joeauyeung · 2025-10-15T18:58:04Z

packages/features/ee/billing/api/webhook/_invoice.paid.org.ts

+    const { subscriptionStart, subscriptionTrialEnd, subscriptionEnd } =
+      StripeBillingService.extractSubscriptionDates(stripeSubscription);


We are now always passing these dates since the type is now Date | null.

joeauyeung · 2025-10-15T18:58:37Z

packages/features/ee/billing/api/webhook/index.ts

  "payment_intent.succeeded": () => import("./_payment_intent.succeeded"),
  "customer.subscription.deleted": () => import("./_customer.subscription.deleted"),
-  "customer.subscription.updated": () => import("./_customer.subscription.updated"),
+  "customer.subscription.updated": () => import("./_customer.subscription.updated/_handler"),


We moved the main handler into it's own folder to organizer the handler for the update event and product specific handlers.

joeauyeung · 2025-10-15T18:59:21Z

packages/features/ee/billing/repository/IBillingRepository.ts

-  subscriptionTrialEnd?: Date;
-  subscriptionEnd?: Date;
-}
+export type IBillingRepositoryCreateArgs = Omit<BillingRecord, "id">;


Args are now based on the main BillingRecord type as the source of truth.

joeauyeung · 2025-10-15T18:59:59Z

packages/features/ee/billing/service/TeamSubscriptionEventHandler.ts

+    this.teamRepository = teamRepository;
+  }
+
+  async handleUpdate(subscription: Omit<IBillingRepositoryCreateArgs, "teamId" | "planName">) {


The args in this method aren't dependent on the raw data from Stripe.

joeauyeung · 2025-10-15T19:15:36Z

packages/features/ee/billing/api/webhook/_payment_intent.succeeded.ts

 // This is a placeholder to showcase adding new event handlers
 const handler = async (data: SWHMap["payment_intent.succeeded"]["data"]) => {
  const paymentIntent = data.object;
+  console.log(paymentIntent);


Need this or else eslint throws an error that paymentIntent is an unused var

But this is an unused var right? Can we just comment this line instead?

…dules (#27221) * refactor: move booking-audit client components from packages/features to apps/web/modules This is part of the larger effort to move tRPC-dependent UI components from packages/features to apps/web/modules to eliminate circular dependencies. Changes: - Move BookingHistory.tsx and BookingHistoryPage.tsx to apps/web/modules/booking-audit/components/ - Update imports in apps/web to use the new location Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move formbricks client from packages/features to apps/web/modules Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move hooks and stores from packages/features to apps/web/modules - Move useAppsData hook from packages/features/apps/hooks to apps/web/modules/apps/hooks - Move onboardingStore from packages/features/ee/organizations/lib to apps/web/modules/ee/organizations/lib - Move useWelcomeModal hook from packages/features/ee/organizations/hooks to apps/web/modules/ee/organizations/hooks - Move useAgentsData hook from packages/features/ee/workflows/hooks to apps/web/modules/ee/workflows/hooks - Update all import paths in consuming files Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move onboardingStore test file to apps/web/modules Co-Authored-By: benny@cal.com <sldisek783@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* refactor(companion): split calcom.ts into modular service files Split the monolithic 1692-line calcom.ts file into focused modules: - auth.ts: Authentication configuration and token management - bookings.ts: Booking CRUD operations and actions - conferencing.ts: Conferencing options - event-types.ts: Event type CRUD operations - private-links.ts: Private link management for event types - request.ts: Core HTTP request functionality - schedules.ts: Schedule CRUD operations - user.ts: User profile management - utils.ts: JSON parsing and payload sanitization utilities - webhooks.ts: Webhook management (global and event type specific) - index.ts: Re-exports all functions and maintains backward compatibility This improves code organization, maintainability, and makes it easier to understand and modify specific functionality. Co-Authored-By: peer@cal.com <peer@cal.com> * fix(companion): avoid logging sensitive booking response data Replace logging of full responseText (which may contain PII like attendee emails and names) with responseLength for safer debugging. Addresses Cubic AI review feedback (confidence 9/10). Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

… conflict (#27121) * fix: use createPortal for FeatureOptInBanner to avoid Intercom widget conflict Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: guard portal rendering against non-browser environments Add typeof document check before accessing document.body in createPortal to prevent SSR/test crashes when document is undefined. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

…job (#27248)

* wip flow * add tests * WIP migrateing view * push back step * fix tests and logic for adding new members to existing teams * few UI fixes * type fixes * fix nits * few UI + re-route fixes * fix teamId when migrating

…ions (#27211) Co-authored-by: peer@cal.com <peer@cal.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: pasqualevitiello <pasqualevitiello@gmail.com>

…27242) * fix: remove sticky positioning from page headers in pages using ShellMain * correct fix (mostly) * fix: disable sticky headers on routing forms and members pages Applied disableSticky={true} to remaining affected pages: - Routing Forms page - Organization Members view - Platform Members view --------- Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com>

* style(ui): improve padding for VerticalTabItem * correct fix --------- Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com>

… rate limits (#27260) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

… layout for badge spacing (#27265)

…27270) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ali@cal.com <ali@cal.com>

* fix: improve error handling in Stripe collectCard method - Add CollectCardFailure error code for better error categorization - Replace generic error with ErrorWithCode for consistent error handling - Add error mappings for common Stripe errors (customer not found, invalid API key, rate limit, etc.) - Include Stripe error message when available for better debugging - Follow the same pattern used in chargeCard method Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add CollectCardFailure to getHttpStatusCode mapping This ensures the error returns 400 instead of 500 when collectCard fails. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * docs: add comments explaining ChargeCardFailure vs CollectCardFailure Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: simplify collectCard error handling Remove complex error mapping logic per code review feedback. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * test: add CollectCardFailure to HTTP status code tests Co-Authored-By: benny@cal.com <sldisek783@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Add three new optional callbacks to CalProvider that enable users to react during the access token refresh lifecycle: - onTokenRefreshStart: Called when token refresh begins - onTokenRefreshSuccess: Called when token refresh succeeds - onTokenRefreshError: Called when token refresh fails with error message These callbacks are invoked in both token refresh locations: 1. Response interceptor (when API returns 498 status) 2. Initial access token validation The callbacks are properly passed through the component hierarchy: CalProvider -> BaseCalProvider -> useOAuthFlow hook Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>

* feat: add proration invoice and reminder email templates Add email templates for monthly proration billing notifications: - ProrationInvoiceEmail: Sent when invoice is created for additional seats - ProrationReminderEmail: Sent 7 days later if invoice remains unpaid Includes: - React email templates using V2BaseEmailHtml - BaseEmail classes for rendering - Billing email service functions - Translation keys for email content Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: use allSettled --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>

…#27289) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

@ts-expect-error

* fix: lowercase identifier values in routing form editor Co-Authored-By: peer@cal.com <peer@cal.com> * fix: remove unused @ts-expect-error directives Co-Authored-By: peer@cal.com <peer@cal.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

…release …" (#27293) This reverts commit 8848efe.

* Create `getSalesforceTokenLifetime` * When connecting salesforce, add token_lifetime * Migrate token_lifetime and refetch if token expiry doesn't match * Add tests for Salesforce token lifetime feature - Add unit tests for getSalesforceTokenLifetime function - Add integration tests for token lifecycle management in CrmService - Fix type error in CrmService.ts by extracting refreshToken variable Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * chore: re-trigger CI Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

This reverts commit 2337e56.

* feat: apply Frame component to webhooks settings page Co-Authored-By: peer@cal.com <peer@cal.com> * refactor: include header and description in Frame component Co-Authored-By: peer@cal.com <peer@cal.com> * refactor: wrap each webhook in individual FramePanel Co-Authored-By: peer@cal.com <peer@cal.com> * refactor: implement two-row badge limit with overflow tooltip for webhooks Co-Authored-By: peer@cal.com <peer@cal.com> * style: improve spacing between webhook items and header Co-Authored-By: peer@cal.com <peer@cal.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

- Resolved repository/interface refactoring conflicts (IBillingRepository, PrismaTeamBillingRepository, PrismaOrganizationBillingRepository, TeamRepository) - Updated webhook handlers to use DI pattern instead of static methods from deleted stripe-billing-service.ts - Resolved team creation route conflicts - Preserved branch's modular webhook handler architecture while adopting main's DI patterns Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com>

pull-request-size bot added the size/XL label Oct 9, 2025

keithwillcode added core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO labels Oct 9, 2025

joeauyeung changed the title ~~Handle stripe webhook events~~ feat: Handle team subscription update events Oct 9, 2025

vercel bot deployed to Preview – dev October 9, 2025 16:59 View deployment

joeauyeung changed the base branch from main to billing-table-add-dates October 10, 2025 17:59

github-actions bot added the ❗️ migrations contains migration files label Oct 10, 2025

vercel bot deployed to Preview – dev October 10, 2025 18:52 View deployment

joeauyeung mentioned this pull request Oct 10, 2025

feat: Add subscription start, trial end, and dates to billing tables #24408

Merged

3 tasks

vercel bot deployed to Preview – dev October 10, 2025 20:27 View deployment

vercel bot deployed to Preview – dev October 11, 2025 14:00 View deployment

Base automatically changed from billing-table-add-dates to main October 15, 2025 01:12

github-actions bot added the ❗️ .env changes contains changes to env variables label Oct 15, 2025

joeauyeung commented Oct 15, 2025

View reviewed changes

joeauyeung added the ready-for-e2e label Oct 15, 2025

vercel bot had a problem deploying to Preview – dev October 15, 2025 02:43 Failure

vercel bot deployed to Preview – dev October 15, 2025 03:09 View deployment

vercel bot deployed to Preview – dev October 15, 2025 03:36 View deployment

vercel bot had a problem deploying to Preview – dev October 15, 2025 16:22 Failure

joeauyeung commented Oct 15, 2025

View reviewed changes

joeauyeung marked this pull request as ready for review October 15, 2025 19:29

graphite-app bot requested review from a team October 15, 2025 19:29

dosubot bot added billing area: billing, stripe, payments, paypal, get paid teams area: teams, round robin, collective, managed event-types labels Oct 15, 2025

hbjORbj and others added 30 commits January 26, 2026 13:11

chore: use token for commit step in draft-release job (#27244)

f4ef922

chore: release v6.1.4

667e500

chore: use gh auth login with token for commit step in draft-release …

8848efe

…job (#27248)

feat: organization upgrade flow v3 (#25972)

a359f0b

* wip flow * add tests * WIP migrateing view * push back step * fix tests and logic for adding new members to existing teams * few UI fixes * type fixes * fix nits * few UI + re-route fixes * fix teamId when migrating

feat: add multi-step download app dropdown with platform-specific opt…

7dcc2fe

…ions (#27211) Co-authored-by: peer@cal.com <peer@cal.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: pasqualevitiello <pasqualevitiello@gmail.com>

chore: hide download booking button (#27255)

3e30a5c

style(ui): improve padding for VerticalTabItem (#27251)

4f2f024

* style(ui): improve padding for VerticalTabItem * correct fix --------- Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com>

fix: disable prefetch on team page event type links to prevent Google…

43d05f4

… rate limits (#27260) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

feat/add-tooltip-to-assigned-badge (#27262)

17cc935

refactor(companion): simplify context menu implementation and improve…

46d54b3

… layout for badge spacing (#27265)

fix: replace by_team_admins with by_team_admin in dynamic i18n keys (#…

c96e40b

…27270) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ali@cal.com <ali@cal.com>

chore/companion-version-upgrade-102 (#27266)

15dc8f0

fix sub-teams (#27284)

1122c11

revert: remove link cloaking restrictions (reverts #26292 and #26528) (…

e3c0e11

…#27289) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Revert "chore: use gh auth login with token for commit step in draft-…

1384076

…release …" (#27293) This reverts commit 8848efe.

chore: release v6.1.5

53a3b0c

chore: release v6.1.6

2337e56

Revert "chore: release v6.1.6"

cb7960f

This reverts commit 2337e56.

chore: add .env.production to git ignore

0bcb110

		export type IBillingRepositoryCreateArgs = Omit<BillingRecord, "id">;

		export type IBillingRepositoryUpdateArgs = Omit<

		import { HttpCode } from "../../../lib/httpCode";
		import type { SWHMap } from "../../../lib/types";


		const results = [];

		for (const item of subscription.items.data) {

		const { subscriptionStart, subscriptionTrialEnd, subscriptionEnd } =
		StripeBillingService.extractSubscriptionDates(stripeSubscription);

Comments

Conversation

joeauyeung commented Oct 9, 2025 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Stacked on #24518

What does this PR do?

Updates since last revision

Visual Demo (For contributors especially)

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Checklist

Human Review Checklist

Uh oh!

github-actions bot commented Oct 9, 2025

Uh oh!

coderabbitai bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Possibly related PRs

Pre-merge checks and finishing touches

Uh oh!

vercel bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cursor bot Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

joeauyeung commented Oct 9, 2025 •

edited by devin-ai-integration bot

Loading

coderabbitai bot commented Oct 9, 2025 •

edited

Loading

vercel bot commented Oct 9, 2025 •

edited

Loading

github-actions bot commented Oct 15, 2025 •

edited

Loading