feat: checkbox to count managed events for team-wide limits

apps/api/v1/lib/validations/team.ts

@@ -11,6 +11,7 @@ export const schemaTeamBaseBodyParams = Team.omit({ id: true, createdAt: true })
   smsLockState: true,
   smsLockReviewedByAdmin: true,
   bookingLimits: true,
+  includeManagedEventsInLimits: true,
 });
 
 const schemaTeamRequiredParams = z.object({

apps/api/v2/src/modules/organizations/inputs/update-organization-team.input.ts

@@ -76,4 +76,8 @@ export class UpdateOrgTeamDto {
   @IsOptional()
   @IsString()
   readonly bookingLimits?: string;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly includeManagedEventsInLimits?: boolean;
 }

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

@@ -1525,6 +1525,7 @@
   "workflow_example_4": "Send email reminder 1 hour before events starts to attendee",
   "workflow_example_5": "Send custom email when event is rescheduled to host",
   "workflow_example_6": "Send custom SMS when new event is booked to host",
+  "count_managed_to_limit": "Include booking counts from managed event types",
   "welcome_to_cal_header": "Welcome to {{appName}}!",
   "edit_form_later_subtitle": "You’ll be able to edit this later.",
   "connect_calendar_later": "I'll connect my calendar later",
@@ -2622,7 +2623,7 @@
   "disable_input_if_prefilled": "Disable input if the URL identifier is prefilled",
   "booking_limits": "Booking Limits",
   "booking_limits_team_description": "Booking limits for team members across all team event types",
-  "limit_team_booking_frequency_description": "Limit how many times members can be booked across all team event types (collective and round-robin)",
+  "limit_team_booking_frequency_description": "Limit how many times members can be booked across all team event types",
   "booking_limits_updated_successfully": "Booking limits updated successfully",
   "you_are_unauthorized_to_make_this_change_to_the_booking": "You are unauthorized to make this change to the booking",
   "hide_calendar_event_details": "Hide calendar event details on shared calendars",

apps/web/test/utils/bookingScenario/bookingScenario.ts

@@ -153,13 +153,15 @@ export type InputEventType = {
   users?: { id: number }[];
   hosts?: InputHost[];
   schedulingType?: SchedulingType;
+  parent?: { id: number };
   beforeEventBuffer?: number;
   afterEventBuffer?: number;
   teamId?: number | null;
   team?: {
     id?: number | null;
     parentId?: number | null;
     bookingLimits?: IntervalLimit;
+    includeManagedEventsInLimits?: boolean;
   };
   requiresConfirmation?: boolean;
   destinationCalendar?: Prisma.DestinationCalendarCreateInput;
@@ -246,7 +248,7 @@ export async function addEventTypesToDb(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     schedule?: any;
     metadata?: any;
-    team?: { id?: number | null; bookingLimits?: IntervalLimit };
+    team?: { id?: number | null; bookingLimits?: IntervalLimit; includeManagedEventsInLimits?: boolean };
   })[]
 ) {
   log.silly("TestData: Add EventTypes to DB", JSON.stringify(eventTypes));
@@ -292,6 +294,7 @@ export async function addEventTypesToDb(
         data: {
           id: eventType.team?.id,
           bookingLimits: eventType.team?.bookingLimits,
+          includeManagedEventsInLimits: eventType.team?.includeManagedEventsInLimits,
           name: "",
         },
       });
@@ -323,6 +326,7 @@ export async function addEventTypes(eventTypes: InputEventType[], usersStore: In
     beforeEventBuffer: 0,
     afterEventBuffer: 0,
     bookingLimits: {},
+    includeManagedEventsInLimits: false,
     schedulingType: null,
     length: 15,
     //TODO: What is the purpose of periodStartDate and periodEndDate? Test these?
@@ -378,6 +382,7 @@ export async function addEventTypes(eventTypes: InputEventType[], usersStore: In
         : eventType.schedule,
       owner: eventType.owner ? { connect: { id: eventType.owner } } : undefined,
       schedulingType: eventType.schedulingType,
+      parent: eventType.parent ? { connect: { id: eventType.parent.id } } : undefined,
       rescheduleWithSameRoundRobinHost: eventType.rescheduleWithSameRoundRobinHost,
     };
   });
@@ -1285,6 +1290,7 @@ export function getScenarioData(
           id: eventType.teamId ?? eventType.team?.id,
           parentId: org ? org.id : null,
           bookingLimits: eventType?.team?.bookingLimits,
+          includeManagedEventsInLimits: eventType?.team?.includeManagedEventsInLimits,
         },
         title: `Test Event Type - ${index + 1}`,
         description: `It's a test event type - ${index + 1}`,

packages/core/bookingLimits/getBusyTimesFromLimits.ts

