From 5e6c7559d7bc5cc1dc41526f17671c4486e67463 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Thu, 3 Oct 2024 11:08:40 -0400
Subject: [PATCH 01/10] add checkbox

---
 apps/web/public/static/locales/en/common.json |  3 +-
 .../teams/pages/team-booking-limits-view.tsx  | 31 ++++++++++++++++---
 packages/lib/server/queries/teams/index.ts    |  1 +
 .../migration.sql                             |  2 ++
 packages/prisma/schema.prisma                 |  3 +-
 .../routers/viewer/teams/update.handler.ts    |  2 ++
 .../routers/viewer/teams/update.schema.ts     |  1 +
 7 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 packages/prisma/migrations/20241003145122_add_include_managed_events_in_limits_to_teams/migration.sql

diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index a95f8f683d45d8..c02af63c8c0407 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/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": "Count bookings from managed event types to limit",
   "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",
diff --git a/packages/features/ee/teams/pages/team-booking-limits-view.tsx b/packages/features/ee/teams/pages/team-booking-limits-view.tsx
index 5a8be9a29f831d..892bde1c9ea743 100644
--- a/packages/features/ee/teams/pages/team-booking-limits-view.tsx
+++ b/packages/features/ee/teams/pages/team-booking-limits-view.tsx
@@ -14,7 +14,7 @@ import { MembershipRole } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import type { IntervalLimit } from "@calcom/types/Calendar";
-import { Button, Form, SettingsToggle, showToast } from "@calcom/ui";
+import { Button, CheckboxField, Form, SettingsToggle, showToast } from "@calcom/ui";
 
 type ProfileViewProps = { team: RouterOutputs["viewer"]["teams"]["getMinimal"] };
 
