fix: Return empty available days if error querying calendar #22828

joeauyeung · 2025-07-30T21:42:02Z

What does this PR do?

If there is an error reading a calendar, instead of returning an empty array for busy times, we return an empty array for available days
Fixes #XXXX (GitHub issue number)
Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Visual Demo (For contributors especially)

A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).

Video Demo (if applicable):

Show screen recordings of the issue or feature.
Demonstrate how to reproduce the issue, the behavior before and after the change.

Image Demo (if applicable):

Add side-by-side screenshots of the original and updated change.
Highlight any significant change(s).

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?

Connect a calendar
Have the calendar error out
The slots showing should be 0 instead of all slots

coderabbitai · 2025-07-30T21:42:10Z

Walkthrough

The changes introduce a new standardized response format for the getBusyCalendarTimes function, which now returns an object containing a success flag and a data array, instead of returning the array directly. This modification is reflected across all relevant code paths and test files. All consumers of this function, including utility modules, server handlers, and tests, have been updated to handle the new response structure by checking the success property and extracting the data field. Additional error handling has been implemented in several locations to ensure that failures in fetching busy times are caught and handled appropriately, either by throwing errors or returning safe default values.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Complexity: Moderate. The changes span multiple files and layers (library, server, TRPC handlers, and tests), introducing a new response structure and requiring updates to all consumers. The logic is straightforward but requires careful review to ensure consistency and correct error handling throughout the codebase.

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.

📜 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 59e1276 and 4cef0e9.

📒 Files selected for processing (1)

packages/lib/CalendarManager.ts (2 hunks)

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

packages/lib/CalendarManager.ts

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)

GitHub Check: Install dependencies / Yarn install & cache

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch calendar-error-fix-busy-times

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

vercel · 2025-07-30T21:53:14Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)			Jul 31, 2025 0:50am
cal-eu	⬜️ Ignored (Inspect)			Jul 31, 2025 0:50am

joeauyeung · 2025-07-30T21:43:40Z

packages/lib/CalendarManager.ts

@@ -245,12 +245,11 @@ export const getBusyCalendarTimes = async (
  }

  // const months = getMonths(dateFrom, dateTo);
+  // Subtract 11 hours from the start date to avoid problems in UTC- time zones.


Move the startDate and endDate out of the try block so it can be accessed inside of the catch block

joeauyeung · 2025-07-30T21:44:00Z

packages/lib/CalendarManager.ts

@@ -277,9 +276,10 @@ export const getBusyCalendarTimes = async (
      );
    }
  } catch (e) {
-    log.warn(safeStringify(e));
+    log.warn("Error getting busy calendar times", safeStringify(e));


Better logging found in #22824

joeauyeung · 2025-07-30T21:44:21Z

packages/lib/CalendarManager.ts

@@ -277,9 +276,10 @@ export const getBusyCalendarTimes = async (
      );
    }
  } catch (e) {
-    log.warn(safeStringify(e));
+    log.warn("Error getting busy calendar times", safeStringify(e));
+    return { success: false, data: [{ start: startDate, stop: endDate, source: "error-placeholder" }] };


We now add a success prop to the returned object.

joeauyeung · 2025-07-30T21:44:49Z

packages/lib/getBusyTimes.ts

      credentials,
      startTime,
      endTime,
      selectedCalendars,
      shouldServeCache
    );
