fix: team billing on batch operations #15570
Merged
+18
−17
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
|
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: |
dosubot
bot
added
billing
zomars
commented
Jun 25, 2024
| @@ -62,7 +63,7 @@ export async function bulkDeleteUsersHandler({ ctx, input }: BulkDeleteUsersHand | |||
| // We do this in a transaction to make sure that all memberships are removed before we remove the organization relation from the user | |||
| // We also do this to make sure that if one of the queries fail, the whole transaction fails | |||
| await prisma.$transaction([removeProfiles, deleteMany, removeOrgrelation]); | |||
|
|
|||
| await updateQuantitySubscriptionFromStripe(currentUser.organizationId); | |||
There was a problem hiding this comment.
Batch deleting didn't update Stripe subscription before.
zomars
commented
Jun 25, 2024
| @@ -151,7 +151,7 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberOptions) = | |||
| isOrg: input.isOrg, | |||
| }); | |||
| }); | |||
| sendEmails(sendVerifEmailsPromises); | |||
| await sendEmails(sendVerifEmailsPromises); | |||
There was a problem hiding this comment.
I think this was causing a race condition that caused to report a wrong membership count
zomars
commented
Jun 25, 2024
| await updateQuantitySubscriptionFromStripe(input.teamId); | ||
| } | ||
| } | ||
| await handleSubscriptionUpdates(team.parentId || input.teamId); |
zomars
changed the title
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 3 Ignored Deployments
|
emrysal
approved these changes
Jun 26, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
p6l-richard
pushed a commit
to p6l-richard/cal.com-fork
that referenced
this pull request
Jul 22, 2024
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
3 tasks
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.
What does this PR do?
A quick and dirty fix preceding a full refactor on #15366
Mandatory Tasks (DO NOT REMOVE)
How should this be tested?