Fix SubscriptionWebhookHandler followup issues#225
Merged
Conversation
- Replace firstOrFail() with firstOrCreate() on credit account lock: avoids ModelNotFoundException when credit account is missing (e.g. UserObserver failed); account is provisioned under the lock - Replace SQLite-specific whereRaw json_extract with portable Laravel JSON operator (metadata_json->stripe_invoice_id) and scope alreadyGrantedForInvoice by user_id - Use Plan::Free enum instead of hardcoded 'free' string in handleSubscriptionCancelled for type consistency Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are limited based on label configuration. 🏷️ Required labels (at least one) (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
Fixes 3 valid issues, skips 3 invalid/out-of-scope
Applied
firstOrFail()→firstOrCreate()on credit account lockRoot cause: if a user's
CreditAccountrow doesn't exist (e.g.UserObserverfailed at registration),firstOrFail()throwsModelNotFoundException, causing the webhook to fail and Stripe to retry indefinitely.Fix:
CreditAccount::query()->lockForUpdate()->firstOrCreate(...)— provisions the row under the lock if missing.Portable JSON operator in
alreadyGrantedForInvoice+user_idscopeRoot cause:
whereRaw("json_extract(metadata_json, '$.stripe_invoice_id') = ?", ...)is SQLite-specific syntax; breaks silently on MySQL/Postgres.Fix: replaced with Laravel's portable
->where('metadata_json->stripe_invoice_id', $invoiceId). Addeduser_idscope so the check is correctly isolated per user.'free'string →Plan::Freeenum inhandleSubscriptionCancelledRoot cause: inconsistency —
handleSubscriptionActivateduses$plan->key(string via DTO) buthandleSubscriptionCancelledhardcoded'free'. The model castsplantoPlan::class.Fix: use
Plan::Freedirectly.Skipped
->url— not valid: we never setui_mode, so Cashier always returns hosted checkout with a guaranteed->url.Test plan
composer testpasses (459 tests)composer lintpasses🤖 Generated with Claude Code
Summary by cubic
Hardens Stripe subscription webhook handling to avoid crashes and duplicate credit grants. Fixes missing credit account errors, uses a portable JSON query, and aligns plan casting.
firstOrFail()withfirstOrCreate()underlockForUpdate()to prevent failures when the account is missing.metadata_json->stripe_invoice_idand adduser_idfilter in the invoice check to avoid cross-user matches and work across DBs.Plan::Freeon cancellation instead of the'free'string for type-safe updates.Written for commit c2095fe. Summary will update on new commits.