fix billing issues #11160
Merged
fix billing issues #11160
Conversation
This file contains 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
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR addresses two billing-related issues in the Twenty workspace management system:
- Moves billing subscription deletion logic to
deleteWorkspacemethod to ensure proper cleanup during both soft and hard workspace deletions - Replaces hardcoded PRO plan references with dynamic plan key retrieval for more flexible billing plan handling
Key Changes:
- Relocated subscription deletion from
deleteMetadataSchemaCacheAndUserWorkspacetodeleteWorkspaceinworkspace.service.ts - Added
getPlanKeyFromSubscriptionutility to dynamically determine billing plan inbilling-subscription.service.ts - Improved cleanup of billing resources during workspace soft-delete operations
- Removed hardcoded plan references to support Enterprise plan quantity updates
The changes make the billing system more robust by ensuring proper resource cleanup and supporting multiple plan types dynamically.
2 file(s) reviewed, no comment(s)
Edit PR Review Bot Settings | Greptile
prastoin
approved these changes
Mar 25, 2025
packages/twenty-server/src/engine/core-modules/workspace/__tests__/workspace.service.spec.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
closes twentyhq/core-team-issues#634