fix: Multiple rr-hosts combine to create erroneous availability #18772

emrysal · 2025-01-20T21:58:48Z

What does this PR do?

Fixes situation where overlapping date ranges from multiple rr hosts "merge" and result in a bigger sized slot than intended. Each date range needs to stay intact to generate the slot.

The slot logic also needed to be modified as now slots would be generated for each individual date range to prevent the following situation:

(host A 11:00-13:00, host B 11:15-13:00, frequency=45)

- 11:00
- 11:15
- 11:45
- 12:00

With new changes to the slot logic, the slots are consistent with previous behaviour:

- 11:00
- 11:45

github-actions · 2025-01-20T21:58:59Z

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:

Unknown release type "bugfix" found in pull request title "bugfix: Multiple rr-hosts combine to create erroneous availability". 

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

vercel · 2025-01-21T19:42:50Z

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

Name	Status	Preview	Comments	Updated (UTC)
cal-com-ui-playground	❌ Failed (Inspect)			Jan 30, 2025 5:50pm

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jan 30, 2025 5:50pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 30, 2025 5:50pm

…ple rr hosts

…t returns the same slots twice.

emrysal · 2025-01-22T00:35:15Z

packages/lib/slots.test.ts

+    expect(result).toHaveLength(6);
+  });
+
+  it("can merge multiple time slot groups when multiple date ranges are given that overlap", async () => {


Overlapping time slots weren't possible before as date ranges were merged, even rr hosts. Now they are possible because different rr hosts may have overlapping date ranges but we still want to handle individually.

emrysal · 2025-01-22T00:36:51Z

packages/lib/slots.ts

@@ -233,12 +237,12 @@ function buildSlotsWithDateRanges({
        };
      }

-      slots.push(slotData);
+      slots.set(slotData.time.toISOString(), slotData);


Key based on start time (same as rendering in Booker)

emrysal · 2025-01-22T00:37:42Z

packages/lib/slots.test.ts

+      },
+      // 12:00-12:20,12:20-12:40
+      {
+        start: nextDay.hour(11).minute(20),


Before this resulted in 7 slots, due to 11:20/11:40 overlap with dateRanges[0]. This is now corrected to the correct (5)

… to reproduce this

…days

graphite-app · 2025-01-22T10:40:12Z

Graphite Automations

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

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

emrysal · 2025-01-24T14:32:37Z

packages/core/getAggregatedAvailability/getAggregatedAvailability.test.ts

+
+describe("getAggregatedAvailability", () => {
+  // rr-host availability used to combine into erroneous slots, this confirms it no longer happens
+  it("should have no host available between 11:00 and 11:30 on January 23, 2025", () => {


This test is failing on live code

emrysal · 2025-01-24T15:05:53Z

packages/core/getAggregatedAvailability/index.ts

+      return startDiff !== 0 ? startDiff : a.end.valueOf() - b.end.valueOf();
+    })
+    .filter((range) => {
+      const key = range.start.valueOf() * 1e12 + range.end.valueOf();


This line generates a unique key for each date range by combining the start and end timestamps. Multiplying the start timestamp by 1e12 ensures that the start and end values are distinct and non-overlapping when combined, allowing the function to accurately identify and filter out duplicate date ranges.

This is not working correctly for me.

I have the following data:

Date range 1:
start: 2025-01-27T14:00:00Z
end: 2025-01-27T04:30:00-05:00

Date range 2:
start: 2025-01-27T14:00:00Z
end: 2025-01-27T14:45:00Z

Even though the end time is different, Date Range 2 is considered a duplicate and not returned

CarinaWolli

I found a potential bug when testing. Don't know yet for sure, but requesting changes to avoid merging until I know more

Resolved, not sure why but was a local issue that slots weren't shown. But they were returned correctly

CarinaWolli · 2025-01-24T19:33:50Z

packages/core/getAggregatedAvailability/index.ts

+      return startDiff !== 0 ? startDiff : a.end.valueOf() - b.end.valueOf();
+    })
+    .filter((range) => {
+      const key = range.start.valueOf() * 1e12 + range.end.valueOf();


This is not working correctly for me.

I have the following data:

Date range 1:
start: 2025-01-27T14:00:00Z
end: 2025-01-27T04:30:00-05:00

Date range 2:
start: 2025-01-27T14:00:00Z
end: 2025-01-27T14:45:00Z

Even though the end time is different, Date Range 2 is considered a duplicate and not returned

fixed

CarinaWolli

There are several issues in the adjustDateRanges function. I left some comments

You can reproduce the bug with this setup:
RR Host 1: 11:30 - 14:00
RR Host 2: 9:15 - 11:00

First day that's available has 11:30 blocked. All other days have 11:30 open

CarinaWolli · 2025-01-24T22:56:07Z

packages/lib/slots.ts

+
+  for (let i = 1; i < dateRanges.length; i++) {
+    // we skip if the date-range to adjust is outside the base date range day. - this avoids offset on other days.
+    if (dateRanges[i].start <= baseStart.startOf("day") || dateRanges[i].start >= baseEnd.endOf("day")) {


Does this work with startOf endOf day? Is this start of day in UTC? Or how will this exactly work?

CarinaWolli · 2025-01-24T22:59:06Z

packages/lib/slots.ts

+const adjustDateRanges = (dateRanges: DateRange[], frequency: number) => {
+  if (dateRanges.length === 0) return;
+
+  const baseStart = dateRanges[0].start.clone(); // Reference start time


baseStart is the start of the dateRange, but not the start of the first slot. baseStart can be 9:15 but first 30 min slot will be at 9:30. This causes issues in the code below and we are losing slots

CarinaWolli · 2025-01-24T23:14:31Z

packages/lib/slots.ts

+  const baseEnd = dateRanges[0].end.clone();
+
+  for (let i = 1; i < dateRanges.length; i++) {
+    // we skip if the date-range to adjust is outside the base date range day. - this avoids offset on other days.


base date range day is the first day in date ranges. However dateranges are from the whole month. So this only handles the first day

…available

emrysal · 2025-01-30T13:57:06Z

packages/lib/slots.ts

    slotStartTime =
      slotStartTime.minute() % interval !== 0
        ? slotStartTime.startOf("hour").add(Math.ceil(slotStartTime.minute() / interval) * interval, "minute")
        : slotStartTime;

-    // Adding 1 minute to date ranges that end at midnight to ensure that the last slot is included


Removing organizerTimeZone, the way it was passed was highly buggy as we couldn't be sure if it was the right timeZone at this point in time. Instead moving it to date-ranges, where I'll round up to the interval.

wip: Open draft PR with passing test (should fail)

11baee3

keithwillcode added core area: core, team members only foundation labels Jan 20, 2025

emrysal changed the title ~~wip: Open draft PR with passing test (should fail)~~ bugfix: Multiple rr-hosts combine to create erroneous availability Jan 20, 2025

vercel bot deployed to Preview – api January 20, 2025 22:04 View deployment

Fix aggregatedAvailability by not merging rr host availability

0e10874

vercel bot deployed to Preview – api January 21, 2025 19:49 View deployment

Added test for validating fixed host behaviour

abc4b70

vercel bot deployed to Preview – api January 21, 2025 20:07 View deployment

emrysal changed the title ~~bugfix: Multiple rr-hosts combine to create erroneous availability~~ fix: Multiple rr-hosts combine to create erroneous availability Jan 21, 2025

Add test for combined rr and fixed hosts

371c197

vercel bot deployed to Preview – api January 21, 2025 20:33 View deployment

Check date-ranges arent returned multiple times when offered by multi…

a72f030

…ple rr hosts

vercel bot deployed to Preview – api January 21, 2025 20:57 View deployment

Also sort date ranges

1d59916

vercel bot deployed to Preview – api January 21, 2025 21:08 View deployment

Adding failing test that should result in 5 slots, but returns 7 as i…

cf5cdd5

…t returns the same slots twice.

vercel bot deployed to Preview – api January 22, 2025 00:27 View deployment

Slots returns duplicate slots for overlapping date ranges

6407247

emrysal commented Jan 22, 2025

View reviewed changes

vercel bot deployed to Preview – api January 22, 2025 00:40 View deployment

As mergeOverlappingDateRanges enabled the unified start time, we need…

7d50b48

… to reproduce this

vercel bot deployed to Preview – api January 22, 2025 02:17 View deployment

Do not 'prettify' slots to the same degree if they fall on different …

3c8bf92

…days

vercel bot deployed to Preview – api January 22, 2025 10:15 View deployment

emrysal added the ready-for-e2e label Jan 22, 2025

emrysal added the high-risk Requires approval by Foundation team label Jan 22, 2025

emrysal requested a review from CarinaWolli January 22, 2025 10:46

emrysal removed the ready-for-e2e label Jan 22, 2025

emrysal commented Jan 24, 2025

View reviewed changes

CarinaWolli previously requested changes Jan 24, 2025

View reviewed changes

github-actions bot marked this pull request as draft January 24, 2025 17:56

CarinaWolli marked this pull request as ready for review January 24, 2025 18:54

CarinaWolli previously requested changes Jan 24, 2025

View reviewed changes

github-actions bot marked this pull request as draft January 24, 2025 19:34

Added test to prove an end date before start also works

00ab312

vercel bot deployed to Preview – api January 24, 2025 20:02 View deployment

Use a string instead of number as key

18ea8f8

vercel bot deployed to Preview – api January 24, 2025 20:11 View deployment

CarinaWolli requested changes Jan 24, 2025

View reviewed changes

Merge branch 'main' into bugfix/rr-busy-combinations-turn-some-slots-…

60d0043

…available

vercel bot deployed to Preview – api January 27, 2025 16:45 View deployment

chore: Deprecate organizerTimeZone, effectively unused

0667cec

vercel bot had a problem deploying to Preview – cal-com-ui-playground January 30, 2025 13:55 Failure

emrysal commented Jan 30, 2025

View reviewed changes

vercel bot had a problem deploying to Preview – api January 30, 2025 13:59 Failure

Adjust all dateRanges similarly

f6fe7d8

vercel bot had a problem deploying to Preview – cal-com-ui-playground January 30, 2025 17:16 Failure

vercel bot had a problem deploying to Preview – api January 30, 2025 17:20 Failure

Bring back eventTimeZone

f826a34

vercel bot had a problem deploying to Preview – cal-com-ui-playground January 30, 2025 17:50 Failure

vercel bot deployed to Preview – api January 30, 2025 17:56 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Multiple rr-hosts combine to create erroneous availability #18772

fix: Multiple rr-hosts combine to create erroneous availability #18772

emrysal commented Jan 20, 2025 •

edited

Loading

github-actions bot commented Jan 20, 2025 •

edited

Loading

vercel bot commented Jan 21, 2025 •

edited

Loading

emrysal Jan 22, 2025 •

edited

Loading

emrysal Jan 22, 2025

emrysal Jan 22, 2025

graphite-app bot commented Jan 22, 2025

emrysal Jan 24, 2025

emrysal Jan 24, 2025 •

edited

Loading

CarinaWolli Jan 24, 2025

CarinaWolli left a comment

CarinaWolli Jan 24, 2025

CarinaWolli left a comment

CarinaWolli Jan 24, 2025

CarinaWolli Jan 24, 2025

CarinaWolli Jan 24, 2025

emrysal Jan 30, 2025

fix: Multiple rr-hosts combine to create erroneous availability #18772

Are you sure you want to change the base?

fix: Multiple rr-hosts combine to create erroneous availability #18772

Conversation

emrysal commented Jan 20, 2025 • edited Loading

What does this PR do?

github-actions bot commented Jan 20, 2025 • edited Loading

vercel bot commented Jan 21, 2025 • edited Loading

emrysal Jan 22, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

graphite-app bot commented Jan 22, 2025

Graphite Automations

Choose a reason for hiding this comment

emrysal Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CarinaWolli left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CarinaWolli left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emrysal commented Jan 20, 2025 •

edited

Loading

github-actions bot commented Jan 20, 2025 •

edited

Loading

vercel bot commented Jan 21, 2025 •

edited

Loading

emrysal Jan 22, 2025 •

edited

Loading

emrysal Jan 24, 2025 •

edited

Loading