feat: delete past bookings #19120

hp77-creator · 2025-02-05T21:07:49Z

What does this PR do?

I have added two options for the user to delete past bookings.

They can delete individual bookings like this:

Or they can delete all the bookings in one go using the main button:

Fixes [CAL-5114] Delete the booking history of past meetings #18787
Fixes CAL-5114

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?

Login with [email protected]
Go to bookings
Click on delete button

/claim #18787

vercel · 2025-02-05T21:07:54Z

@hp77-creator is attempting to deploy a commit to the cal-staging Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2025-02-05T21:08:00Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Feature delete past meeting". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

graphite-app · 2025-02-05T21:10:11Z

Graphite Automations

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

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

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

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

"Add ready-for-e2e label" took an action on this PR • (02/07/25)

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

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

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

hp77-creator · 2025-02-05T21:11:02Z

@jublevy @PeerRich please review the PR, I have added the all delete button as well for past booking, lmk if there is any changes required.

retrogtx · 2025-02-06T03:51:52Z

Hi @hp77-creator, thanks for your PR!
Can you please add a short loom video for the same? Meanwhile I will test your changes out locally :D

retrogtx

from the original issue, can you implement this?

edit: this is a separate thing, needs approval - nevermind

retrogtx · 2025-02-06T11:09:34Z

Got it running locally, the button shows up even though I have zero bookings in this account. Please make it such that it appears only if I have at least 1 booking in the past.

hp77-creator · 2025-02-06T14:16:54Z

from the original issue, can you implement this?
edit: this is a separate thing, needs approval - nevermind

Yes, I thought so too, this needs a separate development. It is not trivial as this feature.

hp77-creator · 2025-02-06T14:17:06Z

Got it running locally, the button shows up even though I have zero bookings in this account. Please make it such that it appears only if I have at least 1 booking in the past.

will do this change

hp77-creator · 2025-02-06T16:06:19Z

Screen.Recording.2025-02-06.at.9.34.55.PM.mov

@retrogtx added the change and the vid

retrogtx

this works, lgtm

github-actions · 2025-02-07T04:33:28Z

E2E results are ready!

Workflow #54223.1 latest results

keithwillcode

Only marking as requested changes to ensure this gets a review from Foundation before merge due to the high-risk nature of this. @emrysal @zomars @ThyMinimalDev @eunjae-lee

retrogtx · 2025-02-12T03:17:45Z

I was checking the vitest.workspace.ts file @retrogtx It seems the directory you mention isn't added there, are tests in those directory run? I was hoping to also run them in my system before pushing them, how can I run them locally? I checked vitess docs, I see that we trigger them using scripts in package.json only but I didn't find any script command for the directory that you mentioned. Maybe I missed something, can you help?

hey, the tests in that directory is just run. you can trigger it yourself by writing npx vitest yourfilepath/.../.. <- this helps trigger only the one test file

hp77-creator · 2025-02-12T06:26:26Z

indeed we can, I was confused because I thought this needs to go into suite as well, i will follow what you have mentioned. Thanks.

hp77-creator · 2025-02-12T14:42:17Z

@keithwillcode Thanks for the change request of adding test, It made me add check for unauthorized user, I have added tests, @retrogtx you may review, Thanks for your patience.
Here are the test results:

retrogtx · 2025-02-13T03:28:42Z

thank you for the PR @hp77-creator

since this deals with risky parts (like permanently deleting) this will take some time!

TusharBhatt1 · 2025-02-19T14:55:07Z

Thanks for the contribution , currently we going ahead with #19118

hp77-creator · 2025-02-19T15:26:22Z

Any reasons @TusharBhatt1 ?
cc: @keithwillcode

TusharBhatt1 · 2025-02-19T16:35:42Z

Any reasons @TusharBhatt1 ? cc: @keithwillcode

TBH nothing major , it's just that we had 2 PRs for the same issue , both were mergeable (though I was reviewing the other one , it LGTM)

hp77-creator · 2025-02-19T16:53:39Z

Ok @TusharBhatt1

TusharBhatt1 · 2025-03-27T05:41:28Z

packages/trpc/server/routers/viewer/bookings/delete.handler.ts

+
+  if (booking.userId !== user.id) {
+    throw new Error("Unauthorized: You don't have permission to delete this booking");
+  }


How do we handle the case where it was a team booking where Admin or Owner are only allowed for this operation

What are we expecting in that case? Are we expecting that others will be able to delete it? I have just added this functionality for users who created the booking, they can delete it.

For team booking only Admin or Owner are allowed for this operation

Ok, I will add that check

retrogtx

apart from the check that needs to be added, everything else seems well

please resolve the conflicts 🙏

hp77-creator added 3 commits February 6, 2025 02:25

Add delete one past event functionality

71c836b

Add all clear button

9557042

Add correct message

68f14a4

graphite-app bot added the community Created by Linear-GitHub Sync label Feb 5, 2025

graphite-app bot requested a review from a team February 5, 2025 21:07

algora-pbc bot added the 🙋 Bounty claim label Feb 5, 2025

algora-pbc bot mentioned this pull request Feb 5, 2025

[CAL-5114] Delete the booking history of past meetings #18787

Open

github-actions bot added ✨ feature New feature or request 💎 Bounty A bounty on Algora.io labels Feb 5, 2025

dosubot bot added the bookings area: bookings, availability, timezones, double booking label Feb 5, 2025

