Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
zomars
commented
Dec 13, 2022
Comment on lines
+9
to
+13
| const teamPaymentMetadataSchema = z.object({ | ||
| paymentId: z.string(), | ||
| subscriptionId: z.string(), | ||
| subscriptionItemId: z.string(), | ||
| }); |
Contributor
Author
There was a problem hiding this comment.
Duplicated this schema. In this context these values shouldn't be null or undefined. If they do it means the team isn't paid.
Comment on lines
+67
to
+74
| const getTeamWithPaymentMetadata = async (teamId: number) => { | ||
| const team = await prisma.team.findUniqueOrThrow({ | ||
| where: { id: teamId }, | ||
| select: { metadata: true, members: true }, | ||
| }); | ||
| const metadata = teamPaymentMetadataSchema.parse(team.metadata); | ||
| return { ...team, metadata }; | ||
| }; |
Contributor
Author
There was a problem hiding this comment.
Extracted reused logic.
Comment on lines
+88
to
+100
| export const updateQuantitySubscriptionFromStripe = async (teamId: number) => { | ||
| try { | ||
| const team = await getTeamWithPaymentMetadata(teamId); | ||
| const { subscriptionId, subscriptionItemId } = team.metadata; | ||
| await stripe.subscriptions.update(subscriptionId, { | ||
| items: [{ quantity: team.members.length, id: subscriptionItemId }], | ||
| }); | ||
| } catch (error) { | ||
| let message = "Unknown error on updateQuantitySubscriptionFromStripe"; | ||
| if (error instanceof Error) message = error.message; | ||
| console.error(message); | ||
| } | ||
| }; |
Contributor
Author
There was a problem hiding this comment.
Instead of +1 / -1 memberships we recalculate the new quantity and update the stripe subscription. This will also help as a callback if we decide to implement invites/removals in bulk.
Comment on lines
-395
to
-398
| // TODO: disable if not hosted by Cal | ||
| // @TODO: Update with new logic | ||
| // if (teamOwner) await removeSeat(teamOwner.userId, input.teamId, ctx.user.id); | ||
|
|
Contributor
Author
There was a problem hiding this comment.
We do this on invite/removal so no need to rerun on invite acceptance.
Comment on lines
+90
to
+95
| const { url } = await checkIfTeamPaymentRequired({ teamId }); | ||
| /** | ||
| * If there's no pending checkout URL it means that this team has not been paid. | ||
| * We cannot update the subscription yet, this will be handled on publish/checkout. | ||
| **/ | ||
| if (!url) return; |
Comment on lines
+98
to
+100
| await stripe.subscriptions.update(subscriptionId, { | ||
| items: [{ quantity: team.members.length, id: subscriptionItemId }], | ||
| }); |
Contributor
Author
There was a problem hiding this comment.
Instead of +1 / -1 we check the new membership count and update. This will allow to use this callback in case we want to add bulk invite/removal in the future.
JeroenReumkens
approved these changes
Dec 13, 2022
pumfleet
approved these changes
Dec 13, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
Type of change
How should this be tested?