fix: Fairness when routing #18550

emrysal · 2025-01-09T11:14:23Z

What does this PR do?

Rewrites the handling of pre-qualification due to various filters, correctly and adds fallback logic to whenever no users are returned. We intend to prevent no availability at no cost.

WIP: Pre-push of filters for partial review.

emrysal · 2025-01-09T11:14:43Z

packages/lib/bookings/filterHostsByLeadThreshold.test.ts

@@ -27,18 +26,10 @@ afterEach(() => {
 });

 describe("filterHostByLeadThreshold", () => {
-  it("skips filter if host is fixed", async () => {


Fixed users are now type guarded.

emrysal · 2025-01-09T11:15:12Z

packages/lib/bookings/filterHostsByLeadThreshold.test.ts

  it("skips filter if lead threshold is null", async () => {
-    const hosts = [{ isFixed: false, createdAt: new Date(), user: { id: 1 } }];
+    const hosts = [
+      { isFixed: false as const, createdAt: new Date(), user: { id: 1, email: "[email protected]" } },


We need to mark isFixed as const so it's not type hinted boolean - passing a boolean type errors.

…to be applied

vercel · 2025-01-09T12:08:49Z

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 7, 2025 4:32pm

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Feb 7, 2025 4:32pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Feb 7, 2025 4:32pm

emrysal · 2025-01-09T14:46:24Z

packages/trpc/server/routers/viewer/slots/util.ts

-  if (contactOwnerEmail && aggregatedAvailability.length > 0) {
+  // Fairness and Contact Owner disqualification reasons need Availability within 2 weeks
+  // if not, we attempt to re-open.
+  if (fallbackHosts && fallbackHosts.length > 0) {


@joeauyeung rewritten this check, now any time there's fallbackHosts found I run the 2-weeks check; if there's not enough availability within the qualified users we use the fallbackHosts instead.

Are we sure we want that?

If reschedule with same host is enabled, we would do that too then. I think we shouldn't make that change in this PR

emrysal · 2025-01-09T14:47:41Z

packages/trpc/server/routers/viewer/slots/util.ts

@@ -886,29 +875,6 @@ const calculateHostsAndAvailabilities = async ({
  bypassBusyCalendarTimes: boolean;
  shouldServeCache?: boolean;
 }) => {
-  const routedTeamMemberIds = input.routedTeamMemberIds ?? null;


Moved to filterHostsBySameRoundRobinHost check.

github-actions · 2025-01-09T15:19:10Z

E2E results are ready!

Workflow #46815.1 latest results

packages/lib/bookings/findQualifiedHosts.ts

CarinaWolli · 2025-01-23T16:45:12Z

packages/lib/bookings/findQualifiedHosts.ts

+
+    return {
+      qualifiedHosts: [...fixedHosts, ...hostsAfterContactOwnerMatching],
+      fallbackHosts,


I think the fallbackHosts should never be the event type hosts.

Fallback hosts should ideally be hostsAfterFairnessMatching. In case the contact owne has no availability for 2 weeks we would ignore all other logic (attribute routing, fairness,..)

@emrysal should be fixed with ae12518

CarinaWolli · 2025-02-06T15:21:07Z

packages/features/bookings/lib/handleNewBooking.ts

  });

  // We filter out users but ensure allHostUsers remain same.
-  let users = allHostUsers;
+  let users = [...qualifiedRRUsers, ...fallbackRRUsers, ...fixedUsers];


change naming of this.

these fallback users are different than the once returned from getQualified users. They are filtered don't don't include the qualified users

CarinaWolli · 2025-02-06T15:23:24Z

packages/features/bookings/lib/handleNewBooking.ts

@@ -657,26 +710,6 @@ async function handler(



this is already handled in findQualifedUsers

CarinaWolli · 2025-02-06T15:24:23Z

packages/features/bookings/lib/handleNewBooking.ts

@@ -1267,7 +1300,7 @@ async function handler(
        endTime: reqBody.end,
        contactOwnerFromReq,
        contactOwnerEmail,
-        allHostUsers,
+        allHostUsers: [...qualifiedRRUsers, ...fallbackRRUsers, ...fixedUsers],


not sure if we need fallbackRRUsers here, take a look at what buildDryRunBooking exactly does

CarinaWolli · 2025-02-06T15:25:38Z

packages/features/bookings/lib/handleNewBooking.ts

-        availableUsers,
-        fixedUserPool,
-      });
+      const luckyUsers: typeof users = [];


luckyUserPool already includes only the contact owner (if available)

CarinaWolli · 2025-02-06T15:30:49Z

packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts

+
+  return {
+    qualifiedRRUsers,
+    fallbackRRUsers, // without qualified


Rename to make clear this is different from the fallback users returned form findQualifiedUsers

CarinaWolli · 2025-02-06T15:32:05Z

packages/lib/bookings/filterHostsByLeadThreshold.ts

+    ],
+    eventType,
+    allRRHosts: hosts,
+    routingFormResponse,


routingFormResponse is added here

CarinaWolli · 2025-02-06T15:35:55Z

packages/trpc/server/routers/viewer/slots/util.ts

      contactOwnerEmail,
      loggerWithEventDetails,
-      startTime,
+      // adjust start time so we can check for available slots in the first two weeks
+      startTime: startTime.isBefore(twoWeeksFromNow)


if the start time is within the first two weeks, make sure to load the whole two weeks starting today. Otherwise we have issues if it's end of a month and users already loads next month

CarinaWolli · 2025-02-06T15:37:59Z

packages/trpc/server/routers/viewer/slots/util.ts

+          bypassBusyCalendarTimes,
+          shouldServeCache,
+        });
+        if (!firstTwoWeeksAvailabilities.aggregatedAvailability.length) {


If a whole month (that's not within the first two weeks) isn't available, then check if the first two week are available. If they are also not available then fallback

Todo: Add more tests for this fallback logic

CarinaWolli · 2025-02-06T15:39:19Z

packages/trpc/server/routers/viewer/slots/util.ts

-            shouldServeCache,
-          }));
-      }
+      // Merge qualified availability with fallback availabilities


we still want to be qualified hosts to be bookable, they might be available after the two weeks

i might don't need this merge

CarinaWolli · 2025-02-06T23:13:39Z

packages/trpc/server/routers/viewer/slots/util.test.ts

@@ -1,90 +0,0 @@
-import { describe, expect, it } from "vitest";


getUsersWithCredentialsConsideringContactOwner was removed because all this logic is already handled in findQualifiedUsers

packages/lib/bookings/findQualifiedHosts.ts

Partial push of new filters

490555e

emrysal commented Jan 9, 2025

View reviewed changes

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

emrysal commented Jan 9, 2025

View reviewed changes

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

Let's always return the passed host array when a filter doesn't need …

53c6238

…to be applied

vercel bot had a problem deploying to Preview – api January 9, 2025 12:14 Failure

fix: isFixed typing in same round robin host check

5a80a2f

vercel bot had a problem deploying to Preview – api January 9, 2025 14:38 Failure

Add main bulk of rewritten logic for routed fairness support

094de7e

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

Remove console.log

ad7b4c0

emrysal commented Jan 9, 2025

View reviewed changes

vercel bot deployed to Preview – api January 9, 2025 14:58 View deployment

Add getAttributeWithEnabledWeights to AttributeRepository

4334426

vercel bot deployed to Preview – api January 10, 2025 11:39 View deployment

Add OOO entry repository

9059ea4

vercel bot deployed to Preview – api January 13, 2025 11:49 View deployment

CarinaWolli reviewed Jan 22, 2025

View reviewed changes

packages/lib/bookings/findQualifiedHosts.ts Show resolved Hide resolved

Use getOrderedListOfLuckyUsers in lead threshold filtering

3fe3de1

vercel bot deployed to Preview – api January 23, 2025 15:29 View deployment

emrysal added 2 commits January 23, 2025 15:53

Shortfall already includes weight

db20d01

test against minShortfall

032ffa0

vercel bot deployed to Preview – api January 23, 2025 16:11 View deployment

CarinaWolli reviewed Jan 23, 2025

View reviewed changes

first attempt to fix fallbacks

ae12518

fix reschedule with same rr host in handleNewBooking

0f98552

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

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

fixes for fallback slots

9806116

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

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

add more tests + small fixes for contact owner

0ea5995

vercel bot deployed to Preview – api February 6, 2025 22:44 View deployment

vercel bot deployed to Preview – cal-com-ui-playground February 6, 2025 22:45 View deployment

fix tests and type errors

59505fd

CarinaWolli reviewed Feb 6, 2025

View reviewed changes

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

vercel bot deployed to Preview – cal-com-ui-playground February 6, 2025 23:19 View deployment

CarinaWolli reviewed Feb 7, 2025

View reviewed changes

packages/lib/bookings/findQualifiedHosts.ts Outdated Show resolved Hide resolved

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

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

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

CarinaWolli marked this pull request as ready for review February 7, 2025 16:06

CarinaWolli requested a review from a team as a code owner February 7, 2025 16:06

CarinaWolli added High priority Created by Linear-GitHub Sync high-risk Requires approval by Foundation team labels Feb 7, 2025

dosubot bot added bookings area: bookings, availability, timezones, double booking routing-forms area: routing forms, routing, forms labels Feb 7, 2025

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

vercel bot deployed to Preview – dev February 7, 2025 16:39 View deployment

CarinaWolli requested a review from a team February 7, 2025 16:53

CarinaWolli added 4 commits February 26, 2025 00:33

fix end time if two weeks are cut off

1525639

add more tests for contact owner availability check

9426f34

add new logic for two weeks fallback

ebc90af

fix reschedule same RR host test

8274d1d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Fairness when routing #18550

fix: Fairness when routing #18550

emrysal commented Jan 9, 2025

emrysal Jan 9, 2025

emrysal Jan 9, 2025

vercel bot commented Jan 9, 2025 •

edited

Loading

emrysal Jan 9, 2025

CarinaWolli Jan 23, 2025

emrysal Jan 9, 2025

github-actions bot commented Jan 9, 2025 •

edited

Loading

CarinaWolli Jan 23, 2025

CarinaWolli Jan 23, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

CarinaWolli Feb 6, 2025

		@@ -1,90 +0,0 @@
		import { describe, expect, it } from "vitest";

fix: Fairness when routing #18550

Are you sure you want to change the base?

fix: Fairness when routing #18550

Conversation

emrysal commented Jan 9, 2025

What does this PR do?

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vercel bot commented Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

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

E2E results are ready!

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vercel bot commented Jan 9, 2025 •

edited

Loading

github-actions bot commented Jan 9, 2025 •

edited

Loading