Billing - Fix

[etiennejouan]

Context : https://github.com/twentyhq/private-issues/issues/425
Try to fix twentyhq/core-team-issues#2158

[greptile-apps]

Greptile Summary

This PR fixes billing subscription cleanup during workspace deletion by ensuring subscriptions are properly canceled before deletion and using explicit type-safe checks.

Key Changes:

• Replaced truthy check with explicit isDefined() check in billing-subscription.service.ts:154 for better type safety and consistency with codebase patterns
• Added billingSubscriptionService.deleteSubscriptions() call in batchCleanOnboardingWorkspaces (cleaner.workspace-service.ts:309) to properly clean up subscriptions before deleting onboarding workspaces
• Injected BillingSubscriptionService dependency into CleanerWorkspaceService constructor (cleaner.workspace-service.ts:63)

Confidence Score: 4/5

• This PR is safe to merge with one potential concern around billing enablement checks
• The changes are focused and correct, but there's an inconsistency: batchCleanOnboardingWorkspaces unconditionally calls deleteSubscriptions without checking if billing is enabled, while workspace.service.ts checks isBillingEnabled() before calling the same method. This inconsistency should be addressed.
• Pay attention to cleaner.workspace-service.ts line 309 - verify billing enablement check is needed

Important Files Changed

Filename	Overview
packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts	Changed truthy check to explicit isDefined() check in deleteSubscriptions method for better type safety
packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts	Added billing subscription cleanup call before workspace deletion in batchCleanOnboardingWorkspaces method

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[batchCleanOnboardingWorkspaces] --> B{Find workspaces in<br/>PENDING_CREATION or<br/>ONGOING_CREATION status}
    B --> C{Workspaces found?}
    C -->|No| D[End]
    C -->|Yes| E{Dry run?}
    E -->|Yes| F[Log operation only]
    E -->|No| G[For each workspace]
    G --> H[Find user workspaces]
    H --> I[For each user workspace]
    I --> J[handleRemoveWorkspaceMember]
    J --> K{More users?}
    K -->|Yes| I
    K -->|No| L[deleteSubscriptions - NEW]
    L --> M{subscriptionToCancel<br/>isDefined?}
    M -->|Yes| N[cancelSubscription<br/>in Stripe]
    M -->|No| O[Skip Stripe cancel]
    N --> P[Delete from DB]
    O --> P
    P --> Q[Delete workspace from DB]
    Q --> R{More workspaces?}
    R -->|Yes| G
    R -->|No| S[Log completion]
    F --> D
    S --> D

Loading

_{Last reviewed commit: 5edbe9b}

[greptile-apps]

_{2 files reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile}

[github-actions]

🚀 Preview Environment Ready!

Your preview environment is available at: http://bore.pub:50929

This environment will automatically shut down when the PR is closed or after 5 hours.

[cubic-dev-ai]

No issues found across 2 files

[cubic-dev-ai]

No issues found across 2 files

[twenty-eng-sync]

Hey @etiennejouan! After you've done the QA of your Pull Request, you can mark it as done here. Thank you!