@@ -22,9 +22,10 @@ const BookingLimitsView = ({ team }: ProfileViewProps) => {
   const { t } = useLocale();
   const utils = trpc.useUtils();
 
-  const form = useForm<{ bookingLimits?: IntervalLimit }>({
+  const form = useForm<{ bookingLimits?: IntervalLimit; includeManagedEventsInLimits: boolean }>({
     defaultValues: {
       bookingLimits: team?.bookingLimits || undefined,
+      includeManagedEventsInLimits: team?.includeManagedEventsInLimits ?? false,
     },
   });
 
@@ -40,7 +41,10 @@ const BookingLimitsView = ({ team }: ProfileViewProps) => {
     async onSuccess(res) {
       await utils.viewer.teams.get.invalidate();
       if (res) {
-        reset({ bookingLimits: res.bookingLimits });
+        reset({
+          bookingLimits: res.bookingLimits,
+          includeManagedEventsInLimits: res.includeManagedEventsInLimits,
+        });
       }
       showToast(t("booking_limits_updated_successfully"), "success");
     },
@@ -83,9 +87,12 @@ const BookingLimitsView = ({ team }: ProfileViewProps) => {
                         });
                       } else {
                         form.setValue("bookingLimits", {});
+                        form.setValue("includeManagedEventsInLimits", false);
                       }
                       const bookingLimits = form.getValues("bookingLimits");
-                      mutation.mutate({ bookingLimits, id: team.id });
+                      const includeManagedEventsInLimits = form.getValues("includeManagedEventsInLimits");
+
+                      mutation.mutate({ bookingLimits, includeManagedEventsInLimits, id: team.id });
                     }}
                     switchContainerClassName={classNames(
                       "border-subtle mt-6 rounded-lg border py-6 px-4 sm:px-6",
@@ -93,7 +100,21 @@ const BookingLimitsView = ({ team }: ProfileViewProps) => {
                     )}
                     childrenClassName="lg:ml-0">
                     <div className="border-subtle border border-y-0 p-6">
-                      <IntervalLimitsManager propertyName="bookingLimits" defaultLimit={1} step={1} />
+                      <Controller
+                        name="includeManagedEventsInLimits"
+                        render={({ field: { value, onChange } }) => (
+                          <CheckboxField
+                            description={t("count_managed_to_limit")}
+                            descriptionAsLabel
+                            onChange={(e) => onChange(e)}
+                            checked={value}
+                          />
+                        )}
+                      />
+
+                      <div className="pt-6">
+                        <IntervalLimitsManager propertyName="bookingLimits" defaultLimit={1} step={1} />
+                      </div>
                     </div>
                     <SectionBottomActions className="mb-6" align="end">
                       <Button disabled={isSubmitting || !isDirty} type="submit" color="primary">
diff --git a/packages/lib/server/queries/teams/index.ts b/packages/lib/server/queries/teams/index.ts
index 4d2db9dbf0fc6e..36ca68e786e713 100644
--- a/packages/lib/server/queries/teams/index.ts
+++ b/packages/lib/server/queries/teams/index.ts
@@ -299,6 +299,7 @@ export async function getMinimalTeam(args: {
       isPrivate: true,
       metadata: true,
       bookingLimits: true,
+      includeManagedEventsInLimits: true,
       parent: {
         select: {
           id: true,
diff --git a/packages/prisma/migrations/20241003145122_add_include_managed_events_in_limits_to_teams/migration.sql b/packages/prisma/migrations/20241003145122_add_include_managed_events_in_limits_to_teams/migration.sql
new file mode 100644
index 00000000000000..df485688adf693
--- /dev/null
+++ b/packages/prisma/migrations/20241003145122_add_include_managed_events_in_limits_to_teams/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Team" ADD COLUMN     "includeManagedEventsInLimits" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index f6fbae6626322f..f5df907c0f51fd 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -442,7 +442,8 @@ model Team {
   features               TeamFeatures[]
 
   /// @zod.custom(imports.intervalLimitsType)
-  bookingLimits Json?
+  bookingLimits                Json?
+  includeManagedEventsInLimits Boolean @default(false)
 
   @@unique([slug, parentId])
   @@index([parentId])
diff --git a/packages/trpc/server/routers/viewer/teams/update.handler.ts b/packages/trpc/server/routers/viewer/teams/update.handler.ts
index d75fb4dd5c60df..3df840e1c5ca8e 100644
--- a/packages/trpc/server/routers/viewer/teams/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/update.handler.ts
@@ -65,6 +65,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
     darkBrandColor: input.darkBrandColor,
     theme: input.theme,
     bookingLimits: input.bookingLimits ?? undefined,
+    includeManagedEventsInLimits: input.includeManagedEventsInLimits ?? undefined,
   };
 
   if (input.logo && input.logo.startsWith("data:image/png;base64,")) {
@@ -147,6 +148,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
     brandColor: updatedTeam.brandColor,
     darkBrandColor: updatedTeam.darkBrandColor,
     bookingLimits: updatedTeam.bookingLimits as IntervalLimit,
+    includeManagedEventsInLimits: updatedTeam.includeManagedEventsInLimits,
   };
 };
 
diff --git a/packages/trpc/server/routers/viewer/teams/update.schema.ts b/packages/trpc/server/routers/viewer/teams/update.schema.ts
index dafa3b252627b3..d894e113c26f11 100644
--- a/packages/trpc/server/routers/viewer/teams/update.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/update.schema.ts
@@ -24,6 +24,7 @@ export const ZUpdateInputSchema = z.object({
   darkBrandColor: z.string().optional(),
   theme: z.string().optional().nullable(),
   bookingLimits: intervalLimitsType.optional(),
+  includeManagedEventsInLimits: z.boolean().optional(),
 });
 
 export type TUpdateInputSchema = z.infer<typeof ZUpdateInputSchema>;

From c2227188420845001b6dfdf93bb00b9acd5adaef Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Thu, 3 Oct 2024 11:41:06 -0400
Subject: [PATCH 02/10] add logic

---
 apps/api/v1/lib/validations/team.ts           |  1 +
 .../inputs/update-organization-team.input.ts  |  4 +
 .../bookingLimits/getBusyTimesFromLimits.ts   |  2 +
 packages/core/getUserAvailability.ts          |  2 +
 packages/lib/server/repository/booking.ts     | 80 ++++++++++++-------
 5 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/apps/api/v1/lib/validations/team.ts b/apps/api/v1/lib/validations/team.ts
index b32d82f80edb7b..9a993272520779 100644
--- a/apps/api/v1/lib/validations/team.ts
+++ b/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({
diff --git a/apps/api/v2/src/modules/organizations/inputs/update-organization-team.input.ts b/apps/api/v2/src/modules/organizations/inputs/update-organization-team.input.ts
index 168f823cedafba..081c241f4d2b42 100644
--- a/apps/api/v2/src/modules/organizations/inputs/update-organization-team.input.ts
+++ b/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;
 }
diff --git a/packages/core/bookingLimits/getBusyTimesFromLimits.ts b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
index 91b2f8e16a11c2..16e18b632f382e 100644
--- a/packages/core/bookingLimits/getBusyTimesFromLimits.ts
+++ b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
@@ -231,6 +231,7 @@ const _getBusyTimesFromTeamLimits = async (
   dateFrom: Dayjs,
   dateTo: Dayjs,
   teamId: number,
+  includeMangedEvents: boolean,
   rescheduleUid?: string
 ) => {
   const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
@@ -245,6 +246,7 @@ const _getBusyTimesFromTeamLimits = async (
     startDate: limitDateFrom.toDate(),
     endDate: limitDateTo.toDate(),
     excludedUid: rescheduleUid,
+    includeMangedEvents,
   });
 
   const busyTimes = bookings.map(({ id, startTime, endTime, eventTypeId, title, userId }) => ({
diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index a703f732e68cdb..7bb4065687d09a 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -57,6 +57,7 @@ const _getEventType = async (id: number) => {
         select: {
           id: true,
           bookingLimits: true,
+          includeManagedEventsInLimits: true,
         },
       },
       hosts: {
@@ -300,6 +301,7 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           dateFrom.tz(timeZone),
           dateTo.tz(timeZone),
           eventType?.team.id,
+          eventType.team.includeManagedEventsInLimits,
           initialData?.rescheduleUid ?? undefined
         )
       : [];
diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts
index c6707bb7df257b..0d81c7a000916f 100644
--- a/packages/lib/server/repository/booking.ts
+++ b/packages/lib/server/repository/booking.ts
@@ -6,6 +6,23 @@ import { BookingStatus } from "@calcom/prisma/enums";
 
 import { UserRepository } from "./user";
 
+type TeamBookingsParamsBase = {
+  user: { id: number; email: string };
+  teamId: number;
+  startDate: Date;
+  endDate: Date;
+  excludedUid?: string | null;
+  includeMangedEvents: boolean;
+};
+
+type TeamBookingsParamsWithCount = TeamBookingsParamsBase & {
+  returnCount: true;
+};
+
+type TeamBookingsParamsWithoutCount = TeamBookingsParamsBase & {
+  returnCount?: false;
+};
+
 export class BookingRepository {
   static async getBookingAttendees(bookingId: number) {
     return await prisma.attendee.findMany({
@@ -251,32 +268,16 @@ export class BookingRepository {
     });
   }
 
-  static async getAllAcceptedTeamBookingsOfUser(params: {
-    user: { id: number; email: string };
-    teamId: number;
-    startDate: Date;
-    endDate: Date;
-    excludedUid?: string | null;
-    returnCount: true;
-  }): Promise<number>;
-
-  static async getAllAcceptedTeamBookingsOfUser(params: {
-    user: { id: number; email: string };
-    teamId: number;
-    startDate: Date;
-    endDate: Date;
-    excludedUid?: string | null;
-  }): Promise<Array<Booking>>;
-
-  static async getAllAcceptedTeamBookingsOfUser(params: {
-    user: { id: number; email: string };
-    teamId: number;
-    startDate: Date;
-    endDate: Date;
-    excludedUid?: string | null;
-    returnCount?: boolean;
-  }) {
-    const { user, teamId, startDate, endDate, returnCount, excludedUid } = params;
+  static async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsWithCount): Promise<number>;
+
+  static async getAllAcceptedTeamBookingsOfUser(
+    params: TeamBookingsParamsWithoutCount
+  ): Promise<Array<Booking>>;
+
+  static async getAllAcceptedTeamBookingsOfUser(
+    params: TeamBookingsParamsWithCount | TeamBookingsParamsWithoutCount
+  ) {
+    const { user, teamId, startDate, endDate, returnCount, excludedUid, includeMangedEvents } = params;
 
     const baseWhere: Prisma.BookingWhereInput = {
       status: BookingStatus.ACCEPTED,
@@ -313,6 +314,16 @@ export class BookingRepository {
       },
     };
 
+    const whereManagedBookings: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      userId: user.id,
+      eventType: {
+        parent: {
+          teamId,
+        },
+      },
+    };
+
     if (returnCount) {
       const collectiveRoundRobinBookingsOwner = await prisma.booking.count({
         where: whereCollectiveRoundRobinOwner,
@@ -322,7 +333,12 @@ export class BookingRepository {
         where: whereCollectiveRoundRobinBookingsAttendee,
       });
 
-      const totalNrOfBooking = collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee;
+      const managedBookings = await prisma.booking.count({
+        where: whereManagedBookings,
+      });
+
+      const totalNrOfBooking =
+        collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee + managedBookings;
 
       return totalNrOfBooking;
     }
@@ -334,7 +350,15 @@ export class BookingRepository {
       where: whereCollectiveRoundRobinBookingsAttendee,
     });
 
-    return [...collectiveRoundRobinBookingsOwner, ...collectiveRoundRobinBookingsAttendee];
+    const managedBookings = await prisma.booking.findMany({
+      where: whereManagedBookings,
+    });
+
+    return [
+      ...collectiveRoundRobinBookingsOwner,
+      ...collectiveRoundRobinBookingsAttendee,
+      ...managedBookings,
+    ];
   }
 
   static async findOriginalRescheduledBooking(uid: string, seatsEventType?: boolean) {

From f42f703c5c25b264775f59cd41d3f12b7bfb6412 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Thu, 3 Oct 2024 11:49:32 -0400
Subject: [PATCH 03/10] improve checkbox text

---
 apps/web/public/static/locales/en/common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index c02af63c8c0407..ec911a0210912f 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1525,7 +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": "Count bookings from managed event types to limit",
+  "count_managed_to_limit": "Count bookings 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",

From 2c87556df0d198868c708d7b054ac42aafa67664 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Thu, 3 Oct 2024 12:16:58 -0400
Subject: [PATCH 04/10] include managed events for counting yearly bookings

---
 packages/core/bookingLimits/getBusyTimesFromLimits.ts | 4 ++++
 packages/lib/server/checkBookingLimits.ts             | 7 ++++++-
 packages/trpc/server/routers/viewer/slots/util.ts     | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/core/bookingLimits/getBusyTimesFromLimits.ts b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
index 16e18b632f382e..e1abe3cf0beef8 100644
--- a/packages/core/bookingLimits/getBusyTimesFromLimits.ts
+++ b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
@@ -89,6 +89,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
   eventTypeId?: number;
   teamId?: number;
   user?: { id: number; email: string };
+  includeMangedEvents?: boolean;
 }) => {
   const {
     bookings,
@@ -100,6 +101,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
     teamId,
     user,
     rescheduleUid,
+    includeMangedEvents = false,
   } = params;
 
   for (const key of descendingLimitKeys) {
@@ -123,6 +125,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
             teamId,
             user,
             rescheduleUid,
+            includeMangedEvents,
           });
         } catch (_) {
           limitManager.addBusyTime(periodStart, unit);
@@ -268,6 +271,7 @@ const _getBusyTimesFromTeamLimits = async (
     rescheduleUid,
     teamId,
     user,
+    includeMangedEvents,
   });
 
   return limitManager.getBusyTimes();
diff --git a/packages/lib/server/checkBookingLimits.ts b/packages/lib/server/checkBookingLimits.ts
index 65dbc53bde1cd4..bce82ee8386b2c 100644
--- a/packages/lib/server/checkBookingLimits.ts
+++ b/packages/lib/server/checkBookingLimits.ts
@@ -14,7 +14,8 @@ export async function checkBookingLimits(
   eventStartDate: Date,
   eventId: number,
   rescheduleUid?: string | undefined,
-  timeZone?: string | null
+  timeZone?: string | null,
+  includeManagedEvents?: boolean
 ) {
   const parsedBookingLimits = parseBookingLimit(bookingLimits);
   if (!parsedBookingLimits) return false;
@@ -28,6 +29,7 @@ export async function checkBookingLimits(
       eventId,
       timeZone,
       rescheduleUid,
+      includeManagedEvents,
     })
   );
 
@@ -47,6 +49,7 @@ export async function checkBookingLimit({
   timeZone,
   teamId,
   user,
+  includeManagedEvents = false,
 }: {
   eventStartDate: Date;
   eventId?: number;
@@ -56,6 +59,7 @@ export async function checkBookingLimit({
   timeZone?: string | null;
   teamId?: number;
   user?: { id: number; email: string };
+  includeManagedEvents?: boolean;
 }) {
   {
     const eventDateInOrganizerTz = timeZone ? dayjs(eventStartDate).tz(timeZone) : dayjs(eventStartDate);
@@ -77,6 +81,7 @@ export async function checkBookingLimit({
         endDate: endDate,
         returnCount: true,
         excludedUid: rescheduleUid,
+        includeManagedEvents,
       });
     } else {
       bookingsInPeriod = await prisma.booking.count({
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index 187666b21ad76d..a85ad32e2dcf27 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -182,6 +182,7 @@ export async function getEventType(
         select: {
           id: true,
           bookingLimits: true,
+          includeManagedEventsInLimits: true,
         },
       },
       parent: {

From 399ef286e9b3a27dcf7facd8f0386880394f93d6 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Thu, 3 Oct 2024 12:33:30 -0400
Subject: [PATCH 05/10] fix typos

---
 .../bookingLimits/getBusyTimesFromLimits.ts   | 12 +++----
 .../handleNewBooking/getEventTypesFromDB.ts   |  1 +
 packages/lib/server/repository/booking.ts     | 33 +++++++++++--------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/core/bookingLimits/getBusyTimesFromLimits.ts b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
index e1abe3cf0beef8..fca8b10d845f3b 100644
--- a/packages/core/bookingLimits/getBusyTimesFromLimits.ts
+++ b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
@@ -89,7 +89,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
   eventTypeId?: number;
   teamId?: number;
   user?: { id: number; email: string };
-  includeMangedEvents?: boolean;
+  includeManagedEvents?: boolean;
 }) => {
   const {
     bookings,
@@ -101,7 +101,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
     teamId,
     user,
     rescheduleUid,
-    includeMangedEvents = false,
+    includeManagedEvents = false,
   } = params;
 
   for (const key of descendingLimitKeys) {
@@ -125,7 +125,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
             teamId,
             user,
             rescheduleUid,
-            includeMangedEvents,
+            includeManagedEvents,
           });
         } catch (_) {
           limitManager.addBusyTime(periodStart, unit);
@@ -234,7 +234,7 @@ const _getBusyTimesFromTeamLimits = async (
   dateFrom: Dayjs,
   dateTo: Dayjs,
   teamId: number,
-  includeMangedEvents: boolean,
+  includeManagedEvents: boolean,
   rescheduleUid?: string
 ) => {
   const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
@@ -249,7 +249,7 @@ const _getBusyTimesFromTeamLimits = async (
     startDate: limitDateFrom.toDate(),
     endDate: limitDateTo.toDate(),
     excludedUid: rescheduleUid,
-    includeMangedEvents,
+    includeManagedEvents,
   });
 
   const busyTimes = bookings.map(({ id, startTime, endTime, eventTypeId, title, userId }) => ({
@@ -271,7 +271,7 @@ const _getBusyTimesFromTeamLimits = async (
     rescheduleUid,
     teamId,
     user,
-    includeMangedEvents,
+    includeManagedEvents,
   });
 
   return limitManager.getBusyTimes();
diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
index 246b6febd0300a..4f46e0f48e468f 100644
--- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
+++ b/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,
diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts
index 0d81c7a000916f..f5d03194be19e0 100644
--- a/packages/lib/server/repository/booking.ts
+++ b/packages/lib/server/repository/booking.ts
@@ -12,16 +12,15 @@ type TeamBookingsParamsBase = {
   startDate: Date;
   endDate: Date;
   excludedUid?: string | null;
-  includeMangedEvents: boolean;
+  includeManagedEvents: boolean;
+  returnCount?: boolean;
 };
 
 type TeamBookingsParamsWithCount = TeamBookingsParamsBase & {
   returnCount: true;
 };
 
-type TeamBookingsParamsWithoutCount = TeamBookingsParamsBase & {
-  returnCount?: false;
-};
+type TeamBookingsParamsWithoutCount = TeamBookingsParamsBase;
 
 export class BookingRepository {
   static async getBookingAttendees(bookingId: number) {
@@ -274,10 +273,8 @@ export class BookingRepository {
     params: TeamBookingsParamsWithoutCount
   ): Promise<Array<Booking>>;
 
-  static async getAllAcceptedTeamBookingsOfUser(
-    params: TeamBookingsParamsWithCount | TeamBookingsParamsWithoutCount
-  ) {
-    const { user, teamId, startDate, endDate, returnCount, excludedUid, includeMangedEvents } = params;
+  static async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsBase) {
+    const { user, teamId, startDate, endDate, excludedUid, returnCount, includeManagedEvents } = params;
 
     const baseWhere: Prisma.BookingWhereInput = {
       status: BookingStatus.ACCEPTED,
@@ -333,9 +330,13 @@ export class BookingRepository {
         where: whereCollectiveRoundRobinBookingsAttendee,
       });
 
-      const managedBookings = await prisma.booking.count({
-        where: whereManagedBookings,
-      });
+      let managedBookings = 0;
+
+      if (includeManagedEvents) {
+        managedBookings = await prisma.booking.count({
+          where: whereManagedBookings,
+        });
+      }
 
       const totalNrOfBooking =
         collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee + managedBookings;
@@ -350,9 +351,13 @@ export class BookingRepository {
       where: whereCollectiveRoundRobinBookingsAttendee,
     });
 
-    const managedBookings = await prisma.booking.findMany({
-      where: whereManagedBookings,
-    });
+    let managedBookings: typeof collectiveRoundRobinBookingsAttendee = [];
+
+    if (includeManagedEvents) {
+      managedBookings = await prisma.booking.findMany({
+        where: whereManagedBookings,
+      });
+    }
 
     return [
       ...collectiveRoundRobinBookingsOwner,

From 99723fd0fc01741d7c325256be6d8a66a3d775e3 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Fri, 4 Oct 2024 15:52:57 +0000
Subject: [PATCH 06/10] add test + fix existing ones

---
 .../utils/bookingScenario/bookingScenario.ts  |   8 +-
 packages/core/getUserAvailability.ts          |   4 +-
 .../global-booking-limits.test.ts             | 104 ++++++++++++++++--
 3 files changed, 105 insertions(+), 11 deletions(-)

diff --git a/apps/web/test/utils/bookingScenario/bookingScenario.ts b/apps/web/test/utils/bookingScenario/bookingScenario.ts
index 6df40668ad5d8f..63625e3d99d673 100644
--- a/apps/web/test/utils/bookingScenario/bookingScenario.ts
+++ b/apps/web/test/utils/bookingScenario/bookingScenario.ts
@@ -153,6 +153,7 @@ export type InputEventType = {
   users?: { id: number }[];
   hosts?: InputHost[];
   schedulingType?: SchedulingType;
+  parent?: { id: number };
   beforeEventBuffer?: number;
   afterEventBuffer?: number;
   teamId?: number | null;
@@ -160,6 +161,7 @@ export type InputEventType = {
     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}`,
diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index 7bb4065687d09a..57011c447b0232 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -458,8 +458,8 @@ export const getPeriodStartDatesBetween = (
 
 const _getPeriodStartDatesBetween = (dateFrom: Dayjs, dateTo: Dayjs, period: IntervalLimitUnit) => {
   const dates = [];
-  let startDate = dayjs(dateFrom).startOf(period);
-  const endDate = dayjs(dateTo).endOf(period);
+  let startDate = dayjs(dateFrom).utc().startOf(period);
+  const endDate = dayjs(dateTo).utc().endOf(period);
   while (startDate.isBefore(endDate)) {
     dates.push(startDate);
     startDate = startDate.add(1, period);
diff --git a/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts b/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts
index 44cc34066329fa..69f3c1efa4b3f5 100644
--- a/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts
@@ -85,6 +85,7 @@ describe(
                 team: {
                   id: 1,
                   bookingLimits: { PER_WEEK: 2 },
+                  includeManagedEventsInLimits: false,
                 },
                 schedulingType: SchedulingType.COLLECTIVE,
               },
@@ -101,6 +102,27 @@ describe(
                 teamId: 1,
                 schedulingType: SchedulingType.COLLECTIVE,
               },
+              {
+                id: 3,
+                slotInterval: eventLength,
+                length: eventLength,
+                hosts: [
+                  {
+                    userId: 101,
+                  },
+                ],
+                teamId: 1,
+                schedulingType: SchedulingType.MANAGED,
+              },
+              {
+                id: 4,
+                slotInterval: eventLength,
+                length: eventLength,
+                userId: 101,
+                parent: {
+                  id: 3,
+                },
+              },
             ],
             bookings: [
               {
@@ -124,6 +146,14 @@ describe(
                 startTime: `2024-08-06T04:30:00.000Z`,
                 endTime: `2024-08-06T05:00:00.000Z`,
               },
+              {
+                // managed event type doesn't count, includeManagedEventsInLimits is false
+                eventTypeId: 4,
+                userId: 101,
+                status: BookingStatus.ACCEPTED,
+                startTime: `2024-08-07T04:30:00.000Z`,
+                endTime: `2024-08-07T05:00:00.000Z`,
+              },
             ],
             organizer,
             usersApartFromOrganizer: otherTeamMembers,
@@ -175,7 +205,7 @@ describe(
           body: mockBookingData2,
         });
 
-        // this is the third team booking of this week for user 101, limit reached
+        // this is the thrid team booking of this week for user 101, limit reached
         await expect(async () => await handleNewBooking(req2)).rejects.toThrowError(
           "no_available_users_found_error"
         );
@@ -266,7 +296,7 @@ describe(
           body: mockBookingData1,
         });
 
-        // this is the second team booking of this days for user 101, limit reached
+        // this is the second team booking of this day for user 101, limit reached
         await expect(async () => await handleNewBooking(req2)).rejects.toThrowError(
           "no_available_users_found_error"
         );
@@ -288,7 +318,8 @@ describe(
                 ],
                 team: {
                   id: 1,
-                  bookingLimits: { PER_MONTH: 3 },
+                  bookingLimits: { PER_MONTH: 4 },
+                  includeManagedEventsInLimits: true,
                 },
                 schedulingType: SchedulingType.COLLECTIVE,
               },
@@ -305,6 +336,27 @@ describe(
                 teamId: 1,
                 schedulingType: SchedulingType.COLLECTIVE,
               },
+              {
+                id: 3,
+                slotInterval: eventLength,
+                length: eventLength,
+                hosts: [
+                  {
+                    userId: 101,
+                  },
+                ],
+                teamId: 1,
+                schedulingType: SchedulingType.MANAGED,
+              },
+              {
+                id: 4,
+                slotInterval: eventLength,
+                length: eventLength,
+                userId: 101,
+                parent: {
+                  id: 3,
+                },
+              },
             ],
             bookings: [
               {
@@ -321,6 +373,14 @@ describe(
                 startTime: `2024-08-22T03:30:00.000Z`,
                 endTime: `2024-08-22T04:00:00.000Z`,
               },
+              {
+                //managed event type also counts towards limits
+                eventTypeId: 4,
+                userId: 101,
+                status: BookingStatus.ACCEPTED,
+                startTime: `2024-08-15T03:30:00.000Z`,
+                endTime: `2024-08-15T04:00:00.000Z`,
+              },
             ],
             organizer,
             usersApartFromOrganizer: otherTeamMembers,
@@ -369,10 +429,10 @@ describe(
 
         const { req: req2 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingData2,
         });
 
-        // this is the second team booking of this days for user 101, limit reached
+        // this is the firth team booking (incl. managed) of this month for user 101, limit reached
         await expect(async () => await handleNewBooking(req2)).rejects.toThrowError(
           "no_available_users_found_error"
         );
@@ -394,7 +454,8 @@ describe(
                 ],
                 team: {
                   id: 1,
-                  bookingLimits: { PER_YEAR: 2 },
+                  bookingLimits: { PER_YEAR: 3 },
+                  includeManagedEventsInLimits: true,
                 },
                 schedulingType: SchedulingType.COLLECTIVE,
               },
@@ -411,6 +472,27 @@ describe(
                 teamId: 1,
                 schedulingType: SchedulingType.COLLECTIVE,
               },
+              {
+                id: 3,
+                slotInterval: eventLength,
+                length: eventLength,
+                hosts: [
+                  {
+                    userId: 101,
+                  },
+                ],
+                teamId: 1,
+                schedulingType: SchedulingType.MANAGED,
+              },
+              {
+                id: 4,
+                slotInterval: eventLength,
+                length: eventLength,
+                userId: 101,
+                parent: {
+                  id: 3,
+                },
+              },
             ],
             bookings: [
               {
@@ -418,6 +500,13 @@ describe(
                 userId: 101,
                 status: BookingStatus.ACCEPTED,
                 startTime: `2024-02-03T03:30:00.000Z`,
+                endTime: `2024-02-03T04:00:00.000Z`,
+              },
+              {
+                eventTypeId: 4,
+                userId: 101,
+                status: BookingStatus.ACCEPTED,
+                startTime: `2024-08-03T03:30:00.000Z`,
                 endTime: `2024-08-03T04:00:00.000Z`,
               },
             ],
@@ -468,10 +557,9 @@ describe(
 
         const { req: req2 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingData2,
         });
 
-        // this is the second team booking of this days for user 101, limit reached
         await expect(async () => await handleNewBooking(req2)).rejects.toThrowError(
           "no_available_users_found_error"
         );

From 9bff49b7b063405228d808f89194c2a0ae690784 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Fri, 4 Oct 2024 16:52:55 +0000
Subject: [PATCH 07/10] check for bookings limits of team from parent

---
 packages/core/getUserAvailability.ts          | 22 +++++++++++++++----
 .../handleNewBooking/getEventTypesFromDB.ts   |  6 +++++
 .../trpc/server/routers/viewer/slots/util.ts  |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index 57011c447b0232..1cf75047c3cc57 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -53,6 +53,16 @@ const _getEventType = async (id: number) => {
       id: true,
       seatsPerTimeSlot: true,
       bookingLimits: true,
+      parent: {
+        select: {
+          team: {
+            select: {
+              bookingLimits: true,
+              includeManagedEventsInLimits: true,
+            },
+          },
+        },
+      },
       team: {
         select: {
           id: true,
@@ -291,17 +301,21 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
         )
       : [];
 
-  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,
-          eventType.team.includeManagedEventsInLimits,
+          teamForBookingLimits.id,
+          teamForBookingLimits.includeManagedEventsInLimits,
           initialData?.rescheduleUid ?? undefined
         )
       : [];
diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
index 4f46e0f48e468f..d4ca6270adbf00 100644
--- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
+++ b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
@@ -74,6 +74,12 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
       parent: {
         select: {
           teamId: true,
+          team: {
+            select: {
+              bookingLimits: true,
+              includeManagedEventsInLimits: true,
+            },
+          },
         },
       },
       useEventTypeDestinationCalendarEmail: true,
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index a85ad32e2dcf27..f930ce309c119c 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -191,6 +191,7 @@ export async function getEventType(
             select: {
               id: true,
               bookingLimits: true,
+              includeManagedEventsInLimits: true,
             },
           },
         },

From d9c7c0ccc7ef1f0852a084d9797f9250229be915 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Fri, 4 Oct 2024 17:09:07 +0000
Subject: [PATCH 08/10] add id to select

---
 packages/core/getUserAvailability.ts                             | 1 +
 .../bookings/lib/handleNewBooking/getEventTypesFromDB.ts         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index 1cf75047c3cc57..557f96285709b0 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -57,6 +57,7 @@ const _getEventType = async (id: number) => {
         select: {
           team: {
             select: {
+              id: true,
               bookingLimits: true,
               includeManagedEventsInLimits: true,
             },
diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
index d4ca6270adbf00..68b9f31bf224d7 100644
--- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
+++ b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
@@ -76,6 +76,7 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
           teamId: true,
           team: {
             select: {
+              id: true,
               bookingLimits: true,
               includeManagedEventsInLimits: true,
             },

From a1b9ccf1f1bf5046ffabf74b4531a0682333f436 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Fri, 4 Oct 2024 20:53:51 +0000
Subject: [PATCH 09/10] pass timezone as param

---
 packages/core/bookingLimits/getBusyTimesFromLimits.ts |  9 ++++++++-
 packages/core/getUserAvailability.ts                  | 11 +++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/core/bookingLimits/getBusyTimesFromLimits.ts b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
index fca8b10d845f3b..209af2b0ccbe05 100644
--- a/packages/core/bookingLimits/getBusyTimesFromLimits.ts
+++ b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
@@ -27,6 +27,7 @@ const _getBusyTimesFromLimits = async (
   duration: number | undefined,
   eventType: NonNullable<EventType>,
   bookings: EventBusyDetails[],
+  timeZone?: string | null,
   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");
@@ -90,6 +92,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
   teamId?: number;
   user?: { id: number; email: string };
   includeManagedEvents?: boolean;
+  timeZone?: string | null;
 }) => {
   const {
     bookings,
@@ -102,6 +105,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
     user,
     rescheduleUid,
     includeManagedEvents = false,
+    timeZone,
   } = params;
 
   for (const key of descendingLimitKeys) {
@@ -126,6 +130,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
             user,
             rescheduleUid,
             includeManagedEvents,
+            timeZone,
           });
         } catch (_) {
           limitManager.addBusyTime(periodStart, unit);
@@ -235,7 +240,8 @@ const _getBusyTimesFromTeamLimits = async (
   dateTo: Dayjs,
   teamId: number,
   includeManagedEvents: boolean,
-  rescheduleUid?: string
+  rescheduleUid?: string,
+  timeZone?: string | null
 ) => {
   const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
     dateFrom.toISOString(),
@@ -272,6 +278,7 @@ const _getBusyTimesFromTeamLimits = async (
     teamId,
     user,
     includeManagedEvents,
+    timeZone,
   });
 
   return limitManager.getBusyTimes();
diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index 557f96285709b0..f7f00dc782a9b4 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -298,7 +298,8 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           duration,
           eventType,
           initialData?.busyTimesFromLimitsBookings ?? [],
-          initialData?.rescheduleUid ?? undefined
+          initialData?.rescheduleUid ?? undefined,
+          timeZone
         )
       : [];
 
@@ -317,7 +318,8 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           dateTo.tz(timeZone),
           teamForBookingLimits.id,
           teamForBookingLimits.includeManagedEventsInLimits,
-          initialData?.rescheduleUid ?? undefined
+          initialData?.rescheduleUid ?? undefined,
+          timeZone
         )
       : [];
 
@@ -473,8 +475,9 @@ export const getPeriodStartDatesBetween = (
 
 const _getPeriodStartDatesBetween = (dateFrom: Dayjs, dateTo: Dayjs, period: IntervalLimitUnit) => {
   const dates = [];
-  let startDate = dayjs(dateFrom).utc().startOf(period);
-  const endDate = dayjs(dateTo).utc().endOf(period);
+  let startDate = dayjs(dateFrom).startOf(period);
+  const endDate = dayjs(dateTo).endOf(period);
+
   while (startDate.isBefore(endDate)) {
     dates.push(startDate);
     startDate = startDate.add(1, period);

From 537887c5216c20eb67edb597d64661a125e837d3 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Mon, 7 Oct 2024 02:52:49 +0000
Subject: [PATCH 10/10] implement feedback

---
 apps/web/public/static/locales/en/common.json |  2 +-
 .../bookingLimits/getBusyTimesFromLimits.ts   |  6 ++--
 packages/core/getUserAvailability.ts          |  8 ++---
 .../global-booking-limits.test.ts             | 34 +++++++++----------
 packages/lib/server/checkBookingLimits.ts     |  2 +-
 packages/lib/server/repository/booking.ts     |  8 ++---
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index ec911a0210912f..2653ac698d0b16 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1525,7 +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": "Count bookings from managed event types",
+  "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",
diff --git a/packages/core/bookingLimits/getBusyTimesFromLimits.ts b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
index 209af2b0ccbe05..2053d33bbff3bc 100644
--- a/packages/core/bookingLimits/getBusyTimesFromLimits.ts
+++ b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
@@ -27,7 +27,7 @@ const _getBusyTimesFromLimits = async (
   duration: number | undefined,
   eventType: NonNullable<EventType>,
   bookings: EventBusyDetails[],
-  timeZone?: string | null,
+  timeZone: string,
   rescheduleUid?: string
 ) => {
   performance.mark("limitsStart");
@@ -240,8 +240,8 @@ const _getBusyTimesFromTeamLimits = async (
   dateTo: Dayjs,
   teamId: number,
   includeManagedEvents: boolean,
-  rescheduleUid?: string,
-  timeZone?: string | null
+  timeZone: string,
+  rescheduleUid?: string
 ) => {
   const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
     dateFrom.toISOString(),
diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index f7f00dc782a9b4..4562bb90080148 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -298,8 +298,8 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           duration,
           eventType,
           initialData?.busyTimesFromLimitsBookings ?? [],
-          initialData?.rescheduleUid ?? undefined,
-          timeZone
+          timeZone,
+          initialData?.rescheduleUid ?? undefined
         )
       : [];
 
@@ -318,8 +318,8 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           dateTo.tz(timeZone),
           teamForBookingLimits.id,
           teamForBookingLimits.includeManagedEventsInLimits,
-          initialData?.rescheduleUid ?? undefined,
-          timeZone
+          timeZone,
+          initialData?.rescheduleUid ?? undefined
         )
       : [];
 
diff --git a/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts b/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts
index 69f3c1efa4b3f5..c37181e28d81bb 100644
--- a/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/global-booking-limits.test.ts
@@ -160,7 +160,7 @@ describe(
           })
         );
 
-        const mockBookingData1 = getMockRequestDataForBooking({
+        const mockBookingWithinLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-08T04:00:00.000Z`,
             end: `2024-08-08T04:30:00.000Z`,
@@ -175,7 +175,7 @@ describe(
 
         const { req: req1 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingWithinLimit,
         });
 
         const createdBooking = await handleNewBooking(req1);
@@ -187,7 +187,7 @@ describe(
           })
         );
 
-        const mockBookingData2 = getMockRequestDataForBooking({
+        const mockBookingAboveLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-08T04:00:00.000Z`,
             end: `2024-08-08T04:30:00.000Z`,
@@ -202,10 +202,10 @@ describe(
 
         const { req: req2 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData2,
+          body: mockBookingAboveLimit,
         });
 
-        // this is the thrid team booking of this week for user 101, limit reached
+        // this is the third team booking of this week for user 101, limit reached
         await expect(async () => await handleNewBooking(req2)).rejects.toThrowError(
           "no_available_users_found_error"
         );
@@ -251,7 +251,7 @@ describe(
           })
         );
 
-        const mockBookingData1 = getMockRequestDataForBooking({
+        const mockBookingWithinLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-07T04:30:00.000Z`,
             end: `2024-08-07T05:00:00.000Z`,
@@ -266,7 +266,7 @@ describe(
 
         const { req: req1 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingWithinLimit,
         });
 
         const createdBooking = await handleNewBooking(req1);
@@ -278,7 +278,7 @@ describe(
           })
         );
 
-        const mockBookingData2 = getMockRequestDataForBooking({
+        const mockBookingAboveLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-07T04:00:00.000Z`,
             end: `2024-08-07T04:30:00.000Z`,
@@ -293,7 +293,7 @@ describe(
 
         const { req: req2 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingAboveLimit,
         });
 
         // this is the second team booking of this day for user 101, limit reached
@@ -387,7 +387,7 @@ describe(
           })
         );
 
-        const mockBookingData1 = getMockRequestDataForBooking({
+        const mockBookingWithinLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-29T04:30:00.000Z`,
             end: `2024-08-29T05:00:00.000Z`,
@@ -402,7 +402,7 @@ describe(
 
         const { req: req1 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingWithinLimit,
         });
 
         const createdBooking = await handleNewBooking(req1);
@@ -414,7 +414,7 @@ describe(
           })
         );
 
-        const mockBookingData2 = getMockRequestDataForBooking({
+        const mockBookingAboveLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-25T04:00:00.000Z`,
             end: `2024-08-25T04:30:00.000Z`,
@@ -429,7 +429,7 @@ describe(
 
         const { req: req2 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData2,
+          body: mockBookingAboveLimit,
         });
 
         // this is the firth team booking (incl. managed) of this month for user 101, limit reached
@@ -515,7 +515,7 @@ describe(
           })
         );
 
-        const mockBookingData1 = getMockRequestDataForBooking({
+        const mockBookingWithinLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-08-29T04:30:00.000Z`,
             end: `2024-08-29T05:00:00.000Z`,
@@ -530,7 +530,7 @@ describe(
 
         const { req: req1 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData1,
+          body: mockBookingWithinLimit,
         });
 
         const createdBooking = await handleNewBooking(req1);
@@ -542,7 +542,7 @@ describe(
           })
         );
 
-        const mockBookingData2 = getMockRequestDataForBooking({
+        const mockBookingAboveLimit = getMockRequestDataForBooking({
           data: {
             start: `2024-11-25T04:00:00.000Z`,
             end: `2024-11-25T04:30:00.000Z`,
@@ -557,7 +557,7 @@ describe(
 
         const { req: req2 } = createMockNextJsRequest({
           method: "POST",
-          body: mockBookingData2,
+          body: mockBookingAboveLimit,
         });
 
         await expect(async () => await handleNewBooking(req2)).rejects.toThrowError(
diff --git a/packages/lib/server/checkBookingLimits.ts b/packages/lib/server/checkBookingLimits.ts
index bce82ee8386b2c..ff951d5ee6ef00 100644
--- a/packages/lib/server/checkBookingLimits.ts
+++ b/packages/lib/server/checkBookingLimits.ts
@@ -79,7 +79,7 @@ export async function checkBookingLimit({
         teamId,
         startDate: startDate,
         endDate: endDate,
-        returnCount: true,
+        shouldReturnCount: true,
         excludedUid: rescheduleUid,
         includeManagedEvents,
       });
diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts
index f5d03194be19e0..27713f7d1e71d3 100644
--- a/packages/lib/server/repository/booking.ts
+++ b/packages/lib/server/repository/booking.ts
@@ -13,11 +13,11 @@ type TeamBookingsParamsBase = {
   endDate: Date;
   excludedUid?: string | null;
   includeManagedEvents: boolean;
-  returnCount?: boolean;
+  shouldReturnCount?: boolean;
 };
 
 type TeamBookingsParamsWithCount = TeamBookingsParamsBase & {
-  returnCount: true;
+  shouldReturnCount: true;
 };
 
 type TeamBookingsParamsWithoutCount = TeamBookingsParamsBase;
@@ -274,7 +274,7 @@ export class BookingRepository {
   ): Promise<Array<Booking>>;
 
   static async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsBase) {
-    const { user, teamId, startDate, endDate, excludedUid, returnCount, includeManagedEvents } = params;
+    const { user, teamId, startDate, endDate, excludedUid, shouldReturnCount, includeManagedEvents } = params;
 
     const baseWhere: Prisma.BookingWhereInput = {
       status: BookingStatus.ACCEPTED,
@@ -321,7 +321,7 @@ export class BookingRepository {
       },
     };
 
-    if (returnCount) {
+    if (shouldReturnCount) {
       const collectiveRoundRobinBookingsOwner = await prisma.booking.count({
         where: whereCollectiveRoundRobinOwner,
       });