feat: Multiple Round Robin Host Selection

apps/web/playwright/multiple-rr-hosts.e2e.ts

@@ -0,0 +1,102 @@
+import { expect } from "@playwright/test";
+
+import { test } from "./lib/fixtures";
+import { selectFirstAvailableTimeSlotNextMonth, bookTimeSlot } from "./lib/testUtils";
+import { submitAndWaitForResponse } from "./lib/testUtils";
+
+test.describe.configure({ mode: "parallel" });
+
+test.describe("Team Availability", () => {
+  test.beforeEach(async ({ users }) => {
+    const teamMatesObj = [
+      { name: "teammate-1" },
+      { name: "teammate-2" },
+      { name: "teammate-3" },
+      { name: "teammate-4" },
+    ];
+
+    const owner = await users.create(
+      { username: "pro-user", name: "pro-user" },
+      {
+        hasTeam: true,
+        teammates: teamMatesObj,
+      }
+    );
+
+    await owner.apiLogin();
+  });
+
+  test.afterEach(async ({ users }) => {
+    await users.deleteAll();
+  });
+
+  test("success booking with multiple hosts", async ({ page, users }) => {
+    await page.goto("/event-types");
+    await expect(page).toHaveURL(/.*\/event-types/);
+
+    // creating new team round robin event
+    await page.getByTestId("new-event-type").click();
+    await page.getByTestId("option-team-1").click();
+    await page.getByTestId("event-type-quick-chat").fill("test-rr-event");
+    await page.getByLabel("Round RobinCycle meetings").click();
+    await page.getByRole("button", { name: "Continue" }).click();
+    await page.getByTestId("round-robin-multiple-hosts-toggle").click();
+
+    // setting multiple hosts count
+    await page.getByTestId("round-robin-multiple-hosts-count-input").fill("3");
+
+    // assigning all team members
+    await page.getByTestId("assign-all-team-members-toggle").click();
+
+    // updating event type
+    await submitAndWaitForResponse(page, "/api/trpc/eventTypes/update?batch=1", {
+      action: () => page.locator("[data-testid=update-eventtype]").click(),
+    });
+    const page2Promise = page.waitForEvent("popup");
+
+    // booking event
+    await page.getByTestId("preview-button").click();
+    const page2 = await page2Promise;
+
+    await selectFirstAvailableTimeSlotNextMonth(page2);
+    await bookTimeSlot(page2);
+
+    // booking success as multiple hosts count(3) is less than available hosts(4)
+    await expect(page2.getByTestId("success-page")).toBeVisible();
+  });
+
+  test("show alert if multiple hosts count is more than available hosts", async ({ page, users }) => {
+    await page.goto("/event-types");
+    await expect(page).toHaveURL(/.*\/event-types/);
+
+    // creating new team round robin event
+    await page.getByTestId("new-event-type").click();
+    await page.getByTestId("option-team-1").click();
+    await page.getByTestId("event-type-quick-chat").fill("test-rr-event");
+    await page.getByLabel("Round RobinCycle meetings").click();
+    await page.getByRole("button", { name: "Continue" }).click();
+    await page.getByTestId("round-robin-multiple-hosts-toggle").click();
+
+    // setting multiple hosts count
+    await page.getByTestId("round-robin-multiple-hosts-count-input").fill("10");
+
+    // assigning all team members
+    await page.getByTestId("assign-all-team-members-toggle").click();
+
+    // updating event type
+    await submitAndWaitForResponse(page, "/api/trpc/eventTypes/update?batch=1", {
+      action: () => page.locator("[data-testid=update-eventtype]").click(),
+    });
+    const page2Promise = page.waitForEvent("popup");
+
+    // booking event
+    await page.getByTestId("preview-button").click();
+    const page2 = await page2Promise;
+    await selectFirstAvailableTimeSlotNextMonth(page2);
+
+    // showing error alert as multiple hosts count(10) is more than available hosts(4)
+    await bookTimeSlot(page2, { expectedStatusCode: 500 });
+    await expect(page2.getByTestId("alert")).toBeVisible();
+    await expect(page2.getByTestId("alert")).toContainText("Could not book the meeting.");
+  });
+});

