Skip to content

fix: Hosts not able to cancel/reschedule the event when Disable Rescheduling/Cancelling is enabled #22281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

asadath1395
Copy link
Contributor

@asadath1395 asadath1395 commented Jul 7, 2025

What does this PR do?

Hosts not able to cancel/reschedule the event when Disable Rescheduling/Cancelling is enabled

Visual Demo (For contributors especially)

Before

https://www.loom.com/share/bf768bc270e04c48b37ec8d9379a8a0a?sid=c4fa7153-8794-47ef-8320-f42252c880b3

After

https://www.loom.com/share/5b130406f3364ec591764672e8a9660a?sid=6c02726f-84c4-4862-b08b-aed83d956c4f

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
  • I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Check the videos above

@asadath1395 asadath1395 requested a review from a team as a code owner July 7, 2025 06:03
Copy link

vercel bot commented Jul 7, 2025

@asadath1395 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

@graphite-app graphite-app bot added the community Created by Linear-GitHub Sync label Jul 7, 2025
@graphite-app graphite-app bot requested a review from a team July 7, 2025 06:03
@github-actions github-actions bot added Public 🐛 bug Something isn't working 🧹 Improvements Improvements to existing features. Mostly UX/UI labels Jul 7, 2025
@dosubot dosubot bot added the bookings area: bookings, availability, timezones, double booking label Jul 7, 2025
Copy link

graphite-app bot commented Jul 7, 2025

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (07/07/25)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add community label" took an action on this PR • (07/07/25)

1 label was added to this PR based on Keith Williams's automation.

Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cubic found 2 issues across 6 files. Review them in cubic.dev

React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.

const [user] = users.get();
await user.apiLogin();

await page.goto(`/booking/${bookingId}`);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rule violated: E2E Tests Best Practices

  Missing expect(page).toHaveURL() after navigation. According to the E2E Best Practices guideline, tests must assert the final URL immediately after page.goto to fail fast on unexpected redirects.

asadath1395 and others added 2 commits July 7, 2025 11:42
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
Copy link
Contributor

@kart1ka kart1ka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Along with the host, Team/Org Admin and Owner should also be able to reschedule or cancel the booking.

@kart1ka
Copy link
Contributor

kart1ka commented Jul 7, 2025

Hi @asadath1395, Left a comment. There is a type check failing, pls address that as well.

@kart1ka kart1ka marked this pull request as draft July 7, 2025 17:38
@asadath1395 asadath1395 marked this pull request as ready for review July 9, 2025 02:50
Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cubic found 2 issues across 9 files. Review them in cubic.dev

React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.

}
}

const isHostOrOwner = !!userIsHost || !!userIsOwnerOfEventType || !!hasTeamOrOrgPermissions;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The permission-calculation logic (userIsHost / userIsOwnerOfEventType / hasTeamOrOrgPermissions) is duplicated later in the same function, causing two additional database calls (isTeamAdmin, isOrganisationAdmin) per request. This hurts performance and maintainability; consider extracting a helper or computing once and re-using the result.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

}
}
}
const isHostOrOwner =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Authorization relies on eventData.hosts which is limited to the first 3 hosts (because of take: 3 in the Prisma query). If an event has more than three hosts, legitimate hosts outside this slice will fail the check and be redirected, effectively blocking them from rescheduling/cancelling their own event.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch, fixed it by querying it separately

Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cubic found 2 issues across 9 files. Review them in cubic.dev

React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.

@asadath1395
Copy link
Contributor Author

Along with the host, Team/Org Admin and Owner should also be able to reschedule or cancel the booking.

@kart1ka Thanks for flagging this. I have fixed it and added tests too. Please test this again and let me know if you find anything

@asadath1395 asadath1395 requested a review from kart1ka July 9, 2025 03:22
Copy link
Contributor

@kart1ka kart1ka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments. Also I have noticed that the cancel and reschedule buttons are not displayed for host, team and org admin/owners as can be seen in the image below. Pls fix that as well.

Image

if (isDisabledRescheduling) {
// Check if user is a host or owner of the event type
const userId = session?.user?.id;
const userIsHost = booking?.eventType?.hosts?.find((host) => host.user.id === userId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not make sense to let all the hosts cancel/reschedule the booking that do not belong to them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how we should check for permission:

const checkIfUserIsHost = (userId?: number | null) => {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls use the reference I have mentioned.

if (booking?.eventType?.disableRescheduling) {
// Check if user is a host or owner of the event type
const userId = session?.user?.id;
const userIsHost = booking?.eventType?.hosts?.find((host) => host.userId === userId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

Comment on lines +78 to +86
if (userId && !isHostOrOwner) {
const hostCheck = await prisma.host.findFirst({
where: {
userId,
eventTypeId: eventData.id,
},
});
isHostOrOwner = !!hostCheck;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same issue here

Comment on lines 134 to 141
const isTeamAdminResult = await isTeamAdmin(userId, booking.eventType.team.id);
if (isTeamAdminResult) {
hasTeamOrOrgPermissions = true;
} else if (booking.eventType.team.parentId) {
const isOrgAdminResult = await isOrganisationAdmin(userId, booking.eventType.team.parentId);
if (isOrgAdminResult) {
hasTeamOrOrgPermissions = true;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since, we are checking for team or org admin/owner in many place, I would prefer to abstract this check into its own function and then reuse that in all the places we are performing this check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -106,7 +108,28 @@ async function handler(input: CancelBookingInput) {
throw new HttpError({ statusCode: 400, message: "User not found" });
}

if (bookingToDelete.eventType?.disableCancelling) {
// Check if user is a host or owner of the event type
const userIsHost = bookingToDelete.eventType?.hosts?.find((host) => host.user.id === userId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same issue here as well.

@kart1ka kart1ka marked this pull request as draft July 9, 2025 04:43
@anikdhabal anikdhabal added the Medium priority Created by Linear-GitHub Sync label Jul 16, 2025
Copy link
Contributor

coderabbitai bot commented Jul 16, 2025

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

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

Support

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

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 generate unit tests to generate unit tests for 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.

Copy link
Contributor

This PR is being marked as stale due to inactivity.

@github-actions github-actions bot added the Stale label Jul 31, 2025
@kart1ka
Copy link
Contributor

kart1ka commented Aug 5, 2025

@asadath1395 Are you working on this PR?

@asadath1395
Copy link
Contributor Author

@kart1ka Yes, i have addressed most of the comments, have couple more to fix. Will find some time this week to address those.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bookings area: bookings, availability, timezones, double booking 🐛 bug Something isn't working community Created by Linear-GitHub Sync 🧹 Improvements Improvements to existing features. Mostly UX/UI Medium priority Created by Linear-GitHub Sync Public Stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disable cancellation feature disables the option for the host as well
3 participants