Fix: subscription logic flow

[Bran18]

Summary by Sourcery

Revamp the subscription logic flow by listing all Stripe subscriptions and filtering for active/trialing ones, transforming the response shape; update the front-end SubscriptionPage to fetch and display current subscription data; add support for optional promotion codes in subscription creation; treat coupons without discounts as a 7-day free trial

New Features:

• Allow optional promotion codes when creating a subscription

Enhancements:

• Refactor subscription API to list all Stripe subscriptions, filter for active or trialing, and return a simplified transformed payload
• Update SubscriptionPage component to fetch and render the current subscription from the backend, replacing plan-based logic across plan display, benefits, payment method, and history sections

Summary by CodeRabbit

• New Features

  • Added support for applying promotion codes during subscription checkout.
  • Enhanced coupon validation to support and display free trial periods as a special promotion type.

• Improvements

  • Subscription page now displays more accurate and detailed subscription information by fetching current subscription data directly.
  • Improved display of payment method and transaction history based on the latest subscription status.

• Bug Fixes

  • Ensured correct handling and display of active or trialing subscriptions, providing clearer subscription status to users.

[sourcery-ai]

Reviewer's Guide

This PR refactors the subscription flow by fetching and filtering active or trialing subscriptions on the backend, returning a simplified subscription object; updates the frontend to uniformly retrieve and render the new currentSubscription data; extends the payment intent API to accept promotion codes; and enhances promo validation logic to assign a default trial period for blank coupons.

File-Level Changes

Change	Details	Files
Revamp subscription retrieval and transformation in API	List all subscriptions instead of limiting to active only Filter returned subscriptions for status ‘active’ or ‘trialing’ Expand subscription and map fields into a concise response format	apps/masterbots.ai/app/api/payment/subscription/route.tsx
Align SubscriptionPage to use currentSubscription data	Introduce useAsync hook to fetch currentSubscription by user email Refactor rendering to condition on currentSubscription instead of legacy plan Update display of product name, amount, interval and status from currentSubscription Adjust card method fallback to subscriptionData and correct history link path	apps/masterbots.ai/components/routes/subscription/subscription-page.tsx
Support promotion codes in payment intent creation	Parse optional promotion_code from request payload Build subscriptionData object and conditionally include promotion_code before creation	apps/masterbots.ai/app/api/payment/intent/route.tsx
Enhance promo validation to assign default trial periods	Detect coupons without duration or discount properties Set trialPeriodDays to 7 and update discountInfo accordingly	apps/masterbots.ai/app/api/payment/validate-promo/route.ts

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
masterbots	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 8, 2025 5:07pm

[coderabbitai]

Walkthrough

This update enhances payment and subscription handling by introducing promotion code support during subscription creation, refining the logic for active subscription retrieval, and improving coupon validation to recognize free trial offers. The subscription page UI now fetches and displays current subscription data, providing a more accurate and dynamic user experience.

Changes

File(s)	Change Summary
apps/masterbots.ai/app/api/payment/intent/route.tsx	Added extraction and handling of an optional promotion_code in the POST handler; subscription creation now conditionally includes this code.
apps/masterbots.ai/app/api/payment/subscription/route.tsx	Modified PUT handler to fetch all subscriptions, filter for active/trialing ones, and return normalized subscription data instead of the raw Stripe object.
apps/masterbots.ai/app/api/payment/validate-promo/route.ts	Enhanced coupon logic to detect and handle free trial coupons, setting trial period days and updating discount info when appropriate.
apps/masterbots.ai/components/routes/subscription/subscription-page.tsx	Updated component to fetch current subscription data via a new API call and render UI based on this data, replacing or supplementing previous reliance on payment intent and plan objects.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant SubscriptionPage
    participant API
    participant Stripe

    User->>SubscriptionPage: Visit subscription page
    SubscriptionPage->>API: getUserCurrentSubscription(email)
    API->>Stripe: List subscriptions for customer
    Stripe-->>API: Return all subscriptions
    API->>SubscriptionPage: Return normalized current subscription data
    SubscriptionPage->>User: Render subscription info, payment method, history