dosubot bot added this to the v5.0 milestone Feb 5, 2025

hp77-creator changed the title ~~Feature delete past meeting~~ feat: delete past bookings Feb 5, 2025

retrogtx requested changes Feb 6, 2025

View reviewed changes

hp77-creator added 3 commits February 6, 2025 19:55

Merge branch 'main' into feature_delete_past_meeting

eb6d356

Add logic to not show button when booking is absent

33c4e2e

Merge branch 'calcom:main' into feature_delete_past_meeting

eaa63c9

hp77-creator requested a review from retrogtx February 6, 2025 16:06

retrogtx previously approved these changes Feb 7, 2025

View reviewed changes

graphite-app bot added the ready-for-e2e label Feb 7, 2025

keithwillcode requested changes Feb 7, 2025

View reviewed changes

hp77-creator added 2 commits February 12, 2025 19:54

Merge branch 'main' into feature_delete_past_meeting

2f5f508

Add unauthorization check for delete function and test

0d8458b

hp77-creator dismissed retrogtx’s stale review via 0d8458b February 12, 2025 14:40

hp77-creator requested review from keithwillcode and retrogtx February 12, 2025 14:40

Fix type error

65b25a3

hp77-creator force-pushed the feature_delete_past_meeting branch from 8628f43 to 65b25a3 Compare February 12, 2025 16:09

Merge branch 'main' into feature_delete_past_meeting

b4eec19

CarinaWolli modified the milestones: v5.0, v5.1 Feb 17, 2025

dosubot bot modified the milestone: v5.1 Feb 17, 2025

TusharBhatt1 closed this Feb 19, 2025

dosubot bot modified the milestone: v5.1 Feb 19, 2025

dosubot bot modified the milestones: v5.1, v5.2 Mar 17, 2025

TusharBhatt1 reopened this Mar 27, 2025

TusharBhatt1 reviewed Mar 27, 2025

View reviewed changes

retrogtx reviewed Apr 1, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: delete past bookings #19120

feat: delete past bookings #19120

hp77-creator commented Feb 5, 2025

vercel bot commented Feb 5, 2025

github-actions bot commented Feb 5, 2025

graphite-app bot commented Feb 5, 2025 •

edited

Loading

hp77-creator commented Feb 5, 2025

retrogtx commented Feb 6, 2025

retrogtx left a comment •

edited

Loading

retrogtx commented Feb 6, 2025

hp77-creator commented Feb 6, 2025

hp77-creator commented Feb 6, 2025

hp77-creator commented Feb 6, 2025

retrogtx left a comment

github-actions bot commented Feb 7, 2025 •

edited

Loading

keithwillcode left a comment •

edited

Loading

retrogtx commented Feb 12, 2025

hp77-creator commented Feb 12, 2025

hp77-creator commented Feb 12, 2025

retrogtx commented Feb 13, 2025

TusharBhatt1 commented Feb 19, 2025

hp77-creator commented Feb 19, 2025 •

edited

Loading

TusharBhatt1 commented Feb 19, 2025 •

edited

Loading

hp77-creator commented Feb 19, 2025

TusharBhatt1 Mar 27, 2025 •

edited

Loading

hp77-creator Mar 27, 2025

TusharBhatt1 Mar 27, 2025

hp77-creator Mar 29, 2025

retrogtx left a comment

feat: delete past bookings #19120

Are you sure you want to change the base?

feat: delete past bookings #19120

Conversation

hp77-creator commented Feb 5, 2025

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

vercel bot commented Feb 5, 2025

github-actions bot commented Feb 5, 2025

graphite-app bot commented Feb 5, 2025 • edited Loading

Graphite Automations

hp77-creator commented Feb 5, 2025

retrogtx commented Feb 6, 2025

retrogtx left a comment • edited Loading

Choose a reason for hiding this comment

retrogtx commented Feb 6, 2025

hp77-creator commented Feb 6, 2025

hp77-creator commented Feb 6, 2025

hp77-creator commented Feb 6, 2025

retrogtx left a comment

Choose a reason for hiding this comment

github-actions bot commented Feb 7, 2025 • edited Loading

E2E results are ready!

keithwillcode left a comment • edited Loading

Choose a reason for hiding this comment

retrogtx commented Feb 12, 2025

hp77-creator commented Feb 12, 2025

hp77-creator commented Feb 12, 2025

retrogtx commented Feb 13, 2025

TusharBhatt1 commented Feb 19, 2025

hp77-creator commented Feb 19, 2025 • edited Loading

TusharBhatt1 commented Feb 19, 2025 • edited Loading

hp77-creator commented Feb 19, 2025

TusharBhatt1 Mar 27, 2025 • edited Loading

Choose a reason for hiding this comment

hp77-creator Mar 27, 2025

Choose a reason for hiding this comment

TusharBhatt1 Mar 27, 2025

Choose a reason for hiding this comment

hp77-creator Mar 29, 2025

Choose a reason for hiding this comment

retrogtx left a comment

Choose a reason for hiding this comment

graphite-app bot commented Feb 5, 2025 •

edited

Loading

retrogtx left a comment •

edited

Loading

github-actions bot commented Feb 7, 2025 •

edited

Loading

keithwillcode left a comment •

edited

Loading

hp77-creator commented Feb 19, 2025 •

edited

Loading

TusharBhatt1 commented Feb 19, 2025 •

edited

Loading

TusharBhatt1 Mar 27, 2025 •

edited

Loading