[PM-33898] Schedule-aware storage adjustments#7350
Merged
amorask-bitwarden merged 2 commits intomainfrom Mar 31, 2026
Merged
Conversation
|
Contributor
|
New Issues (121)Checkmarx found the following issues in this Pull Request
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #7350 +/- ##
==========================================
+ Coverage 58.06% 58.11% +0.05%
==========================================
Files 2054 2054
Lines 90558 90760 +202
Branches 8050 8059 +9
==========================================
+ Hits 52579 52745 +166
- Misses 36112 36145 +33
- Partials 1867 1870 +3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
sbrown-livefront
approved these changes
Mar 30, 2026
Collaborator
sbrown-livefront
left a comment
sbrown-livefront
left a comment
There was a problem hiding this comment.
✅ Clean. Only one question
Collaborator
There was a problem hiding this comment.
⛏️ Do we need any case coverage for item price change or explicit removal?
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.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-33898
📔 Objective
When a Stripe subscription schedule is present (created by
PriceIncreaseSchedulerto defer a price migration to renewal), storage changes made throughUpdatePremiumStorageCommandorUpdateOrganizationSubscriptionCommandmust go through the schedule API rather than the subscription API directly. Otherwise, Stripe rejects the update because the schedule owns the subscription.This PR makes both commands schedule-aware:
UpdateSubscriptionScheduleAsync, preserving dates, discounts, proration behavior, and end behaviorLocal testing
Tested against Stripe test mode with test clocks:
AlwaysInvoiceproration on phase 1, discounts preserved on phase 2.CreateProrationson phase 1, manual Braintree invoice flow collected prorations correctly.2020-families-org-annually→2026-families-annually), prorations netted correctly on upcoming invoice.EndBehavior = Cancel, Stripe correctly propagatedcancel_atto the subscription, PayPal invoicing worked.