feat(payment-gated-subs): Apply activation rules on plan upgrades#5541
Merged
osmarluz merged 2 commits intoMay 27, 2026
Merged
Conversation
…ules-on-plan-upgrades
osmarluz
deleted the
feat/payment-gated-subs-3/apply-activation-rules-on-plan-upgrades
branch
May 27, 2026 07:50
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.
Context
When a plan's amount is updated and a pending upgrade subscription exists,
Plans::UpdateServiceandPlans::UpdateAmountServicetriggerSubscriptions::PlanUpgradeServiceto create a new active subscription. The activation rules attached to the pending subscription were dropped in this flow, so payment-gated upgrades silently lost their rules.Description
process_pending_subscriptionsin both services now serializes the pending subscription'sactivation_rulesinto the{type:, timeout_hours:}shape and forwards them via theparamsofSubscriptions::PlanUpgradeService, which re-applies them to the new subscription throughSubscriptions::ActivationRules::ApplyService.