Fix subscription deletion when putting into unmanaged mode #3286
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3286 +/- ##
=======================================
Coverage 40.71% 40.71%
=======================================
Files 603 603
Lines 22546 22546
Branches 5450 5450
=======================================
Hits 9179 9179
Misses 13367 13367
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Pezmc
reviewed
Jan 3, 2024
| @@ -546,7 +546,7 @@ module.exports.init = async function (app) { | |||
| // needed by closeSubscription. This is to ensure when the | |||
| // stripe callback arrives we don't trigger a suspension of | |||
| // the team resources. | |||
| await stripe.subscriptions.del(subscription.subscription, { | |||
| await stripe.subscriptions.del(existingSubscription, { | |||
There was a problem hiding this comment.
Easy to miss, I wouldn't expect subscription.subscription to be '' but indeed I see it on line 528 above:
flowfuse/forge/ee/lib/billing/index.js
Line 528 in 9df9a6f
Pezmc
approved these changes
Jan 3, 2024
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.
Description
A regression was introduced in #3181 that meant when putting teams into unmanaged mode, we'd try to delete a subscription with an id of
''- not gonna happen.This fixes that and improves the existing unit test to ensure the delete function is called with the expected subscription id.