fix: filter deleted booking references in EventManager methods #22934
+10
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Filter out soft-deleted booking references in updateLocation method - Apply same filtering in deleteEventsAndMeetings method - Add deleted field to PartialReference type definition - Prevents old owners from seeing calendar events after booking reassignment and location changes - Follows existing pattern from reschedule method Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com>
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing Touches🧪 Generate unit tests
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. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix: Filter deleted booking references in EventManager methods
Summary
Fixes an issue where old booking owners still see calendar events on their calendar when a reassigned booking's location is changed. The problem occurred because the EventManager's
updateLocationanddeleteEventsAndMeetingsmethods were processing all booking references without filtering out soft-deleted ones.Root Cause: When a booking is reassigned, the old booking references are soft-deleted (marked with
deleted: true) but the EventManager methods weren't filtering these out before attempting calendar operations.Solution: Added filtering logic to exclude deleted booking references before processing calendar updates, following the same pattern already established in the
reschedulemethod.Review & Testing Checklist for Human
deletedfield toPartialReferencedoesn't break other parts of the codebase that use this typereschedulemethod and is applied correctly in both modified methodsDiagram
%%{ init : { "theme" : "default" }}%% graph TD BookingReassignment["Booking Reassignment Flow"] EventManager["packages/lib/EventManager.ts"]:::major-edit TypeDef["packages/types/EventManager.d.ts"]:::major-edit RescheduleMethod["reschedule() method"]:::context UpdateLocationMethod["updateLocation() method"]:::major-edit DeleteEventsMethod["deleteEventsAndMeetings() method"]:::major-edit BookingReferences["Booking References"]:::context CalendarIntegrations["Calendar Integrations"]:::context BookingReassignment --> EventManager EventManager --> UpdateLocationMethod EventManager --> DeleteEventsMethod EventManager --> RescheduleMethod RescheduleMethod -.->|"pattern followed"| UpdateLocationMethod RescheduleMethod -.->|"pattern followed"| DeleteEventsMethod UpdateLocationMethod --> BookingReferences DeleteEventsMethod --> BookingReferences BookingReferences --> CalendarIntegrations TypeDef -.->|"type definition"| EventManager subgraph Legend L1["Major Edit"]:::major-edit L2["Minor Edit"]:::minor-edit L3["Context/No Edit"]:::context end classDef major-edit fill:#90EE90 classDef minor-edit fill:#87CEEB classDef context fill:#FFFFFFNotes
Key Changes:
activeReferencesfiltering inupdateLocation()anddeleteEventsAndMeetings()methods to exclude references wheredeleted: truedeleted?: boolean | nulltoPartialReferenceinterface to support the filtering logicTesting Limitations: Due to environment setup issues (ESLint configuration problems), I wasn't able to fully test the end-to-end flow locally. The type checking passed successfully, but comprehensive testing of the booking reassignment + location change scenario is needed.
Link to Devin run: https://app.devin.ai/sessions/b8cc831382df4e8f89ff1c8887bb4da2
Requested by: @joeauyeung