Loading

sequenceDiagram
    participant Client
    participant PaymentIntentAPI
    participant Stripe

    Client->>PaymentIntentAPI: POST with email, planId, (optional) promotion_code
    PaymentIntentAPI->>Stripe: Create subscription (with promotion_code if provided)
    Stripe-->>PaymentIntentAPI: Return subscription details
    PaymentIntentAPI-->>Client: Respond with subscription/payment intent info

Loading

Possibly related PRs

• Fix: bug fix and improvements #523: Adds promotion code validation API and state management, closely related to the promotion code support and validation logic in this PR.
• Feat: Stripe subscription plans and promocode support #513: Introduces promotion code support and validation in subscription creation, directly connecting to this PR’s enhancements in the payment intent route.
• feat: improved subscription section #491: Modifies the same subscription page component, restructuring data fetching and UI, overlapping with this PR's updates to subscription data usage.

Suggested labels

enhancement, backend

Suggested reviewers

• AndlerRL

Poem

Hopping through code with a carrot in paw,
I nibbled some logic, found a bug with awe.
Now promo codes sparkle, and free trials bloom,
Subscriptions are clearer in every room.
Stripe and the UI, in harmony play—
Another bright patch for a bunny’s bouquet! 🥕

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/masterbots.ai/app/api/payment/intent/route.tsx

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the config "next/core-web-vitals" to extend from. Please check that the name of the config is correct.

The config "next/core-web-vitals" was referenced from the config file in "/apps/masterbots.ai/.eslintrc.json".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

apps/masterbots.ai/app/api/payment/validate-promo/route.ts

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the config "next/core-web-vitals" to extend from. Please check that the name of the config is correct.

The config "next/core-web-vitals" was referenced from the config file in "/apps/masterbots.ai/.eslintrc.json".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

apps/masterbots.ai/app/api/payment/subscription/route.tsx

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the config "next/core-web-vitals" to extend from. Please check that the name of the config is correct.

The config "next/core-web-vitals" was referenced from the config file in "/apps/masterbots.ai/.eslintrc.json".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

• 1 others

✨ Finishing Touches

• 📝 Generate Docstrings

---

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Explain this complex logic.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai explain this code block.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and explain its main purpose.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[sourcery-ai]

Hey @Bran18 - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[coderabbitai]

Actionable comments posted: 3

🧹 Nitpick comments (2)

apps/masterbots.ai/app/api/payment/validate-promo/route.ts (1)

82-82: Consider making the trial period configurable.

The trial period is hardcoded to 7 days. Consider making this configurable either through the coupon metadata or environment variables to allow for different trial periods.

-				trialPeriodDays = 7
+				trialPeriodDays = coupon.metadata?.trial_days ? parseInt(coupon.metadata.trial_days) : 7

apps/masterbots.ai/app/api/payment/subscription/route.tsx (1)

133-135: Consider pagination for customers with many subscriptions.

The current implementation fetches up to 100 subscriptions with status: 'all'. For customers with many subscriptions (though rare), this might not capture all subscriptions. Consider implementing pagination or increasing the limit if needed.

		const subscriptions = await stripe.subscriptions.list({
			customer: customer.id,
			status: 'all',
-			limit: 100,
+			limit: 100, // Consider pagination for customers with >100 subscriptions
		})

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9738735 and 7e43b95.

📒 Files selected for processing (4)

• apps/masterbots.ai/app/api/payment/intent/route.tsx (2 hunks)
• apps/masterbots.ai/app/api/payment/subscription/route.tsx (1 hunks)
• apps/masterbots.ai/app/api/payment/validate-promo/route.ts (1 hunks)
• apps/masterbots.ai/components/routes/subscription/subscription-page.tsx (7 hunks)

🧰 Additional context used

🧠 Learnings (3)

apps/masterbots.ai/app/api/payment/validate-promo/route.ts (1)

