Delete account join request when redeeming an invite #352

msukkari · 2025-06-13T23:49:16Z

Fixes #337

Summary by CodeRabbit

Bug Fixes
- Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

coderabbitai · 2025-06-13T23:49:22Z

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)	Change Summary
packages/web/src/actions.ts	Added logic in `redeemInvite` to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant WebApp
    participant Database

    User->>WebApp: Redeem invite
    WebApp->>Database: Create user-to-org membership
    WebApp->>Database: Update user
    WebApp->>Database: Delete invite
    WebApp->>Database: Query for matching account request
    alt Account request exists
        WebApp->>Database: Delete account request
        WebApp->>WebApp: Log info
    end
    WebApp->>Database: Increment billing seat count
    WebApp-->>User: Return result

Assessment against linked issues

Objective	Addressed	Explanation
Remove user from "Pending requests" after invite redemption (#337)	✅
Prevent duplicate membership creation and related errors after invite redemption (#337)	✅

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)

packages/web/src/actions.ts (1 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

packages/web/src/actions.ts

⏰ Context from checks skipped due to timeout of 90000ms (3)

GitHub Check: build
GitHub Check: build
GitHub Check: build

✨ Finishing Touches

📝 Generate Docstrings

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.

❤️ Share

🪧 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.

coderabbitai

Actionable comments posted: 1

🧹 Nitpick comments (1)

packages/web/src/actions.ts (1)
1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:
-const accountRequest = await tx.accountRequest.findUnique({ ... });
-
-if (accountRequest) {
-  await tx.accountRequest.delete({
-    where: { id: accountRequest.id },
-  });
-}
+await tx.accountRequest.deleteMany({
+  where: {
+    requestedById: user.id,
+    orgId: invite.orgId,
+  },
+});
This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)

packages/web/src/actions.ts (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (3)

GitHub Check: build
GitHub Check: build
GitHub Check: build

packages/web/src/actions.ts

brendan-kellam · 2025-06-14T00:24:01Z

@msukkari could you add a changelog?

delete account join request when redeeming an invite

a66abf2

msukkari requested a review from brendan-kellam June 13, 2025 23:49

coderabbitai bot reviewed Jun 13, 2025

View reviewed changes

packages/web/src/actions.ts Outdated Show resolved Hide resolved

brendan-kellam previously approved these changes Jun 14, 2025

View reviewed changes

fix account request fetch

b2a7f04

msukkari dismissed brendan-kellam’s stale review via b2a7f04 June 14, 2025 00:11

Merge branch 'main' into msukkarieh/stale_join_request

257375f

msukkari merged commit 9d86052 into main Jun 14, 2025
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Delete account join request when redeeming an invite #352

Delete account join request when redeeming an invite #352

Uh oh!

msukkari commented Jun 13, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Jun 13, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

brendan-kellam commented Jun 14, 2025

Uh oh!

Uh oh!

Delete account join request when redeeming an invite #352

Delete account join request when redeeming an invite #352

Uh oh!

Conversation

msukkari commented Jun 13, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Jun 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Assessment against linked issues

Assessment against linked issues: Out-of-scope changes

Poem

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

brendan-kellam commented Jun 14, 2025

Uh oh!

Uh oh!

msukkari commented Jun 13, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jun 13, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)