Refactor Subscription model to properly handle canceled status#1798
Closed
Diddyy wants to merge 1 commit intolaravel:16.xfrom
Closed
Refactor Subscription model to properly handle canceled status#1798Diddyy wants to merge 1 commit intolaravel:16.xfrom
Diddyy wants to merge 1 commit intolaravel:16.xfrom
Conversation
- Update canceled() to check stripe_status first (source of truth) - Refactor onTrial() and onGracePeriod() to use early returns for clarity - Align scope methods with instance methods for consistency - Add comprehensive tests for canceled status scenarios including test clock cases - Follow Laravel conventions: early returns, single responsibility, consistent formatting
Member
|
Thanks for your pull request to Laravel! Unfortunately, I'm going to delay merging this code for now. To preserve our ability to adequately maintain the framework, we need to be very careful regarding the amount of code we include. If applicable, please consider releasing your code as a package so that the community can still take advantage of your contributions! |
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
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
This pull request refines the subscription status logic to ensure that the
stripe_statusfield is treated as the source of truth when determining whether a subscription is active, canceled, or within a grace or trial period.Currently, subscriptions canceled directly via Stripe (for example, when a test clock is canceled or when a subscription is immediately canceled during a trial) may still appear as valid within the application. This happens because the
stripe_statusfield isn't consistently considered in status validation methods.Changes
canceled()— Now checksstripe_statusbefore other attributes (ends_at) for clearer intent and correctness.onTrial()/onGracePeriod()— Refactored to use early returns for readability and to align with Laravel’s style conventions.ends_atandtrial_ends_at.This change ensures that:
All existing behavior for active and scheduled-cancellation subscriptions remains unchanged.
Related Issues
#1550 #1791