fix: Multiple rr-hosts combine to create erroneous availability by emrysal · Pull Request #18772 · calcom/cal.diy

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

+    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

      }

-      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

+      },
+      // 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

…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

* fix: replace react-hot-toast with sonner for toast notifications * feat: add country code (#19264) * perf: Move PlainChat up the hierarchy to remove rerenders (#19255) * perf: Move PlainChat up the hierarchy to remove rerenders * rmeove yarn lock --------- Co-authored-by: Nizzy <nizabizaher@gmail.com> Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com> * hotfix (#19266) * chore: release v4.9.11 * Handle cancelled status (#19272) * feat: Use new /routing URL for routing forms (#19235) * feat: Use new /routing URL for routing forms * Fixes * Fix bug * precent crash --------- Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com> * fix: remove section on /bookings if no data exists (#19261) * feat: v2 slots new version (#18758) * refactor: version old slots * feat: init new slots endpoints * chore: range format * fix: duratin * fix: duratin * test: slot releaseAt * refactor: reserve slot response * refactor variable name * docs: have new slots controller in docs * feat: crud for slots reservations * refactor: use exclude all for response * docs * chore: slots input service * refactor mini * refactor: remove unused imports * docs * handle orgSlug for dynamic events * refactor: correct name * docs * add optional organizationSlug to BySlug search * refactor: slot output format * refactor: return seated slot info * docs * rename functions * refactor: slots seated response * fix: handle same username in org and non org * refactor: test format * fix: allow reservationDuration only for authed requests * chore: check if auth user has permissions to define custom reservation duration * refactor: split e2e test files * refactor: invalid request exception codes * chore: old slots controller uses all old versions * refactor: remove depreceated fields (#19279) * refactor: remove depreceated fields * chore: use v2 endpoint * chore: update V2 Api type * chore * chore: Refactor to remove `getServerSideProps` for /teams route (#19286) * remove getServerSideProps * refactor teams route * chore: release v4.9.12 * fix: Salesforce - if no contact throw Error (#19271) * Throw error if no contact is passed to createEvent * chore: update error message * chore --------- Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * fix: missing await router controller (#19276) * fix: Default people filter in bookings list for admin (#18035) * default people filter for admin * chore * type check * added test case * made test concise to reduce flakiness * add timeout to wait for second get response before counting * update timeout --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> * feat: add CSAT to V2 bookings return (#19278) * init * test: v2 bookings returns rating --------- Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> * chore: disable v2 booking seats safe parse error logs (#19292) * revert: Reapply "fix: Multiple rr-hosts combine to create erroneous availabil… (#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 * chore: release v4.9.13 * fix: flaky test (#19294) * fix: flaky test * fix another test * update --------- Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: unknown <adhabal2002@gmail.com> * chore: calendars controller v2 docs (#19291) Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk> * Merge branch 'main' into replace-toaster-with-sonner * add ireland country code (#19117) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * perf: separate client vs server code from insights layout (#19285) * add UpgradeTipWrapper * refactor insights/layout.tsx --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * feat: Use Folders to organize SMS links on Dub (#19248) * feat: Use Folders to organize SMS links on Dub * Update yarn.lock --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk> * fix: removing-all-members-toggle-for-fh (#19277) * fix : removing all members toggle for fh * ux enhancements * adding placeholder * chore: release v5.0.0 * fix flake (#19306) * chore: migrate `/apps/routing-forms/[...pages]` to App Router (#18956) * wip * fix * fix * refactor * rename to routingServerSidePropsConfig * refactor * refactor * add routing-link to useIsBookingPage hook * remove Head component * fix * redirect user to apps/routing-forms/forms if user goes to apps/routing-forms * refactor * remove log * remove client component not needed * clean up code * remove unneeded metadata * clean up further * clean up further 2 * fix type check * routing-link does not need shell * Fix title for Routing Form public link and also remove any * Remove ; in HTML * Remove unnecessary page reload --------- Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com> * chore: migrate api for team upgrade to App Router (#19100) * remove old pages router api * add new app router api * fix * fix redirect * refactor * fix: cut off and alignment bug (#19317) * fix: assignment label cut-off * fix: add all team members label is vertically aligned * fix: nested scrolls on /bookings (#19284) * fix: Can't change availability for managed event type (#19006) * fix: flaky test organization.spec * fix * fix: bulk-update-in-scheduleId-in-detailed-view (#19295) * fix: bulk-update-in-scheduleId-in-detailed-view * minor-change --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * feat: prevent automatic query parameters when opening booking page (#18132) - Resolve the user hindrance where the event's booking page should not have search parameters such as date and month in the initial page load - Contains changes for the fix of issue #18094 as well as it is needed Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> * feat: atoms adjustments with ui v3 styles (#19320) * refactor: Clean out old code, no longer needed (#19323) * refactor: Clean out old code, no longer needed * Removed a sneaky one keen to stay behind * chore: release v5.0.1 * feat: Create `UserCreationService` and use in API V1 create user endpoint (#19150) * Create `createUser` method in `userCreationService` * Refactor `UserRepository` create method to accept prisma input and remove business logic * API use `UserCreationService` * Move slugify to service * Use hashPassword instead * Type fixes in `UserCreationService` * Add `userCreationService` tests * API accept data object * Type fixes * Add user _post test * Add test for locked user * Add locked param to log * Add user repository tests * Do not return locked status * Explicitly pass `locked` prop * Fix tests when locked isn't returned * Fix tests * Pass locked prop * Edit test name * Use logger * Fix passing hashed password * fix (#19298) * fix: timezone input text is now visible in dark mode (#19325) * feat: make first tab active by default (#19315) * feat: make first tab active by default * perf: optimize event types tabs rendering with useMemo --------- Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> * perf: Use one PageWrapper instance for all settings pages (#18752) * add a layoutfile to use-page-wrapper route group * refactor and move bookings status page to route group * improve logic in pagesAndRewritePaths * fix * add use client directive * move /403 and /500 * move /auth/error * move /connect-and-join * move /enterprise * move /maintenance * move /more * move /upgrade * chore: remove WithLayout from 8 low-risk single pages (#18745) * move /403 and /500 * move /auth/error * move /connect-and-join * move /enterprise * move /maintenance * move /more * move /upgrade * move /availability pages * move /event-types pages * move /insights pages * move /apps to use-page-wrapper group * move /getting-started to use-page-wrapper group * move /signup to use-page-wrapper group * move /workflows to use-page-wrapper group * move /video pages to use-page-wrapper group * pass dehydratedState in layout * pass dehydratedState in layout * move settings/(settings-layout) to use-page-wrapper * move settings/(admin-layout) to use-page-wrapper * move remaining settings pages to (use-page-wrapper) * fix test * remove unused code * remove unused files * fix type check * remove test tag * remove page * RSC should not default export client components * fix: Can't use unsaved booking question as variable in event name (#18604) Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> * chore: remove WithLayout from not-found.tsx (#19331) * fix: redirect logic in /settings/admin/apps (#19332) * chore: v3 fixed filters, new profile view (#19312) * fixed filters with badge * aligned recurrence in bookings * removed new badge * new profile view * fixed try for free button * fixed form input * fix: Issues with date changes in column view (#19258) * fix: coulmn view date change * Update store.ts --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * chore: fixed tooltip position for routing form (#19267) * fixed tooltip position for routing form * fixed offset * fix: Fairness when routing (#18550) * Partial push of new filters * Let's always return the passed host array when a filter doesn't need to be applied * fix: isFixed typing in same round robin host check * Add main bulk of rewritten logic for routed fairness support * Remove console.log * Add getAttributeWithEnabledWeights to AttributeRepository * Add OOO entry repository * Use getOrderedListOfLuckyUsers in lead threshold filtering * Shortfall already includes weight * test against minShortfall * first attempt to fix fallbacks * Added testcase updates * Partially fix filterHosts test * Some test updates * Removed email field from normalization * fix no available users found error * fix unit test * remove fallback from same host reschedule return * fixes and improvements for findQualifiedHosts * include fallback logic in handleNewBooking * use fallback in handleNewBooking * fix for contact owner in handleNewBooking * WIP - comment * pass routingFormResponseId * fix type error * pass routingFormResponse * fixes in treshold logic * remove reason * merge qualified and fallback availabilities * fix type error * add and fix tests * clean up test file * fix filterHostsBySameRoundRobinHost tests * fix findQualifiedHosts.test.ts * fix getRoutedUsers.test.ts * fix tests * fix isRerouting check * fix start time for two weeks check * fix fallback hosts * fix test * fallback hosts should also include qualified hosts * fix type error * fix typos * add contact owner to fallbacks * fix typo * fix qualifiedRRUsers * set fixed users when no hosts * add tets + code clean up * add test for reschedule with same host * fix typo * add more tests for findQualifiedHosts * remove skip from test * add comment * remove unused code * fix fallback users in loadAndValidateUsers * improve naming for fallback * rename missed fallback variable * fix reschedule with same rr host in handleNewBooking * fixes for fallback slots * add more tests + small fixes for contact owner * fix tests and type errors * add logs for fallback * add type:json to logger * Fix small merge issue * fix end time if two weeks are cut off * add more tests for contact owner availability check * add new logic for two weeks fallback * fix reschedule same RR host test --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> * fix: EditLocationDialog footer positioning and structure (#19335) * fix: EditLocationDialog footer positioning and structure * fix: make RescheduleDialog footer layout and button structure right * fix: input dialogue glitch now works great * made tests happy --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> * Merge branch 'main' into replace-toaster-with-sonner * chore: remove DefaultToast from toast.stories.mdx --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Nizzy <nizabizaher@gmail.com> Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com> Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: GitHub Actions <github-actions@github.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Vijay <vijayraghav22@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: unknown <adhabal2002@gmail.com> Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Steven Tey <stevensteel97@gmail.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> Co-authored-by: amrit <iamamrit27@gmail.com> Co-authored-by: Sanchit Tewari <46245135+sanchitttt@users.noreply.github.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>

…om#18772) * wip: Open draft PR with passing test (should fail) * Fix aggregatedAvailability by not merging rr host availability * Added test for validating fixed host behaviour * Add test for combined rr and fixed hosts * Check date-ranges arent returned multiple times when offered by multiple rr hosts * Also sort date ranges * Adding failing test that should result in 5 slots, but returns 7 as it returns the same slots twice. * Slots returns duplicate slots for overlapping date ranges * As mergeOverlappingDateRanges enabled the unified start time, we need to reproduce this * Do not 'prettify' slots to the same degree if they fall on different days * Added test to prove an end date before start also works * Use a string instead of number as key * chore: Deprecate organizerTimeZone, effectively unused * Adjust all dateRanges similarly * Bring back eventTimeZone * Remove adjustDateRanges in favour of slot generation changes * Convert to tz after all logic is finished. * clearer code flow * Remove console.log + add failing test due to inverse order * Address issue with inversion when date ranges are given out of order

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

…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

* fix: replace react-hot-toast with sonner for toast notifications * feat: add country code (calcom#19264) * perf: Move PlainChat up the hierarchy to remove rerenders (calcom#19255) * perf: Move PlainChat up the hierarchy to remove rerenders * rmeove yarn lock --------- Co-authored-by: Nizzy <nizabizaher@gmail.com> Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com> * hotfix (calcom#19266) * chore: release v4.9.11 * Handle cancelled status (calcom#19272) * feat: Use new /routing URL for routing forms (calcom#19235) * feat: Use new /routing URL for routing forms * Fixes * Fix bug * precent crash --------- Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com> * fix: remove section on /bookings if no data exists (calcom#19261) * feat: v2 slots new version (calcom#18758) * refactor: version old slots * feat: init new slots endpoints * chore: range format * fix: duratin * fix: duratin * test: slot releaseAt * refactor: reserve slot response * refactor variable name * docs: have new slots controller in docs * feat: crud for slots reservations * refactor: use exclude all for response * docs * chore: slots input service * refactor mini * refactor: remove unused imports * docs * handle orgSlug for dynamic events * refactor: correct name * docs * add optional organizationSlug to BySlug search * refactor: slot output format * refactor: return seated slot info * docs * rename functions * refactor: slots seated response * fix: handle same username in org and non org * refactor: test format * fix: allow reservationDuration only for authed requests * chore: check if auth user has permissions to define custom reservation duration * refactor: split e2e test files * refactor: invalid request exception codes * chore: old slots controller uses all old versions * refactor: remove depreceated fields (calcom#19279) * refactor: remove depreceated fields * chore: use v2 endpoint * chore: update V2 Api type * chore * chore: Refactor to remove `getServerSideProps` for /teams route (calcom#19286) * remove getServerSideProps * refactor teams route * chore: release v4.9.12 * fix: Salesforce - if no contact throw Error (calcom#19271) * Throw error if no contact is passed to createEvent * chore: update error message * chore --------- Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * fix: missing await router controller (calcom#19276) * fix: Default people filter in bookings list for admin (calcom#18035) * default people filter for admin * chore * type check * added test case * made test concise to reduce flakiness * add timeout to wait for second get response before counting * update timeout --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> * feat: add CSAT to V2 bookings return (calcom#19278) * init * test: v2 bookings returns rating --------- Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> * chore: disable v2 booking seats safe parse error logs (calcom#19292) * revert: Reapply "fix: Multiple rr-hosts combine to create erroneous availabil… (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 * chore: release v4.9.13 * fix: flaky test (calcom#19294) * fix: flaky test * fix another test * update --------- Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: unknown <adhabal2002@gmail.com> * chore: calendars controller v2 docs (calcom#19291) Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk> * Merge branch 'main' into replace-toaster-with-sonner * add ireland country code (calcom#19117) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * perf: separate client vs server code from insights layout (calcom#19285) * add UpgradeTipWrapper * refactor insights/layout.tsx --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * feat: Use Folders to organize SMS links on Dub (calcom#19248) * feat: Use Folders to organize SMS links on Dub * Update yarn.lock --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk> * fix: removing-all-members-toggle-for-fh (calcom#19277) * fix : removing all members toggle for fh * ux enhancements * adding placeholder * chore: release v5.0.0 * fix flake (calcom#19306) * chore: migrate `/apps/routing-forms/[...pages]` to App Router (calcom#18956) * wip * fix * fix * refactor * rename to routingServerSidePropsConfig * refactor * refactor * add routing-link to useIsBookingPage hook * remove Head component * fix * redirect user to apps/routing-forms/forms if user goes to apps/routing-forms * refactor * remove log * remove client component not needed * clean up code * remove unneeded metadata * clean up further * clean up further 2 * fix type check * routing-link does not need shell * Fix title for Routing Form public link and also remove any * Remove ; in HTML * Remove unnecessary page reload --------- Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com> * chore: migrate api for team upgrade to App Router (calcom#19100) * remove old pages router api * add new app router api * fix * fix redirect * refactor * fix: cut off and alignment bug (calcom#19317) * fix: assignment label cut-off * fix: add all team members label is vertically aligned * fix: nested scrolls on /bookings (calcom#19284) * fix: Can't change availability for managed event type (calcom#19006) * fix: flaky test organization.spec * fix * fix: bulk-update-in-scheduleId-in-detailed-view (calcom#19295) * fix: bulk-update-in-scheduleId-in-detailed-view * minor-change --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * feat: prevent automatic query parameters when opening booking page (calcom#18132) - Resolve the user hindrance where the event's booking page should not have search parameters such as date and month in the initial page load - Contains changes for the fix of issue calcom#18094 as well as it is needed Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> * feat: atoms adjustments with ui v3 styles (calcom#19320) * refactor: Clean out old code, no longer needed (calcom#19323) * refactor: Clean out old code, no longer needed * Removed a sneaky one keen to stay behind * chore: release v5.0.1 * feat: Create `UserCreationService` and use in API V1 create user endpoint (calcom#19150) * Create `createUser` method in `userCreationService` * Refactor `UserRepository` create method to accept prisma input and remove business logic * API use `UserCreationService` * Move slugify to service * Use hashPassword instead * Type fixes in `UserCreationService` * Add `userCreationService` tests * API accept data object * Type fixes * Add user _post test * Add test for locked user * Add locked param to log * Add user repository tests * Do not return locked status * Explicitly pass `locked` prop * Fix tests when locked isn't returned * Fix tests * Pass locked prop * Edit test name * Use logger * Fix passing hashed password * fix (calcom#19298) * fix: timezone input text is now visible in dark mode (calcom#19325) * feat: make first tab active by default (calcom#19315) * feat: make first tab active by default * perf: optimize event types tabs rendering with useMemo --------- Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> * perf: Use one PageWrapper instance for all settings pages (calcom#18752) * add a layoutfile to use-page-wrapper route group * refactor and move bookings status page to route group * improve logic in pagesAndRewritePaths * fix * add use client directive * move /403 and /500 * move /auth/error * move /connect-and-join * move /enterprise * move /maintenance * move /more * move /upgrade * chore: remove WithLayout from 8 low-risk single pages (calcom#18745) * move /403 and /500 * move /auth/error * move /connect-and-join * move /enterprise * move /maintenance * move /more * move /upgrade * move /availability pages * move /event-types pages * move /insights pages * move /apps to use-page-wrapper group * move /getting-started to use-page-wrapper group * move /signup to use-page-wrapper group * move /workflows to use-page-wrapper group * move /video pages to use-page-wrapper group * pass dehydratedState in layout * pass dehydratedState in layout * move settings/(settings-layout) to use-page-wrapper * move settings/(admin-layout) to use-page-wrapper * move remaining settings pages to (use-page-wrapper) * fix test * remove unused code * remove unused files * fix type check * remove test tag * remove page * RSC should not default export client components * fix: Can't use unsaved booking question as variable in event name (calcom#18604) Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> * chore: remove WithLayout from not-found.tsx (calcom#19331) * fix: redirect logic in /settings/admin/apps (calcom#19332) * chore: v3 fixed filters, new profile view (calcom#19312) * fixed filters with badge * aligned recurrence in bookings * removed new badge * new profile view * fixed try for free button * fixed form input * fix: Issues with date changes in column view (calcom#19258) * fix: coulmn view date change * Update store.ts --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * chore: fixed tooltip position for routing form (calcom#19267) * fixed tooltip position for routing form * fixed offset * fix: Fairness when routing (calcom#18550) * Partial push of new filters * Let's always return the passed host array when a filter doesn't need to be applied * fix: isFixed typing in same round robin host check * Add main bulk of rewritten logic for routed fairness support * Remove console.log * Add getAttributeWithEnabledWeights to AttributeRepository * Add OOO entry repository * Use getOrderedListOfLuckyUsers in lead threshold filtering * Shortfall already includes weight * test against minShortfall * first attempt to fix fallbacks * Added testcase updates * Partially fix filterHosts test * Some test updates * Removed email field from normalization * fix no available users found error * fix unit test * remove fallback from same host reschedule return * fixes and improvements for findQualifiedHosts * include fallback logic in handleNewBooking * use fallback in handleNewBooking * fix for contact owner in handleNewBooking * WIP - comment * pass routingFormResponseId * fix type error * pass routingFormResponse * fixes in treshold logic * remove reason * merge qualified and fallback availabilities * fix type error * add and fix tests * clean up test file * fix filterHostsBySameRoundRobinHost tests * fix findQualifiedHosts.test.ts * fix getRoutedUsers.test.ts * fix tests * fix isRerouting check * fix start time for two weeks check * fix fallback hosts * fix test * fallback hosts should also include qualified hosts * fix type error * fix typos * add contact owner to fallbacks * fix typo * fix qualifiedRRUsers * set fixed users when no hosts * add tets + code clean up * add test for reschedule with same host * fix typo * add more tests for findQualifiedHosts * remove skip from test * add comment * remove unused code * fix fallback users in loadAndValidateUsers * improve naming for fallback * rename missed fallback variable * fix reschedule with same rr host in handleNewBooking * fixes for fallback slots * add more tests + small fixes for contact owner * fix tests and type errors * add logs for fallback * add type:json to logger * Fix small merge issue * fix end time if two weeks are cut off * add more tests for contact owner availability check * add new logic for two weeks fallback * fix reschedule same RR host test --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> * fix: EditLocationDialog footer positioning and structure (calcom#19335) * fix: EditLocationDialog footer positioning and structure * fix: make RescheduleDialog footer layout and button structure right * fix: input dialogue glitch now works great * made tests happy --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> * Merge branch 'main' into replace-toaster-with-sonner * chore: remove DefaultToast from toast.stories.mdx --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Nizzy <nizabizaher@gmail.com> Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com> Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: GitHub Actions <github-actions@github.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Vijay <vijayraghav22@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: unknown <adhabal2002@gmail.com> Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Steven Tey <stevensteel97@gmail.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com> Co-authored-by: amrit <iamamrit27@gmail.com> Co-authored-by: Sanchit Tewari <46245135+sanchitttt@users.noreply.github.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>

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

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

MuhammadAimanSulaiman pushed a commit to hit-pay/cal.com that referenced this pull request Feb 25, 2025

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

942bb26

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

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 merged 24 commits intomainfrom
bugfix/rr-busy-combinations-turn-some-slots-available

emrysal commented Jan 20, 2025 •

edited

Loading

Uh oh!

github-actions Bot commented Jan 20, 2025 •

edited

Loading

Uh oh!

vercel Bot commented Jan 21, 2025 •

edited

Loading

Uh oh!

emrysal Jan 22, 2025 •

edited

Loading

Uh oh!

emrysal Jan 22, 2025

Uh oh!

emrysal Jan 22, 2025

Uh oh!

CarinaWolli commented Feb 7, 2025

Uh oh!

github-actions Bot commented Feb 7, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

emrysal commented Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Uh oh!

github-actions Bot commented Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel Bot commented Jan 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

emrysal Jan 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

emrysal Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

emrysal Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

CarinaWolli commented Feb 7, 2025

Uh oh!

github-actions Bot commented Feb 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

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