@@ -27,6 +27,7 @@ const _getBusyTimesFromLimits = async (
   duration: number | undefined,
   eventType: NonNullable<EventType>,
   bookings: EventBusyDetails[],
+  timeZone: string,
   rescheduleUid?: string
 ) => {
   performance.mark("limitsStart");
@@ -45,6 +46,7 @@ const _getBusyTimesFromLimits = async (
       eventTypeId: eventType.id,
       limitManager,
       rescheduleUid,
+      timeZone,
     });
     performance.mark("bookingLimitsEnd");
     performance.measure(`checking booking limits took $1'`, "bookingLimitsStart", "bookingLimitsEnd");
@@ -89,6 +91,8 @@ const _getBusyTimesFromBookingLimits = async (params: {
   eventTypeId?: number;
   teamId?: number;
   user?: { id: number; email: string };
+  includeManagedEvents?: boolean;
+  timeZone?: string | null;
 }) => {
   const {
     bookings,
@@ -100,6 +104,8 @@ const _getBusyTimesFromBookingLimits = async (params: {
     teamId,
     user,
     rescheduleUid,
+    includeManagedEvents = false,
+    timeZone,
   } = params;
 
   for (const key of descendingLimitKeys) {
@@ -123,6 +129,8 @@ const _getBusyTimesFromBookingLimits = async (params: {
             teamId,
             user,
             rescheduleUid,
+            includeManagedEvents,
+            timeZone,
           });
         } catch (_) {
           limitManager.addBusyTime(periodStart, unit);
@@ -231,6 +239,8 @@ const _getBusyTimesFromTeamLimits = async (
   dateFrom: Dayjs,
   dateTo: Dayjs,
   teamId: number,
+  includeManagedEvents: boolean,
+  timeZone: string,
   rescheduleUid?: string
 ) => {
   const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
@@ -245,6 +255,7 @@ const _getBusyTimesFromTeamLimits = async (
     startDate: limitDateFrom.toDate(),
     endDate: limitDateTo.toDate(),
     excludedUid: rescheduleUid,
+    includeManagedEvents,
   });
 
   const busyTimes = bookings.map(({ id, startTime, endTime, eventTypeId, title, userId }) => ({
@@ -266,6 +277,8 @@ const _getBusyTimesFromTeamLimits = async (
     rescheduleUid,
     teamId,
     user,
+    includeManagedEvents,
+    timeZone,
   });
 
   return limitManager.getBusyTimes();

packages/core/getUserAvailability.ts

@@ -53,10 +53,22 @@ const _getEventType = async (id: number) => {
       id: true,
       seatsPerTimeSlot: true,
       bookingLimits: true,
+      parent: {
+        select: {
+          team: {
+            select: {
+              id: true,
+              bookingLimits: true,
+              includeManagedEventsInLimits: true,
+            },
+          },
+        },
+      },
       team: {
         select: {
           id: true,
           bookingLimits: true,
+          includeManagedEventsInLimits: true,
         },
       },
       hosts: {
@@ -286,20 +298,27 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           duration,
           eventType,
           initialData?.busyTimesFromLimitsBookings ?? [],
+          timeZone,
           initialData?.rescheduleUid ?? undefined
         )
       : [];
 
-  const teamBookingLimits = parseBookingLimit(eventType?.team?.bookingLimits);
+  const teamForBookingLimits =
+    eventType?.team ??
+    (eventType?.parent?.team?.includeManagedEventsInLimits ? eventType?.parent?.team : null);
+
+  const teamBookingLimits = parseBookingLimit(teamForBookingLimits?.bookingLimits);
 
   const busyTimesFromTeamLimits =
-    eventType?.team && teamBookingLimits
+    teamForBookingLimits && teamBookingLimits
       ? await getBusyTimesFromTeamLimits(
           user,
           teamBookingLimits,
           dateFrom.tz(timeZone),
           dateTo.tz(timeZone),
-          eventType?.team.id,
+          teamForBookingLimits.id,
+          teamForBookingLimits.includeManagedEventsInLimits,
+          timeZone,
           initialData?.rescheduleUid ?? undefined
         )
       : [];
@@ -458,6 +477,7 @@ const _getPeriodStartDatesBetween = (dateFrom: Dayjs, dateTo: Dayjs, period: Int
   const dates = [];
   let startDate = dayjs(dateFrom).startOf(period);
   const endDate = dayjs(dateTo).endOf(period);
+
   while (startDate.isBefore(endDate)) {
     dates.push(startDate);
     startDate = startDate.add(1, period);

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

@@ -36,6 +36,7 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
           name: true,
           parentId: true,
           bookingLimits: true,
+          includeManagedEventsInLimits: true,
         },
       },
       bookingFields: true,
@@ -73,6 +74,13 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
       parent: {
         select: {
           teamId: true,
+          team: {
+            select: {
+              id: true,
+              bookingLimits: true,
+              includeManagedEventsInLimits: true,
+            },
+          },
         },
       },
       useEventTypeDestinationCalendarEmail: true,