fix(team-plans): track departed member usage so value not lost#2118
Merged
icecrasher321 merged 12 commits intostagingfrom Nov 30, 2025
Merged
fix(team-plans): track departed member usage so value not lost#2118icecrasher321 merged 12 commits intostagingfrom
icecrasher321 merged 12 commits intostagingfrom
Conversation
…ndition, other improvements
|
The latest updates on your projects. Learn more about Vercel for GitHub. |
Contributor
Greptile OverviewGreptile SummaryThis PR implements tracking of departed member usage for team plans to ensure organizations are properly billed for usage incurred before members leave. Previously, when a member was removed from an organization, their Key Changes:
Confidence Score: 4/5
Important Files ChangedFile Analysis
Sequence DiagramsequenceDiagram
participant Admin as Admin/Owner
participant API as DELETE /api/organizations/[id]/members/[memberId]
participant DB as Database
participant Billing as calculateSubscriptionOverage()
participant Webhook as Invoice Webhook Handler
Note over Admin,API: Member Removal Flow
Admin->>API: DELETE request to remove member
API->>DB: Query member role
alt is owner
API-->>Admin: Error: Cannot remove owner
end
API->>DB: SELECT currentPeriodCost FROM userStats WHERE userId = memberId
DB-->>API: Return departed member's usage
alt usage > 0
API->>DB: UPDATE organization SET departedMemberUsage = departedMemberUsage + usage
DB-->>API: Usage accumulated
end
API->>DB: DELETE FROM member WHERE userId = memberId
DB-->>API: Member removed
API-->>Admin: Success response
Note over Billing,Webhook: Billing Calculation Flow
Billing->>DB: SELECT userId FROM member WHERE organizationId = orgId
DB-->>Billing: Return current members
loop For each member
Billing->>DB: Get member's currentPeriodCost
DB-->>Billing: Return usage
end
Billing->>DB: SELECT departedMemberUsage FROM organization
DB-->>Billing: Return departed member usage
Billing->>Billing: totalUsage = currentMemberUsage + departedMemberUsage
Billing->>Billing: Calculate overage = max(0, totalUsage - baseSubscriptionAmount)
Note over Webhook: End of Billing Period
Webhook->>DB: SELECT members for organization
loop For each member
Webhook->>DB: UPDATE userStats SET currentPeriodCost = '0'
end
Webhook->>DB: UPDATE organization SET departedMemberUsage = '0'
DB-->>Webhook: Usage reset for new period
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
waleedlatif1
added a commit
that referenced
this pull request
Dec 1, 2025
… sendgrid, linkedin, more tools (#2148) * feat(tools): added smtp, sendgrid, mailgun, linkedin, fixed permissions in context menu (#2133) * feat(tools): added twilio sendgrid integration * feat(tools): added smtp, sendgrid, mailgun, fixed permissions in context menu * added top level mocks for sporadically failing tests * incr type safety * fix(team-plans): track departed member usage so value not lost (#2118) * fix(team-plans): track departed member usage so value not lost * reset usage to 0 when they leave team * prep merge with stagig * regen migrations * fix org invite + ws selection' --------- Co-authored-by: Waleed <[email protected]> * feat(i18n): update translations (#2134) Co-authored-by: waleedlatif1 <[email protected]> * feat(creators): add verification for creators (#2135) * feat(tools): added apify block/tools (#2136) * feat(tools): added apify * cleanup * feat(i18n): update translations (#2137) Co-authored-by: waleedlatif1 <[email protected]> * feat(env): added more optional env var examples (#2138) * feat(statuspage): added statuspage, updated list of tools in footer, renamed routes (#2139) * feat(statuspage): added statuspage, updated list of tools in footer, renamed routes * ack PR comments * feat(tools): add generic search tool (#2140) * feat(i18n): update translations (#2141) * fix(sdks): bump sdk versions (#2142) * fix(webhooks): count test webhooks towards usage limit (#2143) * fix(bill): add requestId to webhook processing (#2144) * improvement(subflow): remove all associated edges when moving a block into a subflow (#2145) * improvement(subflow): remove all associated edges when moving a block into a subflow * ack PR comments * fix(polling): mark webhook failed on webhook trigger errors (#2146) * fix(deps): declare core transient deps explicitly (#2147) * fix(deps): declare core transient deps explicitly * ack PR comments --------- Co-authored-by: Vikhyath Mondreti <[email protected]> Co-authored-by: waleedlatif1 <[email protected]>
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
2 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.
Summary
Must track departed member usage so that is billed by the org.
Type of Change
Testing
Tested manually
Checklist