Learnt from: AndlerRL
PR: bitcashorg/masterbots#508
File: apps/masterbots.ai/lib/helpers/ai-helpers.ts:280-283
Timestamp: 2025-06-13T08:55:45.217Z
Learning: In `apps/masterbots.ai/lib/helpers/ai-helpers.ts` the `verifyDuplicateMessage` function should:
• Use `message.content` as the sole de-duplication key so provisional (no-slug) and persisted (slugged) messages merge properly.
• Return the full `message` object (not just a string key) for the continuation prompts (`CONTINUE_GENERATION_PROMPT`, `CONTINUE_GENERATION_PROMPT_2`) because their content repeats and they must remain distinct.
• No explicit `!message.content` guard is needed; `return message.content` already yields `undefined` when content is missing.

apps/masterbots.ai/app/api/payment/intent/route.tsx (2)

Learnt from: AndlerRL
PR: bitcashorg/masterbots#0
File: :0-0
Timestamp: 2024-12-10T06:48:39.192Z
Learning: Error codes in the project should follow a domain-based naming convention (e.g., 'AUTH.INVALID_CREDENTIALS', 'PAYMENT.SUBSCRIPTION_FAILED') and be defined as TypeScript string literals for type safety.

Learnt from: AndlerRL
PR: bitcashorg/masterbots#508
File: apps/masterbots.ai/lib/helpers/ai-helpers.ts:280-283
Timestamp: 2025-06-13T08:55:45.217Z
Learning: In `apps/masterbots.ai/lib/helpers/ai-helpers.ts` the `verifyDuplicateMessage` function should:
• Use `message.content` as the sole de-duplication key so provisional (no-slug) and persisted (slugged) messages merge properly.
• Return the full `message` object (not just a string key) for the continuation prompts (`CONTINUE_GENERATION_PROMPT`, `CONTINUE_GENERATION_PROMPT_2`) because their content repeats and they must remain distinct.
• No explicit `!message.content` guard is needed; `return message.content` already yields `undefined` when content is missing.

apps/masterbots.ai/components/routes/subscription/subscription-page.tsx (1)

Learnt from: Bran18
PR: bitcashorg/masterbots#376
File: apps/masterbots.ai/components/routes/chat/chat.tsx:92-102
Timestamp: 2025-02-17T16:51:19.102Z
Learning: For the Chat component in apps/masterbots.ai/components/routes/chat/chat.tsx, the developer prefers to verify potential optimizations through local testing before accepting suggestions, particularly for performance-related changes like useCallback usage in debounce implementations.

🔇 Additional comments (7)

apps/masterbots.ai/app/api/payment/intent/route.tsx (3)

16-16: LGTM: Proper handling of optional promotion_code parameter.

The destructuring correctly includes the optional promotion_code parameter from the request.

---

47-60: LGTM: Clean implementation of conditional promotion code handling.

The approach of creating a mutable subscriptionData object and conditionally adding the promotion_code is clean and maintainable. This prevents passing undefined values to the Stripe API.

---

62-62: LGTM: Proper use of constructed subscription data object.

The subscription creation now uses the properly constructed subscriptionData object, which ensures the promotion code is included when provided.

apps/masterbots.ai/app/api/payment/subscription/route.tsx (1)

137-140: LGTM: Proper filtering for active and trialing subscriptions.

The local filtering correctly identifies subscriptions that are either 'active' or 'trialing', which aligns with the business logic for determining current subscriptions.

apps/masterbots.ai/components/routes/subscription/subscription-page.tsx (3)

107-146: LGTM: Proper conditional rendering based on subscription status.

The component correctly renders different UI states based on whether the user has a current subscription or not. The fallback values for missing subscription data are appropriate.

---

189-194: LGTM: Proper fallback for payment method display.

The component correctly displays payment method information from either the card or subscriptionData.card with appropriate fallbacks.

---

244-244: Simplified URL structure for subscription details.

The removal of the paymentIntent parameter from the subscription details URL simplifies the navigation structure, which is a good improvement.

[AndlerRL]

LGTM! Thanks to sync and explain the changes 👍 going to merge this for tests! Thanks again for your efforts 🙂

We can merge this while working on the other details as requested.

[AndlerRL]

Brandon Development Support - July 2025, 1 of 2