Uh oh!
There was an error while loading. Please reload this page.
Fix free limits and email notifications for inactive users - #283
Conversation
When a user's subscription is inactive, they should be treated as a FREE plan user with all free tier limits applied and appropriate email notifications. Changes: - limit-service.ts: Use getActivePlan() for daily limit checks so inactive users get FREE plan daily limits (100/day) instead of unlimited - team-service.ts: Fix isPaidPlan flag in email notifications to check team.isActive, ensuring inactive users receive free plan messaging This ensures: 1. Inactive users have daily limits enforced (100 emails/day) 2. Inactive users receive correct email messaging (upgrade plan vs verify team) 3. All free tier limits apply when subscription is inactive 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
The latest updates on your projects. Learn more about Vercel for GitHub.
|
WalkthroughThis pull request modifies limit calculation logic across two service files. In Possibly related PRs
Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ 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 |
There was a problem hiding this comment.
Actionable comments posted: 0
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
apps/web/src/server/service/team-service.ts (1)
577-577: Fix inconsistent isPaidPlan logic.This line doesn't check
team.isActive, which is inconsistent with the updated logic in Lines 404 and 506. This will cause incorrect email content for inactive subscriptions.Apply this diff to align with the updated logic:
- const isPaidPlan = team.plan !== "FREE";+ const isPaidPlan = team.isActive && team.plan !== "FREE";
🧹 Nitpick comments (1)
apps/web/src/server/service/limit-service.ts (1)
15-17: Good helper function, but consider extracting to a shared utility.The
getActivePlanfunction correctly determines the effective plan for a team. However, this logic is duplicated inline inteam-service.ts(Lines 404 and 506). Consider extracting this to a shared utility module to ensure consistency and avoid duplication.For example, create a shared helper:
// apps/web/src/lib/utils/team-utils.tsimport{Plan}from"@prisma/client";exportfunctiongetActivePlan(team: {plan: Plan;isActive: boolean}): Plan{returnteam.isActive ? team.plan : "FREE";}Then import and use it in both
limit-service.tsandteam-service.ts.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
apps/web/src/server/service/limit-service.ts(1 hunks)apps/web/src/server/service/team-service.ts(2 hunks)
🧰 Additional context used
📓 Path-based instructions (4)
**/*.{js,jsx,ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/general.mdc)
Include all required imports, and ensure proper naming of key components.
Files:
apps/web/src/server/service/limit-service.tsapps/web/src/server/service/team-service.ts
**/*.{ts,tsx}
📄 CodeRabbit inference engine (AGENTS.md)
**/*.{ts,tsx}: TypeScript-first: use .ts/.tsx for source code (avoid JavaScript source files)
Use 2-space indentation and semicolons (Prettier 3 enforces these)
Adhere to @usesend/eslint-config; fix all ESLint warnings (CI fails on warnings)
Do not use dynamic imports; always place imports at the top of the module
Files:
apps/web/src/server/service/limit-service.tsapps/web/src/server/service/team-service.ts
**/*.{ts,tsx,md}
📄 CodeRabbit inference engine (AGENTS.md)
Format code with Prettier 3 (run pnpm format)
Files:
apps/web/src/server/service/limit-service.tsapps/web/src/server/service/team-service.ts
apps/web/**/*.{ts,tsx}
📄 CodeRabbit inference engine (AGENTS.md)
apps/web/**/*.{ts,tsx}: In apps/web, use the/ alias for src imports (e.g., import { x } from "/utils/x")
Prefer using tRPC in apps/web unless explicitly asked otherwise
Files:
apps/web/src/server/service/limit-service.tsapps/web/src/server/service/team-service.ts
🧬 Code graph analysis (1)
apps/web/src/server/service/limit-service.ts (1)
apps/web/src/lib/constants/plans.ts (1)
PLAN_LIMITS(12-36)
🔇 Additional comments (3)
apps/web/src/server/service/team-service.ts (2)
403-404: LGTM! Correct logic for inactive subscriptions.The addition of the
team.isActivecheck ensures that inactive subscriptions are correctly treated as FREE plan users, which aligns with the PR objectives.
505-506: LGTM! Consistent with maybeNotifyEmailLimitReached.The logic correctly mirrors the change in
maybeNotifyEmailLimitReached, ensuring consistent email messaging across warning and limit-reached notifications.apps/web/src/server/service/limit-service.ts (1)
139-143: LGTM! Correctly enforces FREE plan limits for inactive subscriptions.The use of
getActivePlanensures that inactive users receive the FREE plan daily limit (100 emails/day) instead of their configureddailyEmailLimit, which aligns perfectly with the PR objectives.
Uh oh!
There was an error while loading. Please reload this page.
When a user's subscription is inactive, they should be treated as a FREE plan user with all free tier limits applied and appropriate email notifications.
Changes:
This ensures:
🤖 Generated with Claude Code
Summary by cubic
Treat inactive subscriptions as FREE plan users across limits and emails. Enforces 100 emails/day and sends the correct free-plan messaging.
Summary by CodeRabbit