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	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 11, 2025 0:53am

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Feb 11, 2025 0:53am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Feb 11, 2025 0:53am

…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

CarinaWolli · 2025-02-07T22:58:41Z

Great work, code looks good! Also did some testing, and everything worked as expected 🙏

github-actions · 2025-02-07T23:24:52Z

E2E results are ready!

Workflow #47139.2 latest results

packages/core/getAggregatedAvailability/getAggregatedAvailability.test.ts

…ty (#18772)" This reverts commit f5dc22f.

…ity (#18772)" This reverts commit 5dbc6d9.

…vailabil… (#19263) * Reapply "fix: Multiple rr-hosts combine to create erroneous availability (#18772)" This reverts commit 5dbc6d9. * Only thing left is a diff to show which slots are removed * Add logging around time slot results * Setup logging through axiom * .... forgot * fix: type errors * Only log when there are differences * Updated from old which had a failing test to new logic

…vailabil… (calcom#19263) * Reapply "fix: Multiple rr-hosts combine to create erroneous availability (calcom#18772)" This reverts commit 5dbc6d9. * Only thing left is a diff to show which slots are removed * Add logging around time slot results * Setup logging through axiom * .... forgot * fix: type errors * Only log when there are differences * Updated from old which had a failing test to new logic

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

vercel bot deployed to Preview – cal-com-ui-playground February 7, 2025 17:41 View deployment

vercel bot deployed to Preview – api February 7, 2025 17:41 View deployment

vercel bot deployed to Preview – dev February 7, 2025 17:51 View deployment

emrysal added 2 commits February 7, 2025 18:02

Remove console.log + add failing test due to inverse order

9f5fcc5

Address issue with inversion when date ranges are given out of order

e62c2b5

vercel bot deployed to Preview – api February 7, 2025 18:18 View deployment

vercel bot deployed to Preview – dev February 7, 2025 18:25 View deployment

vercel bot deployed to Preview – cal-com-ui-playground February 7, 2025 18:31 View deployment

emrysal requested a review from CarinaWolli February 7, 2025 21:49

CarinaWolli previously approved these changes Feb 7, 2025

View reviewed changes

emrysal added the ready-for-e2e label Feb 7, 2025

emrysal enabled auto-merge (squash) February 7, 2025 23:23

keithwillcode reviewed Feb 10, 2025

View reviewed changes

test name updated

e3570aa

emrysal dismissed CarinaWolli’s stale review via e3570aa February 11, 2025 12:41

updated test name

38e63fd

vercel bot deployed to Preview – api February 11, 2025 12:51 View deployment

vercel bot deployed to Preview – cal-com-ui-playground February 11, 2025 12:53 View deployment

vercel bot deployed to Preview – dev February 11, 2025 13:07 View deployment

keithwillcode approved these changes Feb 11, 2025

View reviewed changes

emrysal merged commit f5dc22f into main Feb 11, 2025
43 checks passed

emrysal deleted the bugfix/rr-busy-combinations-turn-some-slots-available branch February 11, 2025 19:35

emrysal added a commit that referenced this pull request Feb 12, 2025

Revert "fix: Multiple rr-hosts combine to create erroneous availabili…

5dbc6d9

…ty (#18772)" This reverts commit f5dc22f.

emrysal added a commit that referenced this pull request Feb 12, 2025

Reapply "fix: Multiple rr-hosts combine to create erroneous availabil…

d5afe2c

…ity (#18772)" This reverts commit 5dbc6d9.

emrysal mentioned this pull request Feb 12, 2025

revert: Reapply "fix: Multiple rr-hosts combine to create erroneous availabil… #19263

Merged

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

CarinaWolli commented Feb 7, 2025

github-actions bot commented Feb 7, 2025 •

edited

Loading

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

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

emrysal Jan 22, 2025

Choose a reason for hiding this comment

emrysal Jan 22, 2025

Choose a reason for hiding this comment

CarinaWolli commented Feb 7, 2025

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

E2E results are ready!

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

github-actions bot commented Feb 7, 2025 •

edited

Loading