+
+    if (!calendarBusyTimesQuery.success) {


We throw an error when failing to get the calendar event times because it's not a true representation of a user's busy times.

joeauyeung · 2025-07-30T21:45:24Z

packages/lib/getUserAvailability.ts

+    return {
+      busy: [],
+      timeZone,
+      dateRanges: [],


If there is an error getting busy times, then return an array with no available days.

graphite-app · 2025-07-30T23:55:11Z

Graphite Automations

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

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

emrysal

lgtm! - this is an excellent start, let's do this; prevent bookings from being made when gcal throws errors and iterate.

github-actions · 2025-07-31T00:46:38Z

E2E results are ready!

Workflow #70051.1 latest results

emrysal

🚀 Let's merge! 🚀

* Return a busy block placeholder if calendar throws an error * Refactor `getCalendarsEvents` to return an object with a success prop * Throw error in `getBusyTimes` if failed to fetch calendar availability * Return empty available days if error getting busy times * yeet. * Type fix * Fix type error in getLuckyUsers * Type fixes * Type fix * Type fix * Fix test * Fix test mocks * Refactor calendars.service to use new calendarBusyTimesQuery --------- Co-authored-by: Alex van Andel <me@alexvanandel.com>

* fix: resolve username constraint violation in removeMember - Update username to - format when removing users from organizations - Fix unique constraint violation on (username, organizationId) when organizationId is null - Add test case to verify username format change and successful removal - Fix skipped test by adding proper imports and removing describe.skip Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * test: update removeMember test to verify constraint violation scenario - Create two users with same username (one with null orgId, one with orgId) - Verify removing org user updates username without unique constraint error - Test ensures username gets updated to - format Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * test: add comprehensive unit tests for handleInstantMeeting - Revert previous removeMember changes - Add full test coverage for instant meeting functionality - Test team validation, booking creation, token generation - Test webhook triggers and browser notifications - Mock external dependencies for isolated unit tests - Translation issue to be addressed in future iteration Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * update * Update handleInstantMeeting.test.ts * fix: redir parameter for connect atoms (#22815) * encode redirect url to make sure it has all parameters * add changesets * feat: Support an array response for a field when used as `Value of Field` (#22740) * Passing tests and fixed * self review addressed adn more tests * fix: flaky e2e (#22819) * fix: merge working hours when adjacent (#21912) * fix: Adjacency issue when working hours connect over multiple days * Add tests to validate the new merging of day end logic * Update to correct annotation. Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * Implement subsequent date ranges for date overrides also * The map needs to be updated on successful resolve. * test: add failing test for overlapping ranges with same end time Demonstrates bug where overlapping working hour ranges (6:00-10:00 and 8:00-10:00) lose the earlier portion (6:00-8:00), showing only 8:00 and 9:00 slots instead of all 4 slots (6:00, 7:00, 8:00, 9:00). Related to Carina's comment on PR #21912. Co-Authored-By: alex@cal.com <me@alexvanandel.com> * fix: properly merge overlapping ranges with same end time Fixes bug where overlapping working hour ranges with the same end time (e.g., 6:00-10:00 and 8:00-10:00) would lose the earlier portion of the first range. The merging logic now correctly preserves the earliest start time when ranges overlap and share the same end time. This ensures all expected time slots are available (6:00, 7:00, 8:00, 9:00) instead of losing the earlier slots (6:00, 7:00). Resolves the issue identified in Carina's comment on PR #21912. Co-Authored-By: alex@cal.com <me@alexvanandel.com> * perf: optimize overlapping range detection from O(n²) to O(n) Replaces Object.keys().find() with Map-based lookup for ranges with same end time. This optimization handles 2000+ date ranges efficiently, reducing complexity from 4M operations to linear time while maintaining the same merging behavior. Performance improvement for high-volume event types with many availability ranges. Co-Authored-By: alex@cal.com <me@alexvanandel.com> --------- Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: Improving Booking Visibility at Month-End (#22770) * remove first weeks and add last * fix added last week * prefetch availability of next month * don't switch month * On hover show month * only show new UI in monthly view * show month tooldtip only when needed * show month on first day of month * remove isFirstDayOfNextMonth * fix prefetching next month * fix datePicker tests * preventMonthSwitching in monthly view * add tests * code clean up * code clean up * code clena up for ooo days * push first day of month * remove bg color for the month badge * fix text colour * remove not needed * use object param * revert: use object param * use object param * fix DatePicker tests --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Sean Brydon <sean@cal.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> * chore: Refactor logs (#22824) * Refactor logs * Add specific info to log * fix: Errors in org onboarding in some edge cases (#22711) * Automatically enable migration of a team that conflicts with Orgs slug * Allow changing the orgs slug and name if user goes back and changes it * avoid crashing on some scenarios * Revert "Allow changing the orgs slug and name if user goes back and changes it" This reverts commit f8872b0. * fix: handle unpublished teams gracefully in org migration - Change 'No oldSlug for team' from error to warning for unpublished teams - Keep 'No slug for team' as error since org onboarding ensures teams have names - Add test for migrating unpublished teams without oldSlug - Add clarifying comments about when each condition can occur * feat: enable PBAC checking on organization settings page (#22467) * refactor: convert checkBookingLimits to class service with dependency injection (#22768) * refactor: convert checkBookingLimits to class service with dependency injection - Create CheckBookingLimitsService class following AvailableSlotsService pattern - Add countBookingsByEventTypeAndDateRange method to BookingRepository - Move direct prisma calls from service to repository layer - Implement dependency injection with proper DI tokens and modules - Update all usage points to use the new service through DI - Maintain backward compatibility with error-throwing wrapper functions - Update tests to use the new service pattern - Resolve TODO comment in AvailableSlotsService for DI integration Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: DI CheckBookingLimitsService in v2 slots service * chore: bump libraries * chore: create getCheckBookingLimitsService * refactor: convert checkBookingAndDurationLimits to service class with DI - Create CheckBookingAndDurationLimitsService class following DI pattern - Add DI tokens and module for the new service - Update booking-limits container to provide the new service - Refactor handleNewBooking.ts to use service through DI - Maintain backward compatibility with deprecated function export - Preserve all existing functionality while improving code organization Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: CheckBookingAndDurationLimitsService * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> * fix: Return empty available days if error querying calendar (#22828) * Return a busy block placeholder if calendar throws an error * Refactor `getCalendarsEvents` to return an object with a success prop * Throw error in `getBusyTimes` if failed to fetch calendar availability * Return empty available days if error getting busy times * yeet. * Type fix * Fix type error in getLuckyUsers * Type fixes * Type fix * Type fix * Fix test * Fix test mocks * Refactor calendars.service to use new calendarBusyTimesQuery --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * chore: release v5.5.9 * include mobile layout (#22836) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * test: fix handleInstantMeeting test with setupAndTeardown and proper mocking - Add setupAndTeardown() for proper test environment setup - Use mockNoTranslations() to fix translation function mocking - Simplify NextApiRequest mock to resolve TypeScript errors - Both test cases now pass successfully Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * fix typo --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Sean Brydon <sean@cal.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>

joeauyeung added 4 commits July 30, 2025 16:50

Return a busy block placeholder if calendar throws an error

0e5d487

Refactor getCalendarsEvents to return an object with a success prop

9d25488

Throw error in getBusyTimes if failed to fetch calendar availability

80e5c8f

Return empty available days if error getting busy times

5e25ac9

keithwillcode added core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO labels Jul 30, 2025

yeet.

4c3688c

joeauyeung commented Jul 30, 2025

View reviewed changes

Type fix

40fa281

vercel bot deployed to Preview – dev July 30, 2025 22:26 View deployment

joeauyeung added 6 commits July 30, 2025 18:47

Fix type error in getLuckyUsers

aea0f56

Type fixes

8664277

Type fix

3038e21

Type fix

69c087f

Fix test

aa1842b

Fix test mocks

8ea3465

joeauyeung added the ready-for-e2e label Jul 30, 2025

joeauyeung marked this pull request as ready for review July 30, 2025 23:51

joeauyeung requested a review from a team as a code owner July 30, 2025 23:51

graphite-app bot requested a review from a team July 30, 2025 23:51

dosubot bot added bookings area: bookings, availability, timezones, double booking 🐛 bug Something isn't working labels Jul 30, 2025

emrysal previously approved these changes Jul 30, 2025

View reviewed changes

vercel bot deployed to Preview – dev July 31, 2025 00:16 View deployment

Refactor calendars.service to use new calendarBusyTimesQuery

59e1276

emrysal dismissed their stale review via 59e1276 July 31, 2025 00:28

emrysal requested a review from a team as a code owner July 31, 2025 00:28

vercel bot deployed to Preview – dev July 31, 2025 00:44 View deployment

Merge branch 'main' into calendar-error-fix-busy-times

4cef0e9

emrysal enabled auto-merge (squash) July 31, 2025 01:08

emrysal approved these changes Jul 31, 2025

View reviewed changes

emrysal merged commit f7b201b into main Jul 31, 2025
38 of 39 checks passed

emrysal deleted the calendar-error-fix-busy-times branch July 31, 2025 01:09

vercel bot deployed to Preview – dev July 31, 2025 01:13 View deployment

This was referenced Aug 23, 2025

fix: booking limits with seats not working (CAL-4553) #23298

Draft

refactor: lucky user to service class with DI #23275

Closed

This was referenced Aug 31, 2025

fix: booking availability based on limit #23400

Open

chore: redis cache for calendars in api v2 #23622

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Return empty available days if error querying calendar #22828

fix: Return empty available days if error querying calendar #22828

Uh oh!

joeauyeung commented Jul 30, 2025 •

edited

Loading

Uh oh!

coderabbitai bot commented Jul 30, 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!

vercel bot commented Jul 30, 2025 •

edited

Loading

Uh oh!

joeauyeung Jul 30, 2025

Uh oh!

joeauyeung Jul 30, 2025

Uh oh!

joeauyeung Jul 30, 2025

Uh oh!

joeauyeung Jul 30, 2025

Uh oh!

joeauyeung Jul 30, 2025

Uh oh!

graphite-app bot commented Jul 30, 2025

Uh oh!

emrysal left a comment

Uh oh!

github-actions bot commented Jul 31, 2025 •

edited

Loading

Uh oh!

emrysal left a comment

Uh oh!

Uh oh!

Uh oh!

fix: Return empty available days if error querying calendar #22828

fix: Return empty available days if error querying calendar #22828

Uh oh!

Conversation

joeauyeung commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Visual Demo (For contributors especially)

Video Demo (if applicable):

Image Demo (if applicable):

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Uh oh!

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

Uh oh!

Walkthrough

Estimated code review effort

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

vercel bot commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joeauyeung Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

joeauyeung Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

joeauyeung Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

joeauyeung Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

joeauyeung Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

graphite-app bot commented Jul 30, 2025

Graphite Automations

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

joeauyeung commented Jul 30, 2025 •

edited

Loading

coderabbitai bot commented Jul 30, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

vercel bot commented Jul 30, 2025 •

edited

Loading

github-actions bot commented Jul 31, 2025 •

edited

Loading