feat: Add option to include no shows in RR calculations (calcom#21063)

* Show distribution option for RR scheduling type

* Add `includeNoShowInRRCalculation` to event type schema

* Add `includeNoShowInRRCalculation` initial event type data

* Add FE option for `includeNoShowInRRCalculation`

* Consider `includeNoShowInRRCalculation` when building `where` clause when getting bookings for RR

* Add `includeNoShowInRRCalculation` param to `getAllBookingsForRoundRobin`

* Add `includeNoShow...` param to `GetLuckyUserParams`

* Pass `includeNoShow...` param to `getBookingsOfInterval` calls

* Add FE option for `includeNoShow...` (actual commit)

* Type fixes

* Fix brackets

* Add booking repository test

* Remove unused method

* Add translation

* Type fix

* Type fix

* Test passing

* Fix tests

* Fix tests

* Fix test

* Type fixes

Author: joeauyeung

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

@@ -3189,6 +3189,7 @@
   "routing_form_next_in_queue": "{{count}} next in queue",
   "routing_form_select_members_to_email": "Send email responses to",
   "routing_incomplete_booking_tab": "Incomplete Bookings",
+  "include_no_show_in_rr_calculation": "Include no show bookings in round robin calculations",
   "matching": "Matching",
   "event_redirect": "Event Redirect",
   "reset_form": "Reset Form",

apps/web/test/lib/handleChildrenEventTypes.test.ts

@@ -114,6 +114,8 @@ describe("handleChildrenEventTypes", () => {
         useEventTypeDestinationCalendarEmail,
         secondaryEmailId,
         autoTranslateDescriptionEnabled,
+        includeNoShowInRRCalculation,
+        instantMeetingScheduleId,
         ...evType
       } = mockFindFirstEventType({
         id: 123,
@@ -137,7 +139,6 @@ describe("handleChildrenEventTypes", () => {
           users: { connect: [{ id: 4 }] },
           lockTimeZoneToggleOnBookingPage: false,
           requiresBookerEmailVerification: false,
-          instantMeetingScheduleId: undefined,
           bookingLimits: undefined,
           durationLimits: undefined,
           recurringEvent: undefined,
@@ -170,6 +171,9 @@ describe("handleChildrenEventTypes", () => {
         lockTimeZoneToggleOnBookingPage,
         useEventTypeDestinationCalendarEmail,
         secondaryEmailId,
+        assignRRMembersUsingSegment,
+        includeNoShowInRRCalculation,
+        instantMeetingScheduleId,
         ...evType
       } = mockFindFirstEventType({
         metadata: { managedEventConfig: {} },
@@ -191,7 +195,6 @@ describe("handleChildrenEventTypes", () => {
       expect(prismaMock.eventType.update).toHaveBeenCalledWith({
         data: {
           ...rest,
-          assignRRMembersUsingSegment: undefined,
           useEventLevelSelectedCalendars: undefined,
           customReplyToEmail: null,
           rrSegmentQueryValue: undefined,
@@ -275,6 +278,9 @@ describe("handleChildrenEventTypes", () => {
         useEventTypeDestinationCalendarEmail,
         secondaryEmailId,
         autoTranslateDescriptionEnabled,
+        includeNoShowInRRCalculation,
+        instantMeetingScheduleId,
+        assignRRMembersUsingSegment,
         ...evType
       } = mockFindFirstEventType({
         id: 123,
@@ -307,7 +313,6 @@ describe("handleChildrenEventTypes", () => {
           requiresBookerEmailVerification: false,
           userId: 4,
           workflows: undefined,
-          hashedLink: undefined,
           rrSegmentQueryValue: undefined,
           assignRRMembersUsingSegment: false,
         },
@@ -332,6 +337,11 @@ describe("handleChildrenEventTypes", () => {
         lockTimeZoneToggleOnBookingPage,
         useEventTypeDestinationCalendarEmail,
         secondaryEmailId,
+        includeNoShowInRRCalculation,
+        instantMeetingScheduleId,
+        assignRRMembersUsingSegment,
+        rrSegmentQueryValue,
+        useEventLevelSelectedCalendars,
         ...evType
       } = mockFindFirstEventType({
         metadata: { managedEventConfig: {} },
@@ -354,17 +364,13 @@ describe("handleChildrenEventTypes", () => {
       expect(prismaMock.eventType.update).toHaveBeenCalledWith({
         data: {
           ...rest,
-          assignRRMembersUsingSegment: undefined,
-          useEventLevelSelectedCalendars: undefined,
-          rrSegmentQueryValue: undefined,
           customReplyToEmail: null,
           locations: [],
           hashedLink: {
             deleteMany: {},
           },
           lockTimeZoneToggleOnBookingPage: false,
           requiresBookerEmailVerification: false,
-          instantMeetingScheduleId: undefined,
         },
         where: {
           userId_parentId: {
@@ -396,6 +402,9 @@ describe("handleChildrenEventTypes", () => {
         useEventTypeDestinationCalendarEmail,
         secondaryEmailId,
         autoTranslateDescriptionEnabled,
+        includeNoShowInRRCalculation,
+        instantMeetingScheduleId,
+        assignRRMembersUsingSegment,
         ...evType
       } = mockFindFirstEventType({
         metadata: { managedEventConfig: {} },
@@ -418,10 +427,14 @@ describe("handleChildrenEventTypes", () => {
         schedulingType: SchedulingType.MANAGED,
         requiresBookerEmailVerification: false,
         lockTimeZoneToggleOnBookingPage: false,
+        lockedTimeZone: "Europe/London",
         useEventTypeDestinationCalendarEmail: false,
         workflows: [],
         parentId: 1,
         locations: [],
+        instantMeetingScheduleId: null,
+        assignRRMembersUsingSegment: false,
+        includeNoShowInRRCalculation: false,
         ...evType,
       };
 
@@ -449,7 +462,6 @@ describe("handleChildrenEventTypes", () => {
           recurringEvent: undefined,
           eventTypeColor: undefined,
           customReplyToEmail: null,
-          instantMeetingScheduleId: undefined,
           locations: [],
           lockTimeZoneToggleOnBookingPage: false,
           requiresBookerEmailVerification: false,
@@ -461,28 +473,24 @@ describe("handleChildrenEventTypes", () => {
           workflows: {
             create: [{ workflowId: 11 }],
           },
-          hashedLink: undefined,
           rrSegmentQueryValue: undefined,
           assignRRMembersUsingSegment: false,
           useEventLevelSelectedCalendars: false,
         },
       });
-      const { profileId, ...rest } = evType;
+      const { profileId, rrSegmentQueryValue, ...rest } = evType;
       if ("workflows" in rest) delete rest.workflows;
       expect(prismaMock.eventType.update).toHaveBeenCalledWith({
         data: {
           ...rest,
           locations: [],
-          assignRRMembersUsingSegment: undefined,
           useEventLevelSelectedCalendars: undefined,
           customReplyToEmail: null,
-          rrSegmentQueryValue: undefined,
           lockTimeZoneToggleOnBookingPage: false,
           requiresBookerEmailVerification: false,
           hashedLink: {
             deleteMany: {},
           },
-          instantMeetingScheduleId: undefined,
         },
         where: {
           userId_parentId: {

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

@@ -62,6 +62,7 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
       requiresConfirmationForFreeEmail: true,
       requiresBookerEmailVerification: true,
       maxLeadThreshold: true,
+      includeNoShowInRRCalculation: true,
       minimumBookingNotice: true,
       userId: true,
       price: true,

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

@@ -50,6 +50,7 @@ type EventType = Pick<
   | "isRRWeightsEnabled"
   | "rescheduleWithSameRoundRobinHost"
   | "teamId"
+  | "includeNoShowInRRCalculation"
 >;
 
 type InputProps = {

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

@@ -621,7 +621,7 @@ export const EventTeamAssignmentTab = ({
     );
   });
   const isManagedEventType = eventType.schedulingType === SchedulingType.MANAGED;
-  const { getValues, setValue } = useFormContext<FormValues>();
+  const { getValues, setValue, control } = useFormContext<FormValues>();
   const [assignAllTeamMembers, setAssignAllTeamMembers] = useState<boolean>(
     getValues("assignAllTeamMembers") ?? false
   );
@@ -632,6 +632,11 @@ export const EventTeamAssignmentTab = ({
     setAssignAllTeamMembers(false);
   };
 
+  const schedulingType = useWatch({
+    control,
+    name: "schedulingType",
+  });
+
   return (
     <div>
       {team && !isManagedEventType && (
@@ -682,44 +687,61 @@ export const EventTeamAssignmentTab = ({
               />
             </div>
           </div>
-          <div className="border-subtle mt-4 flex flex-col rounded-md">
-            <div className="border-subtle rounded-t-md border p-6 pb-5">
-              <Label className="mb-1 text-sm font-semibold">{t("rr_distribution_method")}</Label>
-              <p className="text-subtle max-w-full break-words text-sm leading-tight">
-                {t("rr_distribution_method_description")}
-              </p>
-            </div>
-            <div className="border-subtle rounded-b-md border border-t-0 p-6">
-              <Controller
-                name="maxLeadThreshold"
-                render={({ field: { value, onChange } }) => (
-                  <RadioArea.Group
-                    onValueChange={(val) => {
-                      if (val === "loadBalancing") onChange(3);
-                      else onChange(null);
-                    }}
-                    className="mt-1 flex flex-col gap-4">
-                    <RadioArea.Item
-                      value="maximizeAvailability"
-                      checked={value === null}
-                      className="w-full text-sm"
-                      classNames={{ container: "w-full" }}>
-                      <strong className="mb-1 block">{t("rr_distribution_method_availability_title")}</strong>
-                      <p>{t("rr_distribution_method_availability_description")}</p>
-                    </RadioArea.Item>
-                    <RadioArea.Item
-                      value="loadBalancing"
-                      checked={value !== null}
-                      className="text-sm"
-                      classNames={{ container: "w-full" }}>
-                      <strong className="mb-1 block">{t("rr_distribution_method_balanced_title")}</strong>
-                      <p>{t("rr_distribution_method_balanced_description")}</p>
-                    </RadioArea.Item>
-                  </RadioArea.Group>
-                )}
-              />
+          {schedulingType === "ROUND_ROBIN" && (
+            <div className="border-subtle mt-4 flex flex-col rounded-md">
+              <div className="border-subtle rounded-t-md border p-6 pb-5">
+                <Label className="mb-1 text-sm font-semibold">{t("rr_distribution_method")}</Label>
+                <p className="text-subtle max-w-full break-words text-sm leading-tight">
+                  {t("rr_distribution_method_description")}
+                </p>
+              </div>
+              <div className="border-subtle rounded-b-md border border-t-0 p-6">
+                <Controller
+                  name="maxLeadThreshold"
+                  render={({ field: { value, onChange } }) => (
+                    <RadioArea.Group
+                      onValueChange={(val) => {
+                        if (val === "loadBalancing") onChange(3);
+                        else onChange(null);
+                      }}
+                      className="mt-1 flex flex-col gap-4">
+                      <RadioArea.Item
+                        value="maximizeAvailability"
+                        checked={value === null}
+                        className="w-full text-sm"
+                        classNames={{ container: "w-full" }}>
+                        <strong className="mb-1 block">
+                          {t("rr_distribution_method_availability_title")}
+                        </strong>
+                        <p>{t("rr_distribution_method_availability_description")}</p>
+                      </RadioArea.Item>
+                      <RadioArea.Item
+                        value="loadBalancing"
+                        checked={value !== null}
+                        className="text-sm"
+                        classNames={{ container: "w-full" }}>
+                        <strong className="mb-1 block">{t("rr_distribution_method_balanced_title")}</strong>
+                        <p>{t("rr_distribution_method_balanced_description")}</p>
+                      </RadioArea.Item>
+                    </RadioArea.Group>
+                  )}
+                />
+                <div className="mt-4">
+                  <Controller
+                    name="includeNoShowInRRCalculation"
+                    render={({ field: { value, onChange } }) => (
+                      <SettingsToggle
+                        title={t("include_no_show_in_rr_calculation")}
+                        labelClassName="mt-1.5"
+                        checked={value}
+                        onCheckedChange={(val) => onChange(val)}
+                      />
+                    )}
+                  />
+                </div>
+              </div>
             </div>
-          </div>
+          )}
           <Hosts
             orgId={orgId}
             isSegmentApplicable={isSegmentApplicable}

packages/lib/bookings/filterHostsByLeadThreshold.ts

@@ -98,6 +98,7 @@ export const filterHostsByLeadThreshold = async <T extends BaseHost<BaseUser>>({
       parentId?: number | null;
       rrResetInterval: RRResetInterval | null;
     } | null;
+    includeNoShowInRRCalculation: boolean;
   };
   routingFormResponse: RoutingFormResponse | null;
 }) => {

packages/lib/bookings/findQualifiedHostsWithDelegationCredentials.ts

@@ -68,6 +68,7 @@ export const findQualifiedHostsWithDelegationCredentials = async <
     schedulingType: SchedulingType | null;
     isRRWeightsEnabled: boolean;
     rescheduleWithSameRoundRobinHost: boolean;
+    includeNoShowInRRCalculation: boolean;
   } & EventType;
   rescheduleUid: string | null;
   routedTeamMemberIds: number[];

packages/lib/defaultEvents.ts

@@ -127,6 +127,7 @@ const commons = {
   autoTranslateDescriptionEnabled: false,
   fieldTranslations: [],
   maxLeadThreshold: null,
+  includeNoShowInRRCalculation: false,
   useEventLevelSelectedCalendars: false,
   rrResetInterval: null,
   customReplyToEmail: null,

packages/lib/server/getLuckyUser.ts

@@ -67,6 +67,7 @@ interface GetLuckyUserParams<T extends PartialUser> {
     id: number;
     isRRWeightsEnabled: boolean;
     team: { parentId?: number | null; rrResetInterval: RRResetInterval | null } | null;
+    includeNoShowInRRCalculation: boolean;
   };
   // all routedTeamMemberIds or all hosts of event types
   allRRHosts: {
@@ -423,18 +424,21 @@ async function getBookingsOfInterval({
   users,
   virtualQueuesData,
   interval,
+  includeNoShowInRRCalculation,
 }: {
   eventTypeId: number;
   users: { id: number; email: string }[];
   virtualQueuesData: VirtualQueuesDataType | null;
   interval: RRResetInterval;
+  includeNoShowInRRCalculation: boolean;
 }) {
   return await BookingRepository.getAllBookingsForRoundRobin({
     eventTypeId: eventTypeId,
     users,
     startDate: getIntervalStartDate(interval),
     endDate: new Date(),
     virtualQueuesData,
+    includeNoShowInRRCalculation,
   });
 }
 
@@ -611,13 +615,15 @@ async function fetchAllDataNeededForCalculations<
       }),
       virtualQueuesData: virtualQueuesData ?? null,
       interval,
+      includeNoShowInRRCalculation: eventType.includeNoShowInRRCalculation,
     }),
 
     getBookingsOfInterval({
       eventTypeId: eventType.id,
       users: notAvailableHosts,
       virtualQueuesData: virtualQueuesData ?? null,
       interval,
+      includeNoShowInRRCalculation: eventType.includeNoShowInRRCalculation,
     }),
 
     getBookingsOfInterval({
@@ -627,6 +633,7 @@ async function fetchAllDataNeededForCalculations<
       }),
       virtualQueuesData: virtualQueuesData ?? null,
       interval,
+      includeNoShowInRRCalculation: eventType.includeNoShowInRRCalculation,
     }),
 
     prisma.host.findMany({