apps/web/public/static/locales/en/common.json

@@ -95,6 +95,7 @@
   "delete_calendar_event_error": "Unable to delete Calendar event.",
   "already_signed_up_for_this_booking_error": "You are already signed up for this booking.",
   "hosts_unavailable_for_booking": "Some of the hosts are unavailable for booking.",
+  "not_enough_available_hosts_error": "Not enough hosts are available for booking, please try another time slot.",
   "help": "Help",
   "price": "Price",
   "paid": "Paid",
@@ -321,7 +322,9 @@
   "available_apps_lower_case": "Available apps",
   "available_apps_desc": "View popular apps below and explore more in our <0>App Store</0>",
   "fixed_host_helper": "Add anyone who needs to attend the event. <0>Learn more</0>",
-  "round_robin_helper": "People in the group take turns and only one person will show up for the event.",
+  "round_robin_helper": "People in the group take turns and only one person will be assigned to the event by default.",
+  "round_robin_multiple_hosts": "Multiple Round-Robin Hosts",
+  "round_robin_multiple_hosts_description": "People in the group take turns and multiple persons will be assigned to the event.",
   "check_email_reset_password": "Check your email. We sent you a link to reset your password.",
   "finish": "Finish",
   "organization_general_description": "Manage settings for your team language and timezone",

packages/features/bookings/lib/handleNewBooking.ts

@@ -572,6 +572,7 @@ async function handler(
         },
       }),
     };
+
     if (input.bookingData.allRecurringDates && input.bookingData.isFirstRecurringSlot) {
       const isTeamEvent =
         eventType.schedulingType === SchedulingType.COLLECTIVE ||
@@ -692,7 +693,7 @@ async function handler(
 
       // loop through all non-fixed hosts and get the lucky users
       // This logic doesn't run when contactOwner is used because in that case, luckUsers.length === 1
-      while (luckyUserPool.length > 0 && luckyUsers.length < 1 /* TODO: Add variable */) {
+      while (luckyUserPool.length > 0 && luckyUsers.length < eventType.roundRobinHostsCount) {
         const freeUsers = luckyUserPool.filter(
           (user) => !luckyUsers.concat(notAvailableLuckyUsers).find((existing) => existing.id === user.id)
         );
@@ -760,6 +761,14 @@ async function handler(
           luckyUsers.push(newLuckyUser);
         }
       }
+
+      // for round robin, luckyUsers.length must be equal to eventType.roundRobinHostsCount
+      if (
+        eventType.schedulingType === SchedulingType.ROUND_ROBIN &&
+        luckyUsers.length < eventType.roundRobinHostsCount
+      ) {
+        throw new Error(ErrorCode.NotEnoughAvailableHosts);
+      }
       // ALL fixed users must be available
       if (fixedUserPool.length !== users.filter((user) => user.isFixed).length) {
         throw new Error(ErrorCode.HostsUnavailableForBooking);

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

@@ -80,6 +80,7 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
       rescheduleWithSameRoundRobinHost: true,
       assignAllTeamMembers: true,
       isRRWeightsEnabled: true,
+      roundRobinHostsCount: true,
       beforeEventBuffer: true,
       customReplyToEmail: true,
       afterEventBuffer: true,

packages/features/eventtypes/components/MultiplePrivateLinksController.tsx

@@ -5,10 +5,10 @@ import type { EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types"
 import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { generateHashedLink } from "@calcom/lib/generateHashedLink";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon } from "@calcom/ui/components/icon";
-import { showToast } from "@calcom/ui/components/toast";
 import { Button } from "@calcom/ui/components/button";
 import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
 import { Tooltip } from "@calcom/ui/components/tooltip";
 
 export const MultiplePrivateLinksController = ({

packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx

@@ -28,6 +28,7 @@ import classNames from "@calcom/ui/classNames";
 import { Label } from "@calcom/ui/components/form";
 import { Select } from "@calcom/ui/components/form";
 import { SettingsToggle } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
 import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
 
 import { EditWeightsForAllTeamMembers } from "../../EditWeightsForAllTeamMembers";
@@ -334,39 +335,70 @@ const RoundRobinHosts = ({
         </p>
       </div>
       <div className="border-subtle rounded-b-md border border-t-0 px-6 pt-4">
-        <>
-          <Controller<FormValues>
-            name="isRRWeightsEnabled"
-            render={({ field: { value: isRRWeightsEnabled, onChange } }) => (
+        <Controller<FormValues>
+          name="roundRobinHostsCount"
+          render={({ field: { value: roundRobinHostsCount, onChange } }) => (
+            <div className="pb-8">
               <SettingsToggle
-                title={t("enable_weights")}
-                description={<WeightDescription t={t} />}
-                checked={isRRWeightsEnabled}
-                switchContainerClassName={customClassNames?.enableWeights?.container}
-                labelClassName={customClassNames?.enableWeights?.label}
-                descriptionClassName={customClassNames?.enableWeights?.description}
+                title={t("round_robin_multiple_hosts")}
+                description={<p>{t("round_robin_multiple_hosts_description")}</p>}
+                checked={roundRobinHostsCount > 1}
+                switchContainerClassName=""
+                labelClassName=""
+                descriptionClassName=""
+                data-testid="round-robin-multiple-hosts-toggle"
                 onCheckedChange={(active) => {
-                  onChange(active);
-                  const rrHosts = getValues("hosts").filter((host) => !host.isFixed);
-                  const sortedRRHosts = rrHosts.sort((a, b) => sortHosts(a, b, active));
-                  setValue("hosts", sortedRRHosts);
+                  active ? onChange(2) : onChange(1);
                 }}>
-                <EditWeightsForAllTeamMembers
-                  teamMembers={teamMembers}
-                  value={value}
-                  onChange={(hosts) => {
-                    const sortedRRHosts = hosts.sort((a, b) => sortHosts(a, b, true));
-                    setValue("hosts", sortedRRHosts, { shouldDirty: true });
+                <TextField
+                  required
+                  type="number"
+                  value={roundRobinHostsCount}
+                  onChange={(e) => {
+                    let hostCount = Number(e.target.value);
+                    if (hostCount < 2) hostCount = 2;
+                    onChange(hostCount);
                   }}
-                  assignAllTeamMembers={assignAllTeamMembers}
-                  assignRRMembersUsingSegment={assignRRMembersUsingSegment}
-                  teamId={teamId}
-                  queryValue={rrSegmentQueryValue}
+                  min={2}
+                  containerClassName={classNames("max-w-80")}
+                  addOnSuffix="hosts"
+                  data-testid="round-robin-multiple-hosts-count-input"
                 />
               </SettingsToggle>
-            )}
-          />
-        </>
+            </div>
+          )}
+        />
+        <Controller<FormValues>
+          name="isRRWeightsEnabled"
+          render={({ field: { value: isRRWeightsEnabled, onChange } }) => (
+            <SettingsToggle
+              title={t("enable_weights")}
+              description={<WeightDescription t={t} />}
+              checked={isRRWeightsEnabled}
+              switchContainerClassName={customClassNames?.enableWeights?.container}
+              labelClassName={customClassNames?.enableWeights?.label}
+              descriptionClassName={customClassNames?.enableWeights?.description}
+              onCheckedChange={(active) => {
+                onChange(active);
+                const rrHosts = getValues("hosts").filter((host) => !host.isFixed);
+                const sortedRRHosts = rrHosts.sort((a, b) => sortHosts(a, b, active));
+                setValue("hosts", sortedRRHosts);
+              }}>
+              <EditWeightsForAllTeamMembers
+                teamMembers={teamMembers}
+                value={value}
+                onChange={(hosts) => {
+                  const sortedRRHosts = hosts.sort((a, b) => sortHosts(a, b, true));
+                  setValue("hosts", sortedRRHosts, { shouldDirty: true });
+                }}
+                assignAllTeamMembers={assignAllTeamMembers}
+                assignRRMembersUsingSegment={assignRRMembersUsingSegment}
+                teamId={teamId}
+                queryValue={rrSegmentQueryValue}
+              />
+            </SettingsToggle>
+          )}
+        />
         <AddMembersWithSwitch
           placeholder={t("add_a_member")}
           teamId={teamId}

packages/features/eventtypes/lib/types.ts

@@ -149,6 +149,7 @@ export type FormValues = {
   forwardParamsSuccessRedirect: boolean | null;
   secondaryEmailId?: number;
   isRRWeightsEnabled: boolean;
+  roundRobinHostsCount: number;
   maxLeadThreshold?: number;
 };
 

packages/lib/defaultEvents.ts

@@ -120,6 +120,7 @@ const commons = {
   assignRRMembersUsingSegment: false,
   rrSegmentQueryValue: null,
   isRRWeightsEnabled: false,
+  roundRobinHostsCount: 1,
   rescheduleWithSameRoundRobinHost: false,
   useEventTypeDestinationCalendarEmail: false,
   secondaryEmailId: null,

packages/lib/errorCodes.ts

@@ -17,4 +17,5 @@ export enum ErrorCode {
   UpdatingOauthClientError = "updating_oauth_client_error",
   CreatingOauthClientError = "creating_oauth_client_error",
   BookingTimeOutOfBounds = "booking_time_out_of_bounds_error",
+  NotEnoughAvailableHosts = "not_enough_available_hosts_error",
 }

packages/lib/server/repository/eventType.ts

@@ -521,6 +521,7 @@ export class EventTypeRepository {
       assignRRMembersUsingSegment: true,
       rrSegmentQueryValue: true,
       isRRWeightsEnabled: true,
+      roundRobinHostsCount: true,
       rescheduleWithSameRoundRobinHost: true,
       successRedirectUrl: true,
       forwardParamsSuccessRedirect: true,

packages/lib/test/builder.ts

@@ -144,6 +144,7 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
     profileId: null,
     secondaryEmailId: null,
     isRRWeightsEnabled: false,
+    roundRobinHostsCount: 1,
     eventTypeColor: null,
     assignRRMembersUsingSegment: false,
     rrSegmentQueryValue: null,

packages/platform/atoms/event-types/hooks/useEventTypeForm.ts

@@ -111,6 +111,7 @@ export const useEventTypeForm = ({
       autoTranslateDescriptionEnabled: eventType.autoTranslateDescriptionEnabled,
       rescheduleWithSameRoundRobinHost: eventType.rescheduleWithSameRoundRobinHost,
       assignAllTeamMembers: eventType.assignAllTeamMembers,
+      roundRobinHostsCount: eventType.roundRobinHostsCount,
       assignRRMembersUsingSegment: eventType.assignRRMembersUsingSegment,
       rrSegmentQueryValue: eventType.rrSegmentQueryValue,
       aiPhoneCallConfig: {

packages/prisma/migrations/20250419183141_init/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventType" ADD COLUMN     "roundRobinHostsCount" INTEGER DEFAULT 1;

packages/prisma/migrations/20250420132458_added_rrhostcount_field/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Made the column `roundRobinHostsCount` on table `EventType` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "EventType" ALTER COLUMN "roundRobinHostsCount" SET NOT NULL;

packages/prisma/schema.prisma

@@ -161,6 +161,7 @@ model EventType {
   useEventTypeDestinationCalendarEmail    Boolean                   @default(false)
   aiPhoneCallConfig                       AIPhoneCallConfiguration?
   isRRWeightsEnabled                      Boolean                   @default(false)
+  roundRobinHostsCount                    Int                       @default(1)
   fieldTranslations                       EventTypeTranslation[]
   maxLeadThreshold                        Int?
   selectedCalendars                       SelectedCalendar[]

packages/prisma/zod-utils.ts

@@ -663,6 +663,7 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
   requiresBookerEmailVerification: true,
   assignAllTeamMembers: true,
   isRRWeightsEnabled: true,
+  roundRobinHostsCount: true,
   eventTypeColor: true,
   allowReschedulingPastBookings: true,
   hideOrganizerEmail: true,