chore: add coderabbit config file (#23200 )

* chore: add coderabbit config file * remove wrong config * add coderabbit instructions * remove unnecessary paths * add path instructions * Fix duplicated instructions on yaml file * Fix coderabbit.yaml syntax
chore: release v5.6.3
2025-08-20 22:55:27 +00:00 · 2025-08-20 22:49:28 +00:00 · 2025-08-20 22:32:19 +00:00 · 2025-08-20 23:13:36 +01:00 · 2025-08-20 15:53:15 +00:00 · 2025-08-20 12:27:09 -03:00
85 changed files with 2667 additions and 2561 deletions
@@ -0,0 +1,187 @@
+language: en-US
+tone_instructions: ''
+early_access: false
+enable_free_tier: true
+reviews:
+  profile: chill
+  request_changes_workflow: false
+  high_level_summary: false
+  high_level_summary_placeholder: '@coderabbitai summary'
+  high_level_summary_in_walkthrough: false
+  auto_title_placeholder: '@coderabbitai'
+  auto_title_instructions: ''
+  review_status: true
+  commit_status: true
+  fail_commit_status: false
+  collapse_walkthrough: false
+  changed_files_summary: false
+  sequence_diagrams: false
+  estimate_code_review_effort: false
+  assess_linked_issues: true
+  related_issues: false
+  related_prs: true
+  suggested_labels: false
+  auto_apply_labels: false
+  suggested_reviewers: false
+  auto_assign_reviewers: false
+  poem: false
+  labeling_instructions: []
+  path_filters: 
+    - '!**/node_modules/**'
+    - '!**/dist/**'
+    - '!**/build/**' 
+    - '!**/.next/**'
+  path_instructions:
+    - path: "**/*.{ts,tsx,js,jsx}"
+      instructions: "Flag default exports and encourage named exports. Named exports provide better tree-shaking, easier refactoring, and clearer imports. Exempt main components like pages, layouts, and components that serve as the primary export of a module."
+  abort_on_close: true
+  disable_cache: false
+  auto_review:
+    enabled: true
+    auto_incremental_review: true
+    ignore_title_keywords: []
+    labels: []
+    drafts: false
+    base_branches: []
+  finishing_touches:
+    docstrings:
+      enabled: true
+    unit_tests:
+      enabled: true
+  pre_merge_checks:
+    docstrings:
+      mode: warning
+      threshold: 80
+    title:
+      mode: warning
+      requirements: ''
+    description:
+      mode: warning
+    issue_assessment:
+      mode: warning
+  tools:
+    ast-grep:
+      rule_dirs: []
+      util_dirs: []
+      essential_rules: true
+      packages: []
+    shellcheck:
+      enabled: true
+    ruff:
+      enabled: true
+    markdownlint:
+      enabled: true
+    github-checks:
+      enabled: true
+      timeout_ms: 180000
+    languagetool:
+      enabled: true
+      enabled_rules: []
+      disabled_rules: []
+      enabled_categories: []
+      disabled_categories: []
+      enabled_only: false
+      level: default
+    biome:
+      enabled: true
+    hadolint:
+      enabled: true
+    swiftlint:
+      enabled: true
+    phpstan:
+      enabled: true
+      level: default
+    phpmd:
+      enabled: true
+    phpcs:
+      enabled: true
+    golangci-lint:
+      enabled: true
+    yamllint:
+      enabled: true
+    gitleaks:
+      enabled: true
+    checkov:
+      enabled: true
+    detekt:
+      enabled: true
+    eslint:
+      enabled: true
+    flake8:
+      enabled: true
+    rubocop:
+      enabled: true
+    buf:
+      enabled: true
+    regal:
+      enabled: true
+    actionlint:
+      enabled: true
+    pmd:
+      enabled: true
+    cppcheck:
+      enabled: true
+    semgrep:
+      enabled: true
+    circleci:
+      enabled: true
+    clippy:
+      enabled: true
+    sqlfluff:
+      enabled: true
+    prismaLint:
+      enabled: true
+    pylint:
+      enabled: true
+    oxc:
+      enabled: true
+    shopifyThemeCheck:
+      enabled: true
+    luacheck:
+      enabled: true
+    brakeman:
+      enabled: true
+    dotenvLint:
+      enabled: true
+    htmlhint:
+      enabled: true
+    checkmake:
+      enabled: true
+    osvScanner:
+      enabled: true
+chat:
+  art: true
+  auto_reply: true
+  integrations:
+    jira:
+      usage: auto
+    linear:
+      usage: auto
+knowledge_base:
+  opt_out: false
+  web_search:
+    enabled: true
+  code_guidelines:
+    enabled: true
+    filePatterns: []
+  learnings:
+    scope: auto
+  issues:
+    scope: auto
+  jira:
+    usage: auto
+    project_keys: []
+  linear:
+    usage: auto
+    team_keys: []
+  pull_requests:
+    scope: auto
+  mcp:
+    usage: auto
+    disabled_servers: []
+code_generation:
+  docstrings:
+    language: en-US
+    path_instructions: []
+  unit_tests:
+    path_instructions: []
@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"
@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"
@@ -1,7 +0,0 @@
-{
-  "functions": {
-    "pages/api/slots/*.ts": {
-      "memory": 512
-    }
-  }
-}
@@ -38,7 +38,7 @@
    "@axiomhq/winston": "^1.2.0",
    "@calcom/platform-constants": "*",
    "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.314",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.318",
    "@calcom/platform-types": "*",
    "@calcom/platform-utils": "*",
    "@calcom/prisma": "*",
@@ -15,11 +15,11 @@ import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
 import { PlatformOAuthClient, Team, User } from "@prisma/client";
 import * as request from "supertest";
+import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
 import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
-import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { randomString } from "test/utils/randomString";
@@ -36,6 +36,7 @@ import {
  CreateBookingInput_2024_08_13,
  CreateEventTypeInput_2024_06_14,
  EventTypeOutput_2024_06_14,
+  GetBookingOutput_2024_08_13,
  GetBookingsOutput_2024_08_13,
 } from "@calcom/platform-types";

@@ -50,9 +51,9 @@ describe("Managed user bookings 2024-08-13", () => {
  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
  let teamRepositoryFixture: TeamRepositoryFixture;
  let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
-  let schedulesRepositoryFixture: SchedulesRepositoryFixture;
  let profilesRepositoryFixture: ProfileRepositoryFixture;
  let membershipsRepositoryFixture: MembershipRepositoryFixture;
+  let bookingsRepositoryFixture: BookingsRepositoryFixture;

  const platformAdminEmail = `managed-users-bookings-2024-08-13-admin-${randomString()}@api.com`;
  let platformAdmin: User;
@@ -67,6 +68,10 @@ describe("Managed user bookings 2024-08-13", () => {
  let thirdManagedUser: CreateManagedUserData;

  let firstManagedUserEventTypeId: number;
+  let eventTypeRequiresConfirmationId: number;
+
+  const orgAdminManagedUserEmail = `managed-user-bookings-2024-08-13-org-admin-${randomString()}@api.com`;
+  let orgAdminManagedUser: CreateManagedUserData;

  let firstManagedUserBookingsCount = 0;
  let secondManagedUserBookingsCount = 0;
@@ -85,9 +90,9 @@ describe("Managed user bookings 2024-08-13", () => {
    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
    teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
    eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
-    schedulesRepositoryFixture = new SchedulesRepositoryFixture(moduleRef);
    profilesRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
    membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+    bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);

    platformAdmin = await userRepositoryFixture.create({ email: platformAdminEmail });

@@ -95,6 +100,13 @@ describe("Managed user bookings 2024-08-13", () => {
      name: `oauth-client-users-organization-${randomString()}`,
      isPlatform: true,
      isOrganization: true,
+      platformBilling: {
+        create: {
+          customerId: "cus_999",
+          plan: "SCALE",
+          subscriptionId: "sub_999",
+        },
+      },
    });
    oAuthClient = await createOAuthClient(organization.id);

@@ -243,6 +255,59 @@ describe("Managed user bookings 2024-08-13", () => {
    thirdManagedUser = responseBody.data;
  });

+  it(`should create org admin managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: orgAdminManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Org Admin Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    orgAdminManagedUser = responseBody.data;
+
+    await request(app.getHttpServer())
+      .post(`/v2/organizations/${organization.id}/memberships`)
+      .set("x-cal-client-id", oAuthClient.id)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send({
+        userId: orgAdminManagedUser.user.id,
+        role: "ADMIN",
+        accepted: true,
+      })
+      .expect(201);
+  });
+
+  it("should create an event type requiring confirmation for first managed user", async () => {
+    const eventTypeRequiresConfirmation = await eventTypesRepositoryFixture.create(
+      {
+        title: `managed-user-bookings-event-type-requires-confirmation-${randomString()}`,
+        slug: `managed-user-bookings-event-type-requires-confirmation-${randomString()}`,
+        length: 60,
+        requiresConfirmation: true,
+      },
+      firstManagedUser.user.id
+    );
+    eventTypeRequiresConfirmationId = eventTypeRequiresConfirmation.id;
+  });
+
  describe("bookings using original emails", () => {
    it("managed user should be booked by managed user attendee and booking shows up in both users' bookings", async () => {
      const body: CreateBookingInput_2024_08_13 = {
@@ -543,10 +608,175 @@ describe("Managed user bookings 2024-08-13", () => {
    });
  });

+  describe("booking confirmation by org admin", () => {
+    it("should allow org admin managed user to confirm booking using access token", async () => {
+      const bookingRequiringConfirmation = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: firstManagedUser.user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2030, 0, 9, 13, 0, 0)),
+        endTime: new Date(Date.UTC(2030, 0, 9, 14, 0, 0)),
+        title: "Booking requiring confirmation",
+        uid: `booking-requiring-confirmation-${randomString()}`,
+        eventType: {
+          connect: {
+            id: eventTypeRequiresConfirmationId,
+          },
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        customInputs: {},
+        metadata: {},
+        status: "PENDING",
+        responses: {
+          name: secondManagedUser.user.name,
+          email: secondManagedUserEmail,
+        },
+        attendees: {
+          create: {
+            email: secondManagedUserEmail,
+            name: secondManagedUser.user.name!,
+            locale: secondManagedUser.user.locale,
+            timeZone: secondManagedUser.user.timeZone,
+          },
+        },
+      });
+
+      const response = await request(app.getHttpServer())
+        .post(`/v2/bookings/${bookingRequiringConfirmation.uid}/confirm`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${orgAdminManagedUser.accessToken}`)
+        .expect(200);
+
+      const responseBody: GetBookingOutput_2024_08_13 = response.body;
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+
+      const bookingData = responseBody.data as BookingOutput_2024_08_13;
+      expect(bookingData.status).toEqual("accepted");
+      expect(bookingData.uid).toEqual(bookingRequiringConfirmation.uid);
+
+      const confirmedBooking = await bookingsRepositoryFixture.getByUid(bookingRequiringConfirmation.uid);
+      expect(confirmedBooking?.status).toEqual("ACCEPTED");
+    });
+
+    it("should allow org admin managed user to reject booking using access token", async () => {
+      const bookingRequiringConfirmation = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: firstManagedUser.user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2030, 0, 9, 15, 0, 0)),
+        endTime: new Date(Date.UTC(2030, 0, 9, 16, 0, 0)),
+        title: "Booking requiring rejection",
+        uid: `booking-requiring-rejection-${randomString()}`,
+        eventType: {
+          connect: {
+            id: eventTypeRequiresConfirmationId,
+          },
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        customInputs: {},
+        metadata: {},
+        status: "PENDING",
+        responses: {
+          name: secondManagedUser.user.name,
+          email: secondManagedUserEmail,
+        },
+        attendees: {
+          create: {
+            email: secondManagedUserEmail,
+            name: secondManagedUser.user.name!,
+            locale: secondManagedUser.user.locale,
+            timeZone: secondManagedUser.user.timeZone,
+          },
+        },
+      });
+
+      const response = await request(app.getHttpServer())
+        .post(`/v2/bookings/${bookingRequiringConfirmation.uid}/decline`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${orgAdminManagedUser.accessToken}`)
+        .expect(200);
+
+      const responseBody: GetBookingOutput_2024_08_13 = response.body;
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+
+      const bookingData = responseBody.data as BookingOutput_2024_08_13;
+      expect(bookingData.status).toEqual("rejected");
+      expect(bookingData.uid).toEqual(bookingRequiringConfirmation.uid);
+
+      const rejectedBooking = await bookingsRepositoryFixture.getByUid(bookingRequiringConfirmation.uid);
+      expect(rejectedBooking?.status).toEqual("REJECTED");
+    });
+
+    it("should return unauthorized when org admin tries to confirm regular user's booking", async () => {
+      const regularUser = await userRepositoryFixture.create({
+        email: `managed-user-bookings-2024-08-13-regular-user-${randomString()}@api.com`,
+        name: "Regular User",
+      });
+
+      const regularUserEventType = await eventTypesRepositoryFixture.create(
+        {
+          title: `regular-user-event-type-requires-confirmation-${randomString()}`,
+          slug: `regular-user-event-type-requires-confirmation-${randomString()}`,
+          length: 60,
+          requiresConfirmation: true,
+        },
+        regularUser.id
+      );
+
+      const regularUserBooking = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: regularUser.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2030, 0, 9, 17, 0, 0)),
+        endTime: new Date(Date.UTC(2030, 0, 9, 18, 0, 0)),
+        title: "Regular user booking requiring confirmation",
+        uid: `regular-user-booking-${randomString()}`,
+        eventType: {
+          connect: {
+            id: regularUserEventType.id,
+          },
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        customInputs: {},
+        metadata: {},
+        status: "PENDING",
+        responses: {
+          name: "External Attendee",
+          email: "external@example.com",
+        },
+        attendees: {
+          create: {
+            email: "external@example.com",
+            name: "External Attendee",
+            locale: "en",
+            timeZone: "Europe/Rome",
+          },
+        },
+      });
+
+      await request(app.getHttpServer())
+        .post(`/v2/bookings/${regularUserBooking.uid}/confirm`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${orgAdminManagedUser.accessToken}`)
+        .expect(401);
+
+      await userRepositoryFixture.delete(regularUser.id);
+    });
+  });
+
  afterAll(async () => {
    await userRepositoryFixture.delete(firstManagedUser.user.id);
    await userRepositoryFixture.delete(secondManagedUser.user.id);
    await userRepositoryFixture.delete(thirdManagedUser.user.id);
+    await userRepositoryFixture.delete(orgAdminManagedUser.user.id);
    await userRepositoryFixture.delete(platformAdmin.id);
    await oauthClientRepositoryFixture.delete(oAuthClient.id);
    await teamRepositoryFixture.delete(organization.id);
@@ -702,6 +702,7 @@ export class InputBookingsService_2024_08_13 {
      beforeUpdatedDate: queryParams.beforeUpdatedAt,
      afterCreatedDate: queryParams.afterCreatedAt,
      beforeCreatedDate: queryParams.beforeCreatedAt,
+      bookingUid: queryParams.bookingUid,
    };
  }

@@ -2147,6 +2147,51 @@ describe("Event types Endpoints", () => {
        });
    });

+    describe("EventType Hidden Property", () => {
+      let createdEventTypeId: number;
+
+      it("should create an event type with hidden=true", async () => {
+        const createPayload = {
+          title: "Hidden Event",
+          slug: "hidden-event",
+          lengthInMinutes: 30,
+          hidden: true,
+        };
+
+        const response = await request(app.getHttpServer())
+          .post("/api/v2/event-types")
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+          .send(createPayload)
+          .expect(201);
+
+        const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+        const createdEventType = responseBody.data;
+        expect(createdEventType).toHaveProperty("id");
+        expect(createdEventType.title).toEqual(createPayload.title);
+        expect(createdEventType.slug).toEqual(createPayload.slug);
+        expect(createdEventType.lengthInMinutes).toEqual(createPayload.lengthInMinutes);
+        expect(createdEventType.hidden).toBe(true);
+
+        createdEventTypeId = createdEventType.id;
+      });
+
+      it("should update the hidden property to false", async () => {
+        const updatePayload = {
+          hidden: false,
+        };
+
+        const response = await request(app.getHttpServer())
+          .patch(`/api/v2/event-types/${createdEventTypeId}`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+          .send(updatePayload)
+          .expect(200);
+
+        const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+        const updatedEventType = responseBody.data;
+        +expect(updatedEventType.hidden).toBe(false);
+      });
+    });
+
    afterAll(async () => {
      await oauthClientRepositoryFixture.delete(oAuthClient.id);
      await teamRepositoryFixture.delete(organization.id);
@@ -89,6 +89,7 @@ type Input = Pick<
  | "hideCalendarEventDetails"
  | "hideOrganizerEmail"
  | "calVideoSettings"
+  | "hidden"
 >;

@Injectable()
@@ -127,6 +128,7 @@ export class OutputEventTypesService_2024_06_14 {
      hideCalendarEventDetails,
      hideOrganizerEmail,
      calVideoSettings,
+      hidden,
    } = databaseEventType;

    const locations = this.transformLocations(databaseEventType.locations);
@@ -203,6 +205,7 @@ export class OutputEventTypesService_2024_06_14 {
      hideCalendarEventDetails,
      hideOrganizerEmail,
      calVideoSettings,
+      hidden,
    };
  }

@@ -229,4 +229,19 @@ export class SchedulesRepository_2024_06_11 {
      },
    });
  }
+
+  async getSchedulesByUserIds(userIds: number[], skip: number, take: number) {
+    return this.dbRead.prisma.schedule.findMany({
+      where: {
+        userId: {
+          in: userIds,
+        },
+      },
+      include: {
+        availability: true,
+      },
+      skip,
+      take,
+    });
+  }
 }
@@ -11,6 +11,7 @@ import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/
 import { OrganizationsUsersBookingsModule } from "@/modules/organizations/users/bookings/organizations-users-bookings.module";
 import { RouterModule } from "@/modules/router/router.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
+import { TeamsSchedulesModule } from "@/modules/teams/schedules/teams-schedules.module";
 import { TimezoneModule } from "@/modules/timezones/timezones.module";
 import { VerifiedResourcesModule } from "@/modules/verified-resources/verified-resources.module";
 import type { MiddlewareConsumer, NestModule } from "@nestjs/common";
@@ -38,6 +39,7 @@ import { WebhooksModule } from "./webhooks/webhooks.module";
    OrganizationsRoutingFormsModule,
    VerifiedResourcesModule,
    RouterModule,
+    TeamsSchedulesModule,
  ],
 })
 export class EndpointsModule implements NestModule {
@@ -66,6 +66,8 @@ describe("Organizations Bookings Endpoints 2024-08-13", () => {
    let orgEventTypeId2: number;
    let nonOrgEventTypeId: number;

+    let collectiveOrgBookingUid: string;
+
    beforeAll(async () => {
      const moduleRef = await withApiAuth(
        orgUserEmail2,
@@ -91,12 +93,17 @@ describe("Organizations Bookings Endpoints 2024-08-13", () => {
      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);

      organization = await organizationsRepositoryFixture.create({ name: "organization bookings" });
+      oAuthClient = await createOAuthClient(organization.id);
      team1 = await teamRepositoryFixture.create({
        name: "team orgs booking 1",
        isOrganization: false,
        parent: { connect: { id: organization.id } },
+        createdByOAuthClient: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
      });
-      oAuthClient = await createOAuthClient(organization.id);

      nonOrgUser1 = await userRepositoryFixture.create({
        email: nonOrgUserEmail1,
@@ -315,6 +322,7 @@ describe("Organizations Bookings Endpoints 2024-08-13", () => {

            if (responseDataIsBooking(responseBody.data)) {
              const data: BookingOutput_2024_08_13 = responseBody.data;
+              collectiveOrgBookingUid = data.uid;
              expect(data.id).toBeDefined();
              expect(data.uid).toBeDefined();
              expect(data.hosts.length).toEqual(1);
@@ -669,6 +677,125 @@ describe("Organizations Bookings Endpoints 2024-08-13", () => {
            );
          });
      });
+
+      describe("get by bookingUid param", () => {
+        it("should get a specific booking by bookingUid query param", async () => {
+          return request(app.getHttpServer())
+            .get(`/v2/organizations/${organization.id}/bookings?bookingUid=${collectiveOrgBookingUid}`)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .set(X_CAL_CLIENT_ID, oAuthClient.id)
+            .set(X_CAL_SECRET_KEY, oAuthClient.secret)
+            .expect(200)
+            .then(async (response) => {
+              const responseBody: GetBookingsOutput_2024_08_13 = response.body;
+              expect(responseBody.status).toEqual(SUCCESS_STATUS);
+              expect(responseBody.data).toBeDefined();
+
+              const data: (
+                | BookingOutput_2024_08_13
+                | RecurringBookingOutput_2024_08_13
+                | GetSeatedBookingOutput_2024_08_13
+              )[] = responseBody.data;
+              expect(data.length).toEqual(1);
+              expect(responseDataIsBooking(data[0])).toBe(true);
+
+              if (responseDataIsBooking(data[0])) {
+                const booking: BookingOutput_2024_08_13 = data[0];
+                expect(booking.uid).toEqual(collectiveOrgBookingUid);
+                expect(booking.eventTypeId).toEqual(orgEventTypeId);
+                expect(booking.status).toEqual("accepted");
+                expect(booking.attendees.length).toEqual(2);
+                expect(booking.attendees[0].name).toEqual("alice");
+                expect(booking.attendees[0].email).toEqual("alice@gmail.com");
+              } else {
+                throw new Error("Expected single booking but received different response type");
+              }
+            });
+        });
+
+        it("should return empty array for non-existent booking UID query param", async () => {
+          const nonExistentUid = "non-existent-booking-uid";
+
+          return request(app.getHttpServer())
+            .get(`/v2/organizations/${organization.id}/bookings?bookingUid=${nonExistentUid}`)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .set(X_CAL_CLIENT_ID, oAuthClient.id)
+            .set(X_CAL_SECRET_KEY, oAuthClient.secret)
+            .expect(200)
+            .then(async (response) => {
+              const responseBody: GetBookingsOutput_2024_08_13 = response.body;
+              expect(responseBody.status).toEqual(SUCCESS_STATUS);
+              expect(responseBody.data).toBeDefined();
+              expect(responseBody.data.length).toEqual(0);
+            });
+        });
+
+        it("should return empty array for booking UID not belonging to the organization", async () => {
+          const regularUser = await userRepositoryFixture.create({
+            email: `org-bookings-regular-user-${Math.floor(Math.random() * 10000)}@api.com`,
+            name: "Regular User",
+          });
+
+          const regularUserEventType = await eventTypesRepositoryFixture.create(
+            {
+              title: `regular-user-event-type-${Math.floor(Math.random() * 10000)}`,
+              slug: `regular-user-event-type-${Math.floor(Math.random() * 10000)}`,
+              length: 60,
+              bookingFields: [],
+              locations: [],
+            },
+            regularUser.id
+          );
+
+          const regularUserBooking = await bookingsRepositoryFixture.create({
+            user: {
+              connect: {
+                id: regularUser.id,
+              },
+            },
+            startTime: new Date(Date.UTC(2030, 0, 15, 13, 0, 0)),
+            endTime: new Date(Date.UTC(2030, 0, 15, 14, 0, 0)),
+            title: "Regular user booking",
+            uid: `regular-user-booking-${Math.floor(Math.random() * 10000)}`,
+            eventType: {
+              connect: {
+                id: regularUserEventType.id,
+              },
+            },
+            location: "https://meet.google.com/regular-user",
+            customInputs: {},
+            metadata: {},
+            status: "ACCEPTED",
+            responses: {
+              name: "Regular Attendee",
+              email: "regular@example.com",
+            },
+            attendees: {
+              create: {
+                email: "regular@example.com",
+                name: "Regular Attendee",
+                locale: "en",
+                timeZone: "Europe/Rome",
+              },
+            },
+          });
+
+          return request(app.getHttpServer())
+            .get(`/v2/organizations/${organization.id}/bookings?bookingUid=${regularUserBooking.uid}`)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .set(X_CAL_CLIENT_ID, oAuthClient.id)
+            .set(X_CAL_SECRET_KEY, oAuthClient.secret)
+            .expect(200)
+            .then(async (response) => {
+              const responseBody: GetBookingsOutput_2024_08_13 = response.body;
+              expect(responseBody.status).toEqual(SUCCESS_STATUS);
+              expect(responseBody.data).toBeDefined();
+              expect(responseBody.data.length).toEqual(0);
+
+              await userRepositoryFixture.delete(regularUser.id);
+            });
+        });
+      });
    });

    async function createOAuthClient(organizationId: number) {
@@ -74,6 +74,7 @@ type Input = Pick<
  | "hideOrganizerEmail"
  | "team"
  | "calVideoSettings"
+  | "hidden"
 >;

@Injectable()
@@ -1,5 +1,9 @@
+import { OrganizationsEventTypesPrivateLinksController } from "@/ee/event-types-private-links/controllers/organizations-event-types-private-links.controller";
+import { EventTypesPrivateLinksModule } from "@/ee/event-types-private-links/event-types-private-links.module";
 import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
+import { InputSchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/input-schedules.service";
+import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service";
 import { AppsRepository } from "@/modules/apps/apps.repository";
 import { ConferencingRepository } from "@/modules/conferencing/repositories/conferencing.repository";
 import { ConferencingService } from "@/modules/conferencing/services/conferencing.service";
@@ -18,13 +22,10 @@ import { OrganizationAttributesService } from "@/modules/organizations/attribute
 import { OrganizationAttributeOptionRepository } from "@/modules/organizations/attributes/options/organization-attribute-options.repository";
 import { OrganizationsAttributesOptionsController } from "@/modules/organizations/attributes/options/organizations-attributes-options.controller";
 import { OrganizationAttributeOptionService } from "@/modules/organizations/attributes/options/services/organization-attributes-option.service";
-import { OrganizationsConferencingController } from "@/modules/organizations/conferencing/organizations-conferencing.controller";
 import { OrganizationsConferencingModule } from "@/modules/organizations/conferencing/organizations-conferencing.module";
 import { OrganizationsConferencingService } from "@/modules/organizations/conferencing/services/organizations-conferencing.service";
 import { OrganizationsDelegationCredentialModule } from "@/modules/organizations/delegation-credentials/organizations-delegation-credential.module";
 import { OrganizationsEventTypesController } from "@/modules/organizations/event-types/organizations-event-types.controller";
-import { EventTypesPrivateLinksModule } from "@/ee/event-types-private-links/event-types-private-links.module";
-import { OrganizationsEventTypesPrivateLinksController } from "@/ee/event-types-private-links/controllers/organizations-event-types-private-links.controller";
 import { OrganizationsEventTypesRepository } from "@/modules/organizations/event-types/organizations-event-types.repository";
 import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/event-types/pipes/team-event-types-response.transformer";
 import { InputOrganizationsEventTypesService } from "@/modules/organizations/event-types/services/input.service";
@@ -38,7 +39,6 @@ import { OrganizationsMembershipOutputService } from "@/modules/organizations/me
 import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
 import { OrganizationsOrganizationsModule } from "@/modules/organizations/organizations/organizations-organizations.module";
 import { OrganizationsSchedulesController } from "@/modules/organizations/schedules/organizations-schedules.controller";
-import { OrganizationSchedulesRepository } from "@/modules/organizations/schedules/organizations-schedules.repository";
 import { OrganizationsSchedulesService } from "@/modules/organizations/schedules/services/organizations-schedules.service";
 import { OrganizationsStripeModule } from "@/modules/organizations/stripe/organizations-stripe.module";
 import { OrganizationsStripeService } from "@/modules/organizations/stripe/services/organizations-stripe.service";
@@ -65,6 +65,7 @@ import { RedisModule } from "@/modules/redis/redis.module";
 import { RedisService } from "@/modules/redis/redis.service";
 import { StripeModule } from "@/modules/stripe/stripe.module";
 import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
+import { TeamsSchedulesService } from "@/modules/teams/schedules/services/teams-schedules.service";
 import { TeamsModule } from "@/modules/teams/teams/teams.module";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { UsersModule } from "@/modules/users/users.module";
@@ -102,7 +103,6 @@ import { Module } from "@nestjs/common";
    OrganizationsTeamsService,
    MembershipsRepository,
    OrganizationsSchedulesService,
-    OrganizationSchedulesRepository,
    OrganizationsUsersRepository,
    OrganizationsUsersService,
    EmailService,
@@ -144,6 +144,9 @@ import { Module } from "@nestjs/common";
    TeamWorkflowsService,
    WorkflowsInputService,
    WorkflowsOutputService,
+    TeamsSchedulesService,
+    SchedulesService_2024_06_11,
+    InputSchedulesService_2024_06_11,
  ],
  exports: [
    OrganizationsService,
@@ -1,5 +1,5 @@
+import { SchedulesRepository_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.repository";
 import { OutputSchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/output-schedules.service";
-import { OrganizationSchedulesRepository } from "@/modules/organizations/schedules/organizations-schedules.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";

@@ -8,8 +8,8 @@ import { ScheduleOutput_2024_06_11 } from "@calcom/platform-types";
@Injectable()
 export class OrganizationsSchedulesService {
  constructor(
-    private readonly organizationSchedulesService: OrganizationSchedulesRepository,
    private readonly outputSchedulesService: OutputSchedulesService_2024_06_11,
+    private readonly schedulesRepository: SchedulesRepository_2024_06_11,
    private readonly usersRepository: UsersRepository
  ) {}

@@ -17,7 +17,7 @@ export class OrganizationsSchedulesService {
    const users = await this.usersRepository.getOrganizationUsers(organizationId);
    const usersIds = users.map((user) => user.id);

-    const schedules = await this.organizationSchedulesService.getSchedulesByUserIds(usersIds, skip, take);
+    const schedules = await this.schedulesRepository.getSchedulesByUserIds(usersIds, skip, take);

    const responseSchedules: ScheduleOutput_2024_06_11[] = [];

@@ -14,11 +14,12 @@ import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
 import { IsUserInOrgTeam } from "@/modules/auth/guards/users/is-user-in-org-team.guard";
-import { Controller, UseGuards, Get, Param, ParseIntPipe } from "@nestjs/common";
+import { TeamsSchedulesService } from "@/modules/teams/schedules/services/teams-schedules.service";
+import { Controller, UseGuards, Get, Param, ParseIntPipe, Query } from "@nestjs/common";
 import { ApiHeader, ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";

 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import { GetSchedulesOutput_2024_06_11 } from "@calcom/platform-types";
+import { GetSchedulesOutput_2024_06_11, SkipTakePagination } from "@calcom/platform-types";

@Controller({
  path: "/v2/organizations/:orgId/teams/:teamId",
@@ -29,7 +30,31 @@ import { GetSchedulesOutput_2024_06_11 } from "@calcom/platform-types";
@ApiHeader(OPTIONAL_X_CAL_SECRET_KEY_HEADER)
@ApiHeader(OPTIONAL_API_KEY_HEADER)
 export class OrganizationsTeamsSchedulesController {
-  constructor(private schedulesService: SchedulesService_2024_06_11) {}
+  constructor(
+    private schedulesService: SchedulesService_2024_06_11,
+
+    private teamsSchedulesService: TeamsSchedulesService
+  ) {}
+
+  @UseGuards(IsTeamInOrg)
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @Get("/schedules")
+  @DocsTags("Orgs / Teams / Schedules")
+  @ApiOperation({ summary: "Get all team member schedules" })
+  async getTeamSchedules(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetSchedulesOutput_2024_06_11> {
+    const { skip, take } = queryParams;
+
+    const schedules = await this.teamsSchedulesService.getTeamSchedules(teamId, skip, take);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: schedules,
+    };
+  }

  @Roles("TEAM_ADMIN")
  @PlatformPlan("ESSENTIALS")
@@ -18,6 +18,7 @@ import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";

 import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { GetSchedulesOutput_2024_06_11 } from "@calcom/platform-types";
 import { ApiSuccessResponse, ScheduleOutput_2024_06_11 } from "@calcom/platform-types";
 import { Team, Schedule } from "@calcom/prisma/client";

@@ -36,6 +37,8 @@ describe("Organizations Teams Schedules Endpoints", () => {
    let org: Team;
    let orgTeam: Team;
    let nonOrgTeam: Team;
+
+    let userSchedule: Schedule;
    let user2Schedule: Schedule;

    const userEmail = `organizations-teams-schedules-admin-${randomString()}@api.com`;
@@ -73,6 +76,16 @@ describe("Organizations Teams Schedules Endpoints", () => {
        username: userEmail2,
      });

+      userSchedule = await scheduleRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        name: `organizations-teams-schedules-user-schedule-${randomString()}`,
+        timeZone: "America/New_York",
+      });
+
      user2Schedule = await scheduleRepositoryFixture.create({
        user: {
          connect: {
@@ -214,6 +227,32 @@ describe("Organizations Teams Schedules Endpoints", () => {
        });
    });

+    it("should get all the schedules of members in a team", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/schedules`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetSchedulesOutput_2024_06_11 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(Array.isArray(responseBody.data)).toBe(true);
+          expect(responseBody.data.length).toEqual(2);
+
+          const userOneSchedule = responseBody.data.find((schedule) => schedule.id === userSchedule.id);
+          const userTwoSchedule = responseBody.data.find((schedule) => schedule.id === user2Schedule.id);
+
+          expect(userOneSchedule).toBeDefined();
+          expect(userTwoSchedule).toBeDefined();
+
+          expect(userOneSchedule?.id).toEqual(userSchedule.id);
+          expect(userOneSchedule?.name).toEqual(userSchedule.name);
+          expect(userOneSchedule?.timeZone).toEqual(userSchedule.timeZone);
+
+          expect(userTwoSchedule?.id).toEqual(user2Schedule.id);
+          expect(userTwoSchedule?.name).toEqual(user2Schedule.name);
+          expect(userOneSchedule?.timeZone).toEqual(user2Schedule.timeZone);
+        });
+    });
+
    afterAll(async () => {
      await userRepositoryFixture.deleteByEmail(user.email);
      await userRepositoryFixture.deleteByEmail(userToInviteViaApi.email);
@@ -0,0 +1,41 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { API_KEY_OR_ACCESS_TOKEN_HEADER } from "@/lib/docs/headers";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { TeamsSchedulesService } from "@/modules/teams/schedules/services/teams-schedules.service";
+import { Controller, UseGuards, Get, Param, ParseIntPipe, Query } from "@nestjs/common";
+import { ApiHeader, ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { GetSchedulesOutput_2024_06_11, SkipTakePagination } from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/teams/:teamId/schedules",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, RolesGuard)
+@DocsTags("Teams / Schedules")
+@ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+export class TeamsSchedulesController {
+  constructor(private teamsSchedulesService: TeamsSchedulesService) {}
+
+  @Roles("TEAM_ADMIN")
+  @Get("/")
+  @ApiOperation({
+    summary: "Get all team member schedules",
+  })
+  async getTeamSchedules(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetSchedulesOutput_2024_06_11> {
+    const { skip, take } = queryParams;
+
+    const schedules = await this.teamsSchedulesService.getTeamSchedules(teamId, skip, take);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: schedules,
+    };
+  }
+}
@@ -0,0 +1,143 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { GetSchedulesOutput_2024_06_11 } from "@calcom/platform-types";
+import { Team, Schedule } from "@calcom/prisma/client";
+
+describe("Teams Schedules Endpoints", () => {
+  describe("User Authentication - User is Team Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let scheduleRepositoryFixture: SchedulesRepositoryFixture;
+
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let nonOrgTeam: Team;
+
+    let userSchedule: Schedule;
+    let user2Schedule: Schedule;
+
+    const userEmail = `teams-schedules-admin-${randomString()}@api.com`;
+    const userEmail2 = `teams-schedules-member-${randomString()}@api.com`;
+
+    let user: User;
+    let user2: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+
+      scheduleRepositoryFixture = new SchedulesRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+      user2 = await userRepositoryFixture.create({
+        email: userEmail2,
+        username: userEmail2,
+      });
+
+      userSchedule = await scheduleRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        name: `teams-schedules-user-schedule-${randomString()}`,
+        timeZone: "America/New_York",
+      });
+
+      user2Schedule = await scheduleRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user2.id,
+          },
+        },
+        name: `teams-schedules-user2-schedule-${randomString()}`,
+        timeZone: "America/New_York",
+      });
+
+      nonOrgTeam = await teamsRepositoryFixture.create({
+        name: `teams-schedules-non-org-team-${randomString()}`,
+        isOrganization: false,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: nonOrgTeam.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user2.id } },
+        team: { connect: { id: nonOrgTeam.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should get all the schedules of members in a team", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${nonOrgTeam.id}/schedules`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetSchedulesOutput_2024_06_11 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(Array.isArray(responseBody.data)).toBe(true);
+          expect(responseBody.data.length).toEqual(2);
+
+          const userOneSchedule = responseBody.data.find((schedule) => schedule.id === userSchedule.id);
+          const userTwoSchedule = responseBody.data.find((schedule) => schedule.id === user2Schedule.id);
+
+          expect(userOneSchedule).toBeDefined();
+          expect(userTwoSchedule).toBeDefined();
+
+          expect(userOneSchedule?.id).toEqual(userSchedule.id);
+          expect(userOneSchedule?.name).toEqual(userSchedule.name);
+          expect(userOneSchedule?.timeZone).toEqual(userSchedule.timeZone);
+
+          expect(userTwoSchedule?.id).toEqual(user2Schedule.id);
+          expect(userTwoSchedule?.name).toEqual(user2Schedule.name);
+          expect(userOneSchedule?.timeZone).toEqual(user2Schedule.timeZone);
+        });
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await userRepositoryFixture.deleteByEmail(user2.email);
+      await teamsRepositoryFixture.delete(nonOrgTeam.id);
+      await app.close();
+    });
+  });
+});
@@ -0,0 +1,28 @@
+import { SchedulesRepository_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.repository";
+import { OutputSchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/output-schedules.service";
+import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
+import { Injectable } from "@nestjs/common";
+
+import { ScheduleOutput_2024_06_11 } from "@calcom/platform-types";
+
+@Injectable()
+export class TeamsSchedulesService {
+  constructor(
+    private readonly teamsRepository: TeamsRepository,
+    private readonly schedulesRepository: SchedulesRepository_2024_06_11,
+    private readonly outputSchedulesService: OutputSchedulesService_2024_06_11
+  ) {}
+
+  async getTeamSchedules(teamId: number, skip = 0, take = 250) {
+    const userIds = await this.teamsRepository.getTeamUsersIds(teamId);
+    const schedules = await this.schedulesRepository.getSchedulesByUserIds(userIds, skip, take);
+
+    const responseSchedules: ScheduleOutput_2024_06_11[] = [];
+
+    for (const schedule of schedules) {
+      responseSchedules.push(await this.outputSchedulesService.getResponseSchedule(schedule));
+    }
+
+    return responseSchedules;
+  }
+}
@@ -0,0 +1,43 @@
+import { SchedulesRepository_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.repository";
+import { OutputSchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/output-schedules.service";
+import { AppsRepository } from "@/modules/apps/apps.repository";
+import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
+import { MembershipsModule } from "@/modules/memberships/memberships.module";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationSchedulesRepository } from "@/modules/organizations/schedules/organizations-schedules.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { RedisModule } from "@/modules/redis/redis.module";
+import { StripeService } from "@/modules/stripe/stripe.service";
+import { TeamsMembershipsService } from "@/modules/teams/memberships/services/teams-memberships.service";
+import { TeamsMembershipsRepository } from "@/modules/teams/memberships/teams-memberships.repository";
+import { TeamsSchedulesController } from "@/modules/teams/schedules/controllers/teams-schedules.controller";
+import { TeamsSchedulesService } from "@/modules/teams/schedules/services/teams-schedules.service";
+import { TeamsController } from "@/modules/teams/teams/controllers/teams.controller";
+import { TeamsService } from "@/modules/teams/teams/services/teams.service";
+import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule, MembershipsModule, RedisModule],
+  providers: [
+    TeamsRepository,
+    TeamsService,
+    TeamsMembershipsRepository,
+    TeamsMembershipsService,
+    OutputSchedulesService_2024_06_11,
+    OrganizationSchedulesRepository,
+    StripeService,
+    UsersRepository,
+    AppsRepository,
+    CredentialsRepository,
+    OrganizationsRepository,
+    TeamsSchedulesService,
+    OrganizationsTeamsRepository,
+    SchedulesRepository_2024_06_11,
+  ],
+  controllers: [TeamsController, TeamsSchedulesController],
+  exports: [TeamsRepository],
+})
+export class TeamsSchedulesModule {}
@@ -5,6 +5,7 @@ import { unstable_cache } from "next/cache";
 import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import prisma from "@calcom/prisma";
 import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router";

 import { TeamMembersView } from "~/teams/team-members-view";
@@ -36,8 +37,10 @@ const getCachedTeamRoles = unstable_cache(
 const getCachedTeamAttributes = unstable_cache(
  async (organizationId?: number) => {
    if (!organizationId) return [];
+    const attributeRepo = new PrismaAttributeRepository(prisma);
+
    try {
-      return await PrismaAttributeRepository.findAllByOrgIdWithOptions({ orgId: organizationId });
+      return await attributeRepo.findAllByOrgIdWithOptions({ orgId: organizationId });
    } catch (error) {
      return [];
    }
@@ -4,6 +4,7 @@ import { unstable_cache } from "next/cache";

 import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
 import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import prisma from "@calcom/prisma";
 import { viewerOrganizationsRouter } from "@calcom/trpc/server/routers/viewer/organizations/_router";

 import { MembersView } from "~/members/members-view";
@@ -19,7 +20,9 @@ export const generateMetadata = async () =>

 const getCachedAttributes = unstable_cache(
  async (orgId: number) => {
-    return await PrismaAttributeRepository.findAllByOrgIdWithOptions({ orgId });
+    const attributeRepo = new PrismaAttributeRepository(prisma);
+
+    return await attributeRepo.findAllByOrgIdWithOptions({ orgId });
  },
  undefined,
  { revalidate: 3600, tags: ["viewer.attributes.list"] } // Cache for 1 hour
@@ -87,7 +87,10 @@ async function handler(req: NextRequest) {

          return new Response(img.body, {
            status: 200,
-            headers: { "Content-Type": "image/png", "cache-control": "max-age=0" },
+            headers: {
+              "Content-Type": "image/png",
+              "Cache-Control": "public, max-age=3600, stale-while-revalidate=86400",
+            },
          });
        } catch (error) {
          if (error instanceof ZodError) {
@@ -116,7 +119,13 @@ async function handler(req: NextRequest) {
          });
          const img = new ImageResponse(<App name={name} description={description} slug={slug} />, ogConfig);

-          return new Response(img.body, { status: 200, headers: { "Content-Type": "image/png" } });
+          return new Response(img.body, {
+            status: 200,
+            headers: {
+              "Content-Type": "image/png",
+              "Cache-Control": "public, max-age=3600, stale-while-revalidate=86400",
+            },
+          });
        } catch (error) {
          if (error instanceof ZodError) {
            return new Response(
@@ -144,7 +153,13 @@ async function handler(req: NextRequest) {

          const img = new ImageResponse(<Generic title={title} description={description} />, ogConfig);

-          return new Response(img.body, { status: 200, headers: { "Content-Type": "image/png" } });
+          return new Response(img.body, {
+            status: 200,
+            headers: {
+              "Content-Type": "image/png",
+              "Cache-Control": "public, max-age=3600, stale-while-revalidate=86400",
+            },
+          });
        } catch (error) {
          if (error instanceof ZodError) {
            return new Response(
@@ -2,9 +2,11 @@ import { useMemo } from "react";
 import { useFormContext } from "react-hook-form";
 import type { UseFormGetValues, UseFormSetValue, Control, FormState } from "react-hook-form";

-import type { TLocationOptions } from "@calcom/features/eventtypes/components/Locations";
-import type { TEventTypeLocation } from "@calcom/features/eventtypes/components/Locations";
-import Locations from "@calcom/features/eventtypes/components/Locations";
+import type {
+  TLocationOptions,
+  TEventTypeLocation,
+} from "@calcom/features/eventtypes/components/locations/Locations";
+import Locations from "@calcom/features/eventtypes/components/locations/Locations";
 import type { LocationFormValues } from "@calcom/features/eventtypes/lib/types";
 import type { SingleValueLocationOption } from "@calcom/features/form/components/LocationSelect";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -3,42 +3,48 @@
 // https://docs.sentry.io/platforms/javascript/guides/nextjs/
 import * as Sentry from "@sentry/nextjs";

-Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN_CLIENT,
+if (process.env.NODE_ENV === "production") {
+  Sentry.init({
+    dsn: process.env.NEXT_PUBLIC_SENTRY_DSN_CLIENT,

-  sampleRate: parseFloat(process.env.SENTRY_SAMPLE_RATE ?? "1.0") || 1.0,
-  // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control.
-  tracesSampleRate: parseFloat(process.env.SENTRY_TRACES_SAMPLE_RATE ?? "0.0") || 0.0,
+    sampleRate: parseFloat(process.env.SENTRY_SAMPLE_RATE ?? "1.0") || 1.0,
+    // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control.
+    tracesSampleRate: parseFloat(process.env.SENTRY_TRACES_SAMPLE_RATE ?? "0.0") || 0.0,

-  // Define how likely Replay events are sampled.
-  // This sets the sample rate to be 10%. You may want this to be 100% while
-  // in development and sample at a lower rate in production
-  // replaysSessionSampleRate: parseFloat(process.env.SENTRY_REPLAYS_SESSION_SAMPLE_RATE ?? "0.0") || 0.0,
+    // Define how likely Replay events are sampled.
+    // This sets the sample rate to be 10%. You may want this to be 100% while
+    // in development and sample at a lower rate in production
+    // replaysSessionSampleRate: parseFloat(process.env.SENTRY_REPLAYS_SESSION_SAMPLE_RATE ?? "0.0") || 0.0,

-  // Define how likely Replay events are sampled when an error occurs.
-  // replaysOnErrorSampleRate: parseFloat(process.env.SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE ?? "0.0") || 0.0,
+    // Define how likely Replay events are sampled when an error occurs.
+    // replaysOnErrorSampleRate: parseFloat(process.env.SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE ?? "0.0") || 0.0,

-  // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: !!process.env.SENTRY_DEBUG,
-  beforeSend(event) {
-    if (
-      event.exception?.values?.some(
-        (e) =>
-          // Ignore fake error "UnhandledRejection: Non-Error promise rejection captured with value: Object Not Found Matching Id:3, MethodName:update, ParamCount:4"
-          // Raised GH issue: https://github.com/getsentry/sentry-javascript/issues/3440
-          e.value?.includes("Non-Error promise rejection captured with") ||
-          e.value?.includes("Object Not Found Matching Id")
-      )
-    ) {
-      return null;
-    }
+    // Setting this option to true will print useful information to the console while you're setting up Sentry.
+    debug: !!process.env.SENTRY_DEBUG,
+    beforeSend(event) {
+      if (
+        event.exception?.values?.some(
+          (e) =>
+            // Ignore fake error "UnhandledRejection: Non-Error promise rejection captured with value: Object Not Found Matching Id:3, MethodName:update, ParamCount:4"
+            // Raised GH issue: https://github.com/getsentry/sentry-javascript/issues/3440
+            e.value?.includes("Non-Error promise rejection captured with") ||
+            e.value?.includes("Object Not Found Matching Id")
+        )
+      ) {
+        return null;
+      }

-    event.tags = {
-      ...event.tags,
-      errorSource: "client",
-    };
-    return event;
-  },
-});
+      event.tags = {
+        ...event.tags,
+        errorSource: "client",
+      };
+      return event;
+    },
+  });
+}

-export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;
+export function onRouterTransitionStart(url: string, navigationType: "push" | "replace" | "traverse") {
+  if (process.env.NODE_ENV === "production") {
+    Sentry.captureRouterTransitionStart(url, navigationType);
+  }
+}
@@ -1,13 +1,22 @@
+import { type Instrumentation } from 'next'
+
 import * as Sentry from "@sentry/nextjs";

 export async function register() {
-  if (process.env.NEXT_PUBLIC_SENTRY_DSN && process.env.NEXT_RUNTIME === "nodejs") {
-    await import("./sentry.server.config");
-  }
-
-  if (process.env.NEXT_PUBLIC_SENTRY_DSN && process.env.NEXT_RUNTIME === "edge") {
-    await import("./sentry.edge.config");
+  if (process.env.NODE_ENV === "production") {
+    if (process.env.NEXT_PUBLIC_SENTRY_DSN && process.env.NEXT_RUNTIME === "nodejs") {
+      await import("./sentry.server.config");
+    }
+    if (process.env.NEXT_PUBLIC_SENTRY_DSN && process.env.NEXT_RUNTIME === "edge") {
+      await import("./sentry.edge.config");
+    }
  }
 }

-export const onRequestError = Sentry.captureRequestError;
+export const onRequestError:  Instrumentation.onRequestError = ( err,
+  request,
+  context) => {
+  if (process.env.NODE_ENV === "production") {
+    Sentry.captureRequestError(err, request, context);
+  }
+};
@@ -17,6 +17,7 @@ export const getEventTypesFromDB = async (id: number) => {
    darkBrandColor: true,
    email: true,
    timeZone: true,
+    isPlatformManaged: true,
  };
  const eventType = await prisma.eventType.findUnique({
    where: {
@@ -75,6 +76,7 @@ export const getEventTypesFromDB = async (id: number) => {
              hideBranding: true,
            },
          },
+          createdByOAuthClientId: true,
        },
      },
      workflows: {
@@ -180,7 +180,7 @@ function BookingsContent({ status }: BookingsProps) {
      columnHelper.accessor((row) => row.type === "data" && row.booking.user?.id, {
        id: "userId",
        header: t("member"),
-        enableColumnFilter: true,
+        enableColumnFilter: user?.isTeamAdminOrOwner ?? false,
        enableSorting: false,
        cell: () => null,
        meta: {
@@ -228,16 +228,20 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
      ? { ...previousBooking, rescheduledBy: bookingInfo.user?.name }
      : previousBooking;

+  const isPlatformBooking = eventType.users[0]?.isPlatformManaged || eventType.team?.createdByOAuthClientId;
+
  return {
    props: {
      orgSlug: currentOrgDomain,
      themeBasis: eventType.team ? eventType.team.slug : eventType.users[0]?.username,
-      hideBranding: await shouldHideBrandingForEvent({
-        eventTypeId: eventType.id,
-        team: eventType.team,
-        owner: eventType.users[0] ?? null,
-        organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null,
-      }),
+      hideBranding: isPlatformBooking
+        ? true
+        : await shouldHideBrandingForEvent({
+            eventTypeId: eventType.id,
+            team: eventType.team,
+            owner: eventType.users[0] ?? null,
+            organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null,
+          }),
      profile,
      eventType,
      recurringBookings: await getRecurringBookings(bookingInfo.recurringEventId),
@@ -138,7 +138,8 @@ const OnboardingPage = (props: PageProps) => {
        "dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen [--cal-brand:#111827] dark:[--cal-brand:#FFFFFF]",
        "[--cal-brand-emphasis:#101010] dark:[--cal-brand-emphasis:#e1e1e1]",
        "[--cal-brand-subtle:#9CA3AF]",
-        "[--cal-brand-text:#FFFFFF]  dark:[--cal-brand-text:#000000]"
+        "[--cal-brand-text:#FFFFFF]  dark:[--cal-brand-text:#000000]",
+        "[--cal-brand-accent:#FFFFFF] dark:[--cal-brand-accent:#000000]"
      )}
      data-testid="onboarding"
      key={pathname}>
@@ -1,6 +1,6 @@
 {
  "name": "@calcom/web",
-  "version": "5.6.1",
+  "version": "5.6.3",
  "private": true,
  "scripts": {
    "analyze": "ANALYZE=true next build",
@@ -29,7 +29,7 @@
    "yarn": "3.4.1"
  },
  "dependencies": {
-    "@boxyhq/saml-jackson": "1.42.0",
+    "@boxyhq/saml-jackson": "1.52.2",
    "@calcom/app-store": "*",
    "@calcom/app-store-cli": "*",
    "@calcom/dayjs": "*",
@@ -1,6 +0,0 @@
-import { wrapApiHandlerWithSentry } from "@sentry/nextjs";
-
-import { createNextApiHandler } from "@calcom/trpc/server/createNextApiHandler";
-import { highPerfRouter } from "@calcom/trpc/server/routers/viewer/highPerf/_router";
-
-export default wrapApiHandlerWithSentry(createNextApiHandler(highPerfRouter), "/api/trpc/highPerf/[trpc]");
@@ -479,7 +479,6 @@ test.describe("Bookings", () => {
    const filterItemsConfig = [
      { key: "eventTypeId", name: "Event Type", testId: "add-filter-item-eventTypeId" },
      { key: "teamId", name: "Team", testId: "add-filter-item-teamId" },
-      { key: "userId", name: "Member", testId: "add-filter-item-userId" },
      { key: "attendeeName", name: "Attendees Name", testId: "add-filter-item-attendeeName" },
      { key: "attendeeEmail", name: "Attendee Email", testId: "add-filter-item-attendeeEmail" },
      { key: "dateRange", name: "Date Range", testId: "add-filter-item-dateRange" },
@@ -488,8 +487,16 @@ test.describe("Bookings", () => {

    const getFilterItemLocator = (page: Page, testId: string) => page.locator(`[data-testid="${testId}"]`);

-    test.beforeEach(async ({ page, users }) => {
-      const user = await users.create();
+    const setup = async ({
+      isAdmin,
+      page,
+      users,
+    }: {
+      isAdmin: boolean;
+      page: Page;
+      users: Fixtures["users"];
+    }) => {
+      const user = isAdmin ? await users.create(undefined, { hasTeam: true }) : await users.create();
      await user.apiLogin();
      const bookingsGetResponse = page.waitForResponse((response) =>
        /\/api\/trpc\/bookings\/get.*/.test(response.url())
@@ -498,9 +505,10 @@ test.describe("Bookings", () => {
      await bookingsGetResponse;
      await page.locator('[data-testid="add-filter-button"]').click();
      await expect(page.locator(searchInputSelector)).toBeVisible();
-    });
+    };

-    test("should show all filter items initially and after clearing search", async ({ page }) => {
+    test("should show all filter items initially and after clearing search", async ({ page, users }) => {
+      await setup({ isAdmin: false, page, users });
      const searchInput = page.locator(searchInputSelector);

      // Initial check: all defined filter items should be visible
@@ -524,7 +532,18 @@ test.describe("Bookings", () => {
      }
    });

-    test("search should be case-insensitive", async ({ page }) => {
+    test("should show admin-only filter", async ({ page, users }) => {
+      await setup({ isAdmin: true, page, users });
+
+      await expect(
+        getFilterItemLocator(page, "add-filter-item-userId"),
+        `Item "Member" should be visible initially`
+      ).toBeVisible();
+    });
+
+    test("search should be case-insensitive", async ({ page, users }) => {
+      await setup({ isAdmin: true, page, users });
+
      const searchInput = page.locator(searchInputSelector);

      // Search for "member" (lowercase)
@@ -534,7 +553,8 @@ test.describe("Bookings", () => {
      await expect(getFilterItemLocator(page, "add-filter-item-teamId")).toBeHidden();
    });

-    test("should individually find each filter item by its full name", async ({ page }) => {
+    test("should individually find each filter item by its full name", async ({ page, users }) => {
+      await setup({ isAdmin: false, page, users });
      const searchInput = page.locator(searchInputSelector);

      for (const targetItem of filterItemsConfig) {
@@ -550,7 +570,8 @@ test.describe("Bookings", () => {
      }
    });

-    test("should show no items for a non-matching search term", async ({ page }) => {
+    test("should show no items for a non-matching search term", async ({ page, users }) => {
+      await setup({ isAdmin: false, page, users });
      const searchInput = page.locator(searchInputSelector);
      const nonExistentTerm = "NonExistentFilterXYZ123";
      await searchInput.fill(nonExistentTerm);
@@ -1,6 +1,11 @@
-module.exports = {
+const config = {
  plugins: {
    tailwindcss: {},
-    autoprefixer: {},
  },
 };
+
+if (process.env.NODE_ENV === "production") {
+  config.plugins.autoprefixer = {};
+}
+
+module.exports = config;
@@ -41,18 +41,6 @@
    },
    "pages/api/trpc/workflows/[trpc].ts": {
      "maxDuration": 800
-    },
-    "pages/api/trpc/highPerf/[trpc].ts": {
-      "memory": 3008
-    },
-    "pages/api/trpc/appRoutingForms/[trpc].ts": {
-      "memory": 2048
-    },
-    "pages/router/embed.tsx": {
-      "memory": 2048
-    },
-    "pages/api/book/event.ts": {
-      "memory": 2048
    }
  }
 }
@@ -661,22 +661,30 @@ export default class Office365CalendarService implements Calendar {
    );
  };

-  private handleErrorJsonOffice365Calendar = <Type>(response: Response): Promise<Type | string> => {
+  private async handleErrorJsonOffice365Calendar<Type>(response: Response): Promise<Type | string> {
    if (response.headers.get("content-encoding") === "gzip") {
      return response.text();
    }

    if (response.status === 204) {
-      return new Promise((resolve) => resolve({} as Type));
+      return {} as Type;
    }

-    if (!response.ok && response.status < 200 && response.status >= 300) {
-      response.json().then(console.log);
-      throw Error(response.statusText);
+    if (!response.ok) {
+      let errorBody: string | object;
+      try {
+        errorBody = await response.json();
+      } catch (e) {
+        errorBody = await response.text();
+      }
+      this.log.error(
+        `handleErrorJsonOffice365Calendar: Office365 API request failed with status ${response.status}`,
+        errorBody
+      );
    }

    return response.json();
-  };
+  }

  async getMainTimeZone(): Promise<string> {
    try {
@@ -1,363 +0,0 @@
-import { describe, expect, it, afterEach, vi } from "vitest";
-
-import { jsonLogicToPrisma } from "../jsonLogicToPrisma";
-
-afterEach(() => {
-  vi.resetAllMocks();
-});
-
-describe("jsonLogicToPrisma(Reporting)", () => {
-  describe("Text Operand", () => {
-    it("should support 'Equals' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: { and: [{ "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "A"] }] },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            response: {
-              path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-              equals: "A",
-            },
-          },
-        ],
-      });
-    });
-
-    it("should support 'Not Equals' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: { and: [{ "!=": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "abc"] }] },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            NOT: {
-              response: {
-                path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-                equals: "abc",
-              },
-            },
-          },
-        ],
-      });
-    });
-
-    it("should support 'Contains' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: { and: [{ in: ["A", { var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }] }] },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            response: {
-              path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-              string_contains: "A",
-            },
-          },
-        ],
-      });
-    });
-
-    it("should support 'Not Contains' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: { and: [{ "!": { in: ["a", { var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }] } }] },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            NOT: {
-              response: {
-                path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-                string_contains: "a",
-              },
-            },
-          },
-        ],
-      });
-    });
-
-    describe("Number Type", () => {
-      it("should support 'greater than' operator", () => {
-        let prismaWhere = jsonLogicToPrisma({
-          logic: {
-            and: [
-              {
-                ">": [
-                  {
-                    var: "a0d113a8-8e40-49b7-87b1-7f4ab57d226f",
-                  },
-                  // Giving a string here to test that it is converted to a number
-                  "100",
-                ],
-              },
-            ],
-          },
-        });
-
-        expect(prismaWhere).toEqual({
-          AND: [{ response: { path: ["a0d113a8-8e40-49b7-87b1-7f4ab57d226f", "value"], gt: 100 } }],
-        });
-
-        prismaWhere = jsonLogicToPrisma({
-          logic: {
-            and: [
-              {
-                ">": [
-                  {
-                    var: "a0d113a8-8e40-49b7-87b1-7f4ab57d226f",
-                  },
-                  // A number would also work
-                  100,
-                ],
-              },
-            ],
-          },
-        });
-
-        expect(prismaWhere).toEqual({
-          AND: [{ response: { path: ["a0d113a8-8e40-49b7-87b1-7f4ab57d226f", "value"], gt: 100 } }],
-        });
-      });
-      it("should support 'greater than or equal to' operator", () => {
-        const prismaWhere = jsonLogicToPrisma({
-          logic: {
-            and: [
-              {
-                ">=": [
-                  {
-                    var: "a0d113a8-8e40-49b7-87b1-7f4ab57d226f",
-                  },
-                  // Giving a string here to test that it is converted to a number
-                  "100",
-                ],
-              },
-            ],
-          },
-        });
-
-        expect(prismaWhere).toEqual({
-          AND: [{ response: { path: ["a0d113a8-8e40-49b7-87b1-7f4ab57d226f", "value"], gte: 100 } }],
-        });
-      });
-      it("should support 'less than' operator", () => {
-        const prismaWhere = jsonLogicToPrisma({
-          logic: {
-            and: [
-              {
-                "<": [
-                  {
-                    var: "a0d113a8-8e40-49b7-87b1-7f4ab57d226f",
-                  },
-                  // Giving a string here to test that it is converted to a number
-                  "100",
-                ],
-              },
-            ],
-          },
-        });
-
-        expect(prismaWhere).toEqual({
-          AND: [{ response: { path: ["a0d113a8-8e40-49b7-87b1-7f4ab57d226f", "value"], lt: 100 } }],
-        });
-      });
-      it("should support 'less than or equal to' operator", () => {
-        const prismaWhere = jsonLogicToPrisma({
-          logic: {
-            and: [
-              {
-                "<=": [
-                  {
-                    var: "a0d113a8-8e40-49b7-87b1-7f4ab57d226f",
-                  },
-                  // Giving a string here to test that it is converted to a number
-                  "100",
-                ],
-              },
-            ],
-          },
-        });
-
-        expect(prismaWhere).toEqual({
-          AND: [{ response: { path: ["a0d113a8-8e40-49b7-87b1-7f4ab57d226f", "value"], lte: 100 } }],
-        });
-      });
-      it("'Equals' operator should query with string as well as number", () => {
-        const prismaWhere = jsonLogicToPrisma({
-          logic: { and: [{ "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "1"] }] },
-        });
-
-        expect(prismaWhere).toEqual({
-          AND: [
-            {
-              OR: [
-                {
-                  response: {
-                    path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-                    equals: "1",
-                  },
-                },
-                {
-                  response: {
-                    path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-                    equals: 1,
-                  },
-                },
-              ],
-            },
-          ],
-        });
-      });
-    });
-  });
-
-  describe("MultiSelect", () => {
-    it("should support 'Equals' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: {
-          and: [
-            { all: [{ var: "267c7817-81a5-4bef-9d5b-d0faa4cd0d71" }, { in: [{ var: "" }, ["C", "D"]] }] },
-          ],
-        },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            response: { path: ["267c7817-81a5-4bef-9d5b-d0faa4cd0d71", "value"], array_contains: ["C", "D"] },
-          },
-        ],
-      });
-    });
-
-    it("should support 'Any In' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: { and: [{ in: [{ var: "267c7817-81a5-4bef-9d5b-d0faa4cd0d71" }, ["C", "D"]] }] },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            OR: [
-              {
-                response: {
-                  path: ["267c7817-81a5-4bef-9d5b-d0faa4cd0d71", "value"],
-                  equals: "C",
-                },
-              },
-              {
-                response: {
-                  path: ["267c7817-81a5-4bef-9d5b-d0faa4cd0d71", "value"],
-                  equals: "D",
-                },
-              },
-            ],
-          },
-        ],
-      });
-    });
-
-    it("should support 'Not In' operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: { and: [{ "!": { in: [{ var: "267c7817-81a5-4bef-9d5b-d0faa4cd0d71" }, ["C", "D"]] } }] },
-      });
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            NOT: {
-              OR: [
-                {
-                  response: {
-                    path: ["267c7817-81a5-4bef-9d5b-d0faa4cd0d71", "value"],
-                    equals: "C",
-                  },
-                },
-                {
-                  response: {
-                    path: ["267c7817-81a5-4bef-9d5b-d0faa4cd0d71", "value"],
-                    equals: "D",
-                  },
-                },
-              ],
-            },
-          },
-        ],
-      });
-    });
-
-    it("should support where All Match ['Equals', 'Equals'] operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: {
-          and: [
-            { "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "a"] },
-            { "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "b"] },
-          ],
-        },
-      });
-
-      expect(prismaWhere).toEqual({
-        AND: [
-          {
-            response: {
-              path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-              equals: "a",
-            },
-          },
-          {
-            response: {
-              path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-              equals: "b",
-            },
-          },
-        ],
-      });
-    });
-
-    it("should support where Any Match ['Equals', 'Equals'] operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: {
-          or: [
-            { "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "a"] },
-            { "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "b"] },
-          ],
-        },
-      });
-
-      expect(prismaWhere).toEqual({
-        OR: [
-          {
-            response: {
-              path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-              equals: "a",
-            },
-          },
-          {
-            response: {
-              path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"],
-              equals: "b",
-            },
-          },
-        ],
-      });
-    });
-
-    it("should support where None Match ['Equals', 'Equals'] operator", () => {
-      const prismaWhere = jsonLogicToPrisma({
-        logic: {
-          "!": {
-            or: [
-              { "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "abc"] },
-              { "==": [{ var: "505d3c3c-aa71-4220-93a9-6fd1e1087939" }, "abcd"] },
-            ],
-          },
-        },
-      });
-
-      expect(prismaWhere).toEqual({
-        NOT: {
-          OR: [
-            { response: { path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"], equals: "abc" } },
-            { response: { path: ["505d3c3c-aa71-4220-93a9-6fd1e1087939", "value"], equals: "abcd" } },
-          ],
-        },
-      });
-    });
-  });
-});
@@ -1,276 +0,0 @@
-// It can have many shapes, so just use any and we rely on unit tests to test all those scenarios.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type LogicData = Partial<Record<keyof typeof OPERATOR_MAP, any>>;
-type NegatedLogicData = {
-  "!": LogicData;
-};
-
-export type JsonLogicQuery = {
-  logic: {
-    and?: LogicData[];
-    or?: LogicData[];
-    "!"?: {
-      and?: LogicData[];
-      or?: LogicData[];
-    };
-  } | null;
-};
-
-type PrismaWhere = {
-  AND?: ReturnType<typeof convertQueriesToPrismaWhereClause>[];
-  OR?: ReturnType<typeof convertQueriesToPrismaWhereClause>[];
-  NOT?: PrismaWhere;
-};
-
-const OPERATOR_MAP = {
-  "==": {
-    operator: "equals",
-    secondaryOperand: null,
-  },
-  in: {
-    operator: "string_contains",
-    secondaryOperand: null,
-  },
-  "!=": {
-    operator: "NOT.equals",
-    secondaryOperand: null,
-  },
-  "!": {
-    operator: "equals",
-    secondaryOperand: "",
-  },
-  "!!": {
-    operator: "NOT.equals",
-    secondaryOperand: "",
-  },
-  ">": {
-    operator: "gt",
-    secondaryOperand: null,
-  },
-  ">=": {
-    operator: "gte",
-    secondaryOperand: null,
-  },
-  "<": {
-    operator: "lt",
-    secondaryOperand: null,
-  },
-  "<=": {
-    operator: "lte",
-    secondaryOperand: null,
-  },
-  all: {
-    operator: "array_contains",
-    secondaryOperand: null,
-  },
-};
-
-/**
- *  Operators supported on array of basic queries
- */
-const GROUP_OPERATOR_MAP = {
-  and: "AND",
-  or: "OR",
-  "!": "NOT",
-} as const;
-
-const NumberOperators = [">", ">=", "<", "<="];
-
-const negatePrismaWhereClauseIfNeeded = (data: any, isNegation: boolean) => {
-  if (!isNegation) {
-    return data;
-  }
-  return {
-    NOT: {
-      ...data,
-    },
-  };
-};
-
-const convertSingleQueryToPrismaWhereClause = (
-  operatorName: keyof typeof OPERATOR_MAP,
-  logicData: LogicData,
-  isNegation: boolean
-) => {
-  const mappedOperator = OPERATOR_MAP[operatorName].operator;
-  const staticSecondaryOperand = OPERATOR_MAP[operatorName].secondaryOperand;
-  isNegation = isNegation || mappedOperator.startsWith("NOT.");
-  const prismaOperator = mappedOperator.replace("NOT.", "");
-  const operands =
-    logicData[operatorName] instanceof Array ? logicData[operatorName] : [logicData[operatorName]];
-
-  if (operatorName === "in" && operands[0]?.var && Array.isArray(operands[1])) {
-    // Case A: Item "in" array
-    // operands[0]: { var: ... }
-    // operands[1]: items to test against
-
-    // Convert 'in' operator to union of OR clauses
-    return negatePrismaWhereClauseIfNeeded(
-      {
-        OR: (operands[1] ?? []).map((value) => ({
-          response: {
-            path: [operands[0].var, "value"],
-            [`${OPERATOR_MAP["=="].operator}`]: value,
-          },
-        })),
-      },
-      isNegation
-    );
-  }
-
-  if (operatorName === "in" && typeof operands[0] === "string" && operands[1]?.var) {
-    // Case B: String "in" string
-    // operands[0]: string to test against
-    // operands[1]: { var: ... }
-
-    return negatePrismaWhereClauseIfNeeded(
-      {
-        response: {
-          path: [operands[1].var, "value"],
-          [`${prismaOperator}`]: operands[0],
-        },
-      },
-      isNegation
-    );
-  }
-
-  const mainOperand = operands[0].var;
-  let secondaryOperand;
-
-  if (operatorName === "all") {
-    secondaryOperand = operands[1].in[1];
-  } else {
-    secondaryOperand = staticSecondaryOperand || operands[1] || "";
-  }
-
-  const isNumberOperator = NumberOperators.includes(operatorName);
-  const secondaryOperandAsNumber = typeof secondaryOperand === "string" ? Number(secondaryOperand) : null;
-
-  if (secondaryOperandAsNumber && isNumberOperator) {
-    // We know that it's number operator so Prisma should query number
-    // Note that if we get string values in DB(e.g. '100'), those values can't be filtered with number operators.
-    return negatePrismaWhereClauseIfNeeded(
-      {
-        response: {
-          path: [mainOperand, "value"],
-          [`${prismaOperator}`]: secondaryOperandAsNumber,
-        },
-      },
-      isNegation
-    );
-  }
-
-  if (secondaryOperandAsNumber && !isNumberOperator) {
-    // We know that it's not number operator but the input field might have been a number and thus stored value in DB as number.
-    // Also, even for input type=number we might accidentally get string value(e.g. '100'). So, let reporting do it's best job with both number and string.
-    return negatePrismaWhereClauseIfNeeded(
-      {
-        OR: [
-          {
-            response: {
-              path: [mainOperand, "value"],
-              // Query as string e.g. equals '100'
-              [`${prismaOperator}`]: secondaryOperand,
-            },
-          },
-          {
-            response: {
-              path: [mainOperand, "value"],
-              // Query as number e.g. equals 100
-              [`${prismaOperator}`]: secondaryOperandAsNumber,
-            },
-          },
-        ],
-      },
-      isNegation
-    );
-  }
-
-  return negatePrismaWhereClauseIfNeeded(
-    {
-      response: {
-        path: [mainOperand, "value"],
-        [`${prismaOperator}`]: secondaryOperand,
-      },
-    },
-    isNegation
-  );
-};
-
-const isNegation = (logicData: LogicData | NegatedLogicData) => {
-  if ("!" in logicData) {
-    const negatedLogicData = logicData["!"];
-
-    for (const [operatorName] of Object.entries(OPERATOR_MAP)) {
-      if (negatedLogicData[operatorName]) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-
-const convertQueriesToPrismaWhereClause = (logicData: LogicData) => {
-  const _isNegation = isNegation(logicData);
-  if (_isNegation) {
-    logicData = logicData["!"];
-  }
-  for (const [key] of Object.entries(OPERATOR_MAP)) {
-    const operatorName = key as keyof typeof OPERATOR_MAP;
-    if (logicData[operatorName]) {
-      return convertSingleQueryToPrismaWhereClause(operatorName, logicData, _isNegation);
-    }
-  }
-};
-
-export const jsonLogicToPrisma = (query: JsonLogicQuery) => {
-  try {
-    let logic = query.logic;
-    if (!logic) {
-      return {};
-    }
-
-    let prismaWhere: PrismaWhere = {};
-    let negateLogic = false;
-
-    // Case: Negation of "Any of these"
-    // Example: {"logic":{"!":{"or":[{"==":[{"var":"505d3c3c-aa71-4220-93a9-6fd1e1087939"},"1"]},{"==":[{"var":"505d3c3c-aa71-4220-93a9-6fd1e1087939"},"1"]}]}}}
-    if (logic["!"]) {
-      logic = logic["!"];
-      negateLogic = true;
-    }
-
-    // Case: All of these
-    if (logic.and) {
-      const where: PrismaWhere["AND"] = (prismaWhere[GROUP_OPERATOR_MAP["and"]] = []);
-      logic.and.forEach((and) => {
-        const res = convertQueriesToPrismaWhereClause(and);
-        if (!res) {
-          return;
-        }
-        where.push(res);
-      });
-    }
-    // Case: Any of these
-    else if (logic.or) {
-      const where: PrismaWhere["OR"] = (prismaWhere[GROUP_OPERATOR_MAP["or"]] = []);
-
-      logic.or.forEach((or) => {
-        const res = convertQueriesToPrismaWhereClause(or);
-        if (!res) {
-          return;
-        }
-        where.push(res);
-      });
-    }
-
-    if (negateLogic) {
-      prismaWhere = { NOT: { ...prismaWhere } };
-    }
-
-    return prismaWhere;
-  } catch (e) {
-    console.log("Error converting to prisma `where`", JSON.stringify(query), "Error is ", e);
-    return {};
-  }
-};
@@ -84,7 +84,7 @@ export function getQueryBuilderConfigForFormFields(form: Pick<RoutingForm, "fiel
    delete initialConfigCopy.operators.is_empty;
    delete initialConfigCopy.operators.is_not_empty;

-    // Between and Not between aren't directly supported by prisma. So, we need to update jsonLogicToPrisma to generate gte and lte query for between. It can be implemented later.
+    // These operators can be implemented later if needed.
    delete initialConfigCopy.operators.between;
    delete initialConfigCopy.operators.not_between;

@@ -9,7 +9,6 @@ import { ZFormQueryInputSchema } from "./formQuery.schema";
 import { ZGetAttributesForTeamInputSchema } from "./getAttributesForTeam.schema";
 import { ZGetIncompleteBookingSettingsInputSchema } from "./getIncompleteBookingSettings.schema";
 import { forms } from "./procedures/forms";
-import { ZReportInputSchema } from "./report.schema";
 import { ZSaveIncompleteBookingSettingsInputSchema } from "./saveIncompleteBookingSettings.schema";

 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -76,11 +75,6 @@ const appRoutingForms = router({
    return handler({ ctx, input });
  }),

-  report: authedProcedure.input(ZReportInputSchema).query(async ({ ctx, input }) => {
-    const handler = await getHandler("report", () => import("./report.handler"));
-    return handler({ ctx, input });
-  }),
-
  getAttributesForTeam: authedProcedure
    .input(ZGetAttributesForTeamInputSchema)
    .query(async ({ ctx, input }) => {
@@ -1,158 +0,0 @@
-import { v4 as uuidv4 } from "uuid";
-import { describe, it, expect } from "vitest";
-
-import { buildResponsesForReporting } from "./report.handler";
-
-describe("buildResponsesForReporting", () => {
-  it("for fields with options, it should return the labels of the options", () => {
-    const field1Id = uuidv4();
-    const field2Id = uuidv4();
-
-    const responsesFromDb = [
-      {
-        [field1Id]: { value: "value1" },
-        [field2Id]: { value: ["option1", "option2"] },
-      },
-    ];
-
-    const fields = [
-      { id: field1Id, label: "Field 1" },
-      {
-        id: field2Id,
-        label: "Field 2",
-        options: [
-          { id: "option1", label: "Option 1" },
-          { id: "option2", label: "Option 2" },
-        ],
-      },
-    ];
-
-    const expectedResponses = [["value1", "Option 1, Option 2"]];
-
-    const { responses, headers } = buildResponsesForReporting({ responsesFromDb, fields });
-    expect(responses).toEqual(expectedResponses);
-    expect(headers).toEqual(["Field 1", "Field 2"]);
-  });
-
-  it("for fields with options having null id, it should return what DB provided(as that would be labels only).", () => {
-    const field1Id = uuidv4();
-    const field2Id = uuidv4();
-    const responsesFromDb = [
-      {
-        [field1Id]: { value: "value1" },
-        [field2Id]: { value: ["Option 1", "Option 2"] },
-      },
-    ];
-
-    const fields = [
-      { id: field1Id, label: "Field 1" },
-      {
-        id: field2Id,
-        label: "Field 2",
-        options: [
-          { id: null, label: "Option 1" },
-          { id: null, label: "Option 2" },
-        ],
-      },
-    ];
-
-    const expectedResponses = [["value1", "Option 1, Option 2"]];
-
-    const { responses, headers } = buildResponsesForReporting({ responsesFromDb, fields });
-    expect(responses).toEqual(expectedResponses);
-    expect(headers).toEqual(["Field 1", "Field 2"]);
-  });
-
-  it("for fields with no options but having array value, it should return the value as is", () => {
-    const field2Id = uuidv4();
-    const responsesFromDb = [
-      {
-        [field2Id]: { value: ["Option 1", "Option 2"] },
-      },
-    ];
-
-    const fields = [
-      {
-        id: field2Id,
-        label: "Field 2",
-      },
-    ];
-
-    const expectedResponses = [["Option 1, Option 2"]];
-
-    const { responses, headers } = buildResponsesForReporting({ responsesFromDb, fields });
-    expect(responses).toEqual(expectedResponses);
-    expect(headers).toEqual(["Field 2"]);
-  });
-
-  it("should correctly handle numeric responses converting them to strings", () => {
-    const field1Id = uuidv4();
-    const field2Id = uuidv4();
-    const responsesFromDb = [
-      {
-        [field1Id]: { value: 1 },
-        [field2Id]: { value: [1, 2] },
-      },
-    ];
-
-    const fields = [
-      { id: field1Id, label: "Field 1" },
-      {
-        id: field2Id,
-        label: "Field 2",
-        options: [
-          { id: null, label: "Option 1" },
-          { id: null, label: "Option 2" },
-        ],
-      },
-    ];
-    const expectedResponses = [["1", "1, 2"]];
-    const { responses, headers } = buildResponsesForReporting({ responsesFromDb, fields });
-    expect(responses).toEqual(expectedResponses);
-    expect(headers).toEqual(["Field 1", "Field 2"]);
-  });
-
-  it("should handle empty responses", () => {
-    const field1Id = uuidv4();
-    const responsesFromDb = [{}];
-
-    const fields = [{ id: field1Id, label: "Field 1" }];
-
-    const expectedResponses = [[""]];
-
-    const { responses, headers } = buildResponsesForReporting({ responsesFromDb, fields });
-    expect(responses).toEqual(expectedResponses);
-    expect(headers).toEqual(["Field 1"]);
-  });
-
-  it("should show correct header for deleted fields", () => {
-    const field1Id = uuidv4();
-    const field2Id = uuidv4();
-    const responsesFromDb = [
-      {
-        [field1Id]: { value: "value1" },
-        [field2Id]: { value: ["Option 1", "Option 2"] },
-      },
-    ];
-
-    const fields = [
-      { id: field1Id, label: "Field 1" },
-      {
-        id: field2Id,
-        label: "Field 2",
-        deleted: true,
-        options: [
-          { id: "option1", label: "Option 1" },
-          { id: "option2", label: "Option 2" },
-        ],
-      },
-    ];
-
-    const expectedResponses = [["value1", "Option 1, Option 2"]];
-    const expectedHeaders = ["Field 1", "Field 2(Deleted)"];
-
-    const { responses, headers } = buildResponsesForReporting({ responsesFromDb, fields });
-    expect(responses).toEqual(expectedResponses);
-    expect(headers).toEqual(expectedHeaders);
-  });
-});
@@ -1,182 +0,0 @@
-import type { z } from "zod";
-
-import logger from "@calcom/lib/logger";
-import type { PrismaClient } from "@calcom/prisma";
-import type { App_RoutingForms_FormResponse } from "@calcom/prisma/client";
-import type { TrpcSessionUser } from "@calcom/trpc/server/types";
-
-import { TRPCError } from "@trpc/server";
-
-import { jsonLogicToPrisma } from "../jsonLogicToPrisma";
-import { getSerializableForm } from "../lib/getSerializableForm";
-import { ensureStringOrStringArray, getLabelsFromOptionIds } from "../lib/reportingUtils";
-import type { FormResponse } from "../types/types";
-import type { zodFieldView } from "../zod";
-import type { TReportInputSchema } from "./report.schema";
-
-interface ReportHandlerOptions {
-  ctx: {
-    prisma: PrismaClient;
-    user: NonNullable<TrpcSessionUser>;
-  };
-  input: TReportInputSchema;
-}
-
-const makeFormatDate = (locale: string, timeZone: string) => {
-  const formatDate = (date: Date): string => {
-    return new Intl.DateTimeFormat(locale, {
-      timeZone,
-      dateStyle: "medium",
-      timeStyle: "short",
-    }).format(date);
-  };
-  return formatDate;
-};
-
-const getRows = async ({ ctx: { prisma }, input }: ReportHandlerOptions) => {
-  // Can be any prisma `where` clause
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const prismaWhere: Record<string, any> = input.jsonLogicQuery
-    ? jsonLogicToPrisma(input.jsonLogicQuery)
-    : {};
-  const skip = input.cursor ?? 0;
-  const take = input.limit ? input.limit + 1 : 50;
-
-  logger.debug(
-    `Built Prisma where ${JSON.stringify(prismaWhere)} from jsonLogicQuery ${JSON.stringify(
-      input.jsonLogicQuery
-    )}`
-  );
-  const rows = await prisma.app_RoutingForms_FormResponse.findMany({
-    where: {
-      formId: input.formId,
-      ...prismaWhere,
-    },
-    include: {
-      routedToBooking: {
-        select: {
-          createdAt: true,
-          user: {
-            select: { id: true, name: true, email: true },
-          },
-          assignmentReason: {
-            orderBy: {
-              createdAt: "desc",
-            },
-            take: 1,
-          },
-        },
-      },
-    },
-    orderBy: {
-      createdAt: "desc",
-    },
-    take,
-    skip,
-  });
-  return { skip, take, rows };
-};
-
-export const reportHandler = async (options: ReportHandlerOptions) => {
-  const {
-    ctx: { prisma },
-    input,
-  } = options;
-  const form = await prisma.app_RoutingForms_Form.findUnique({
-    where: {
-      id: input.formId,
-    },
-  });
-
-  if (!form) {
-    throw new TRPCError({
-      code: "NOT_FOUND",
-      message: "Form not found",
-    });
-  }
-  // TODO: Second argument is required to return deleted operators.
-  const serializedForm = await getSerializableForm({ form, withDeletedFields: true });
-  const { rows, skip, take } = await getRows(options);
-
-  const fields = serializedForm?.fields || [];
-  const { responses, headers } = buildResponsesForReporting({
-    responsesFromDb: rows.map((r) => r.response),
-    fields,
-  });
-
-  const areThereNoResultsOrLessThanAskedFor = !rows.length || rows.length < take;
-  return presenter({
-    rows,
-    options,
-    headers,
-    responses,
-    nextCursor: areThereNoResultsOrLessThanAskedFor ? null : skip + rows.length,
-  });
-};
-
-/**
- * This is a temporary solution to make the report work. It should be incorporated into the report data itself.
- * Right now we cannot filter by Routed To and Booked At because they are not part of the response data.
- */
-function presenter(args: {
-  rows: Awaited<ReturnType<typeof getRows>>["rows"];
-  options: ReportHandlerOptions;
-  headers: string[];
-  responses: string[][];
-  nextCursor: number | null;
-}) {
-  const { headers, responses, nextCursor, options, rows } = args;
-  const { ctx } = options;
-  const formatDate = makeFormatDate(ctx.user.locale, ctx.user.timeZone);
-  return {
-    nextCursor,
-    headers: [...headers, "Routed To", "Assignment Reason", "Booked At", "Submitted At"],
-    responses: responses.map((r, i) => {
-      const currentRow = rows[i];
-      return [
-        ...r,
-        currentRow.routedToBooking?.user?.email || "",
-        currentRow.routedToBooking?.assignmentReason.length
-          ? currentRow.routedToBooking.assignmentReason[0].reasonString
-          : "",
-        currentRow.routedToBooking?.createdAt ? formatDate(currentRow.routedToBooking.createdAt) : "",
-        formatDate(currentRow.createdAt),
-      ];
-    }),
-  };
-}
-
-export default reportHandler;
-
-export function buildResponsesForReporting({
-  responsesFromDb,
-  fields,
-}: {
-  responsesFromDb: App_RoutingForms_FormResponse["response"][];
-  fields: Pick<z.infer<typeof zodFieldView>, "id" | "options" | "label" | "deleted">[];
-}) {
-  const headers = fields.map((f) => f.label + (f.deleted ? "(Deleted)" : ""));
-  const responses: string[][] = [];
-  responsesFromDb.forEach((r) => {
-    const rowResponses: string[] = [];
-    responses.push(rowResponses);
-    fields.forEach((field) => {
-      if (!r) {
-        return;
-      }
-      const response = r as FormResponse;
-      const value = response[field.id]?.value || "";
-      if (field.options) {
-        const optionIds = ensureStringOrStringArray(value);
-        const labels = getLabelsFromOptionIds({ options: field.options, optionIds });
-        rowResponses.push(labels.join(", "));
-      } else {
-        const arrayOfValues = value instanceof Array ? value : [value];
-        const transformedValue = arrayOfValues.join(", ");
-        rowResponses.push(transformedValue);
-      }
-    });
-  });
-
-  return { responses, headers };
-}
@@ -1,12 +0,0 @@
-import z from "zod";
-
-export const ZReportInputSchema = z.object({
-  limit: z.number().default(50),
-  formId: z.string(),
-  jsonLogicQuery: z.object({
-    logic: z.union([z.record(z.any()), z.null()]),
-  }),
-  cursor: z.number().nullish(), // <-- "cursor" needs to exist when using useInfiniteQuery, but can be any type
-});
-
-export type TReportInputSchema = z.infer<typeof ZReportInputSchema>;
@@ -1919,7 +1919,7 @@ async function handler(

        if (!isDryRun) {
          sendRoundRobinRescheduledEmailsAndSMS(
-            copyEventAdditionalInfo,
+            { ...copyEventAdditionalInfo, iCalUID },
            rescheduledMembers,
            eventType.metadata
          );
@@ -30,10 +30,6 @@ const opts: JacksonOption = {
  },
  idpEnabled: true,
  clientSecretVerifier,
-  ory: {
-    projectId: undefined,
-    sdkToken: undefined,
-  },
 };

 declare global {
@@ -109,6 +109,15 @@ function WorkflowPage({ workflow: workflowId }: PageProps) {

  const isPending = isPendingWorkflow || isPendingEventTypes;

+  useEffect(() => {
+    requestAnimationFrame(() => {
+      window.scrollTo({
+        top: 0,
+        behavior: "smooth",
+      });
+    });
+  }, [isPending]);
+
  useEffect(() => {
    if (!isPending) {
      setFormData(workflow);
@@ -0,0 +1,143 @@
+import { ErrorMessage } from "@hookform/error-message";
+import { useFormContext, Controller } from "react-hook-form";
+
+import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
+import type { CalVideoSettings as CalVideoSettingsType } from "@calcom/features/eventtypes/lib/types";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import classNames from "@calcom/ui/classNames";
+import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
+import { TextField } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+
+import LocationSettingsContainer from "./LocationSettingsContainer";
+
+const CalVideoSettings = ({ calVideoSettings }: { calVideoSettings?: CalVideoSettingsType }) => {
+  const { t } = useLocale();
+  const formMethods = useFormContext<FormValues>();
+  const isPlatform = useIsPlatform();
+  return (
+    <LocationSettingsContainer>
+      <Controller
+        name="calVideoSettings.disableRecordingForGuests"
+        defaultValue={!!calVideoSettings?.disableRecordingForGuests}
+        render={({ field: { onChange, value } }) => {
+          return (
+            <SettingsToggle
+              title={t("disable_recording_for_guests")}
+              labelClassName="text-sm leading-6 whitespace-normal break-words"
+              checked={value}
+              onCheckedChange={onChange}
+              Badge={<UpgradeTeamsBadge checkForActiveStatus />}
+            />
+          );
+        }}
+      />
+
+      <Controller
+        name="calVideoSettings.disableRecordingForOrganizer"
+        defaultValue={!!calVideoSettings?.disableRecordingForOrganizer}
+        render={({ field: { onChange, value } }) => {
+          return (
+            <SettingsToggle
+              title={t("disable_recording_for_organizer")}
+              labelClassName="text-sm leading-6 whitespace-normal break-words"
+              checked={value}
+              onCheckedChange={onChange}
+              Badge={<UpgradeTeamsBadge checkForActiveStatus />}
+            />
+          );
+        }}
+      />
+
+      {!isPlatform && (
+        <Controller
+          name="calVideoSettings.enableAutomaticRecordingForOrganizer"
+          defaultValue={!!calVideoSettings?.enableAutomaticRecordingForOrganizer}
+          render={({ field: { onChange, value } }) => {
+            return (
+              <SettingsToggle
+                title={t("enable_automatic_recording")}
+                labelClassName="text-sm"
+                checked={value}
+                onCheckedChange={onChange}
+                Badge={<UpgradeTeamsBadge checkForActiveStatus />}
+              />
+            );
+          }}
+        />
+      )}
+
+      <Controller
+        name="calVideoSettings.enableAutomaticTranscription"
+        defaultValue={!!calVideoSettings?.enableAutomaticTranscription}
+        render={({ field: { onChange, value } }) => {
+          return (
+            <SettingsToggle
+              title={t("enable_automatic_transcription")}
+              labelClassName="text-sm leading-6 whitespace-normal break-words"
+              checked={value}
+              onCheckedChange={onChange}
+              Badge={<UpgradeTeamsBadge checkForActiveStatus />}
+            />
+          );
+        }}
+      />
+
+      {!isPlatform && (
+        <Controller
+          name="calVideoSettings.disableTranscriptionForGuests"
+          defaultValue={!!calVideoSettings?.disableTranscriptionForGuests}
+          render={({ field: { onChange, value } }) => {
+            return (
+              <SettingsToggle
+                title={t("disable_transcription_for_guests")}
+                labelClassName="text-sm leading-6 whitespace-normal break-words"
+                checked={value}
+                onCheckedChange={onChange}
+                Badge={<UpgradeTeamsBadge checkForActiveStatus />}
+              />
+            );
+          }}
+        />
+      )}
+      {!isPlatform && (
+        <Controller
+          name="calVideoSettings.disableTranscriptionForOrganizer"
+          defaultValue={!!calVideoSettings?.disableTranscriptionForOrganizer}
+          render={({ field: { onChange, value } }) => {
+            return (
+              <SettingsToggle
+                title={t("disable_transcription_for_organizer")}
+                labelClassName="text-sm leading-6 whitespace-normal break-words"
+                checked={value}
+                onCheckedChange={onChange}
+                Badge={<UpgradeTeamsBadge checkForActiveStatus />}
+              />
+            );
+          }}
+        />
+      )}
+
+      <TextField
+        label={t("enter_redirect_url_on_exit_description")}
+        defaultValue={calVideoSettings?.redirectUrlOnExit || ""}
+        data-testid="calVideoSettings.redirectUrlOnExit"
+        containerClassName="mt-4"
+        className="leading-6"
+        {...formMethods.register("calVideoSettings.redirectUrlOnExit", {
+          setValueAs: (v) => (!v || v.trim() === "" ? null : v),
+        })}
+      />
+      <ErrorMessage
+        errors={formMethods.formState.errors?.calVideoSettings}
+        name="redirectUrlOnExit"
+        className={classNames("text-error text-sm")}
+        as="div"
+        id="calVideoSettings.redirectUrlOnExit-error"
+      />
+    </LocationSettingsContainer>
+  );
+};
+
+export default CalVideoSettings;
@@ -0,0 +1,11 @@
+const LocationSettingsContainer = ({ children }: { children: React.ReactNode }) => {
+  return (
+    <div className="bg-muted mt-2 space-y-2 rounded-lg p-4">
+      <div className="w-full">
+        <div className="flex flex-col gap-4">{children}</div>
+      </div>
+    </div>
+  );
+};
+
+export default LocationSettingsContainer;
@@ -25,14 +25,13 @@ import ServerTrans from "@calcom/lib/components/ServerTrans";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import classNames from "@calcom/ui/classNames";
-import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
 import { Button } from "@calcom/ui/components/button";
-import { TextField } from "@calcom/ui/components/form";
-import { SettingsToggle } from "@calcom/ui/components/form";
 import { Input } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 import { showToast } from "@calcom/ui/components/toast";

+import CalVideoSettings from "./CalVideoSettings";
+
 export type TEventTypeLocation = Pick<EventTypeSetupProps["eventType"], "locations" | "calVideoSettings">;
 export type TLocationOptions = Pick<EventTypeSetupProps, "locationOptions">["locationOptions"];
 export type TDestinationCalendar = { integration: string } | null;
@@ -342,132 +341,7 @@ const Locations: React.FC<LocationsProps> = ({
                )}
              </div>

-              {isCalVideo && !isPlatform && (
-                <div className="bg-muted mt-2 space-y-2 rounded-lg p-4">
-                  <div className="w-full">
-                    <div className="flex flex-col gap-4">
-                      <Controller
-                        name="calVideoSettings.disableRecordingForGuests"
-                        defaultValue={!!eventType.calVideoSettings?.disableRecordingForGuests}
-                        render={({ field: { onChange, value } }) => {
-                          return (
-                            <SettingsToggle
-                              title={t("disable_recording_for_guests")}
-                              labelClassName="text-sm leading-6 whitespace-normal break-words"
-                              checked={value}
-                              onCheckedChange={onChange}
-                              Badge={<UpgradeTeamsBadge checkForActiveStatus />}
-                            />
-                          );
-                        }}
-                      />
-
-                      <Controller
-                        name="calVideoSettings.disableRecordingForOrganizer"
-                        defaultValue={!!eventType.calVideoSettings?.disableRecordingForOrganizer}
-                        render={({ field: { onChange, value } }) => {
-                          return (
-                            <SettingsToggle
-                              title={t("disable_recording_for_organizer")}
-                              labelClassName="text-sm leading-6 whitespace-normal break-words"
-                              checked={value}
-                              onCheckedChange={onChange}
-                              Badge={<UpgradeTeamsBadge checkForActiveStatus />}
-                            />
-                          );
-                        }}
-                      />
-
-                      {!isPlatform && (
-                        <Controller
-                          name="calVideoSettings.enableAutomaticRecordingForOrganizer"
-                          defaultValue={!!eventType.calVideoSettings?.enableAutomaticRecordingForOrganizer}
-                          render={({ field: { onChange, value } }) => {
-                            return (
-                              <SettingsToggle
-                                title={t("enable_automatic_recording")}
-                                labelClassName="text-sm"
-                                checked={value}
-                                onCheckedChange={onChange}
-                                Badge={<UpgradeTeamsBadge checkForActiveStatus />}
-                              />
-                            );
-                          }}
-                        />
-                      )}
-
-                      <Controller
-                        name="calVideoSettings.enableAutomaticTranscription"
-                        defaultValue={!!eventType.calVideoSettings?.enableAutomaticTranscription}
-                        render={({ field: { onChange, value } }) => {
-                          return (
-                            <SettingsToggle
-                              title={t("enable_automatic_transcription")}
-                              labelClassName="text-sm leading-6 whitespace-normal break-words"
-                              checked={value}
-                              onCheckedChange={onChange}
-                              Badge={<UpgradeTeamsBadge checkForActiveStatus />}
-                            />
-                          );
-                        }}
-                      />
-
-                      {!isPlatform && (
-                        <Controller
-                          name="calVideoSettings.disableTranscriptionForGuests"
-                          defaultValue={!!eventType.calVideoSettings?.disableTranscriptionForGuests}
-                          render={({ field: { onChange, value } }) => {
-                            return (
-                              <SettingsToggle
-                                title={t("disable_transcription_for_guests")}
-                                labelClassName="text-sm leading-6 whitespace-normal break-words"
-                                checked={value}
-                                onCheckedChange={onChange}
-                                Badge={<UpgradeTeamsBadge checkForActiveStatus />}
-                              />
-                            );
-                          }}
-                        />
-                      )}
-                      {!isPlatform && (
-                        <Controller
-                          name="calVideoSettings.disableTranscriptionForOrganizer"
-                          defaultValue={!!eventType.calVideoSettings?.disableTranscriptionForOrganizer}
-                          render={({ field: { onChange, value } }) => {
-                            return (
-                              <SettingsToggle
-                                title={t("disable_transcription_for_organizer")}
-                                labelClassName="text-sm leading-6 whitespace-normal break-words"
-                                checked={value}
-                                onCheckedChange={onChange}
-                                Badge={<UpgradeTeamsBadge checkForActiveStatus />}
-                              />
-                            );
-                          }}
-                        />
-                      )}
-
-                      <TextField
-                        label={t("enter_redirect_url_on_exit_description")}
-                        defaultValue={eventType.calVideoSettings?.redirectUrlOnExit || ""}
-                        data-testid="calVideoSettings.redirectUrlOnExit"
-                        containerClassName="mt-4"
-                        className="leading-6"
-                        {...formMethods.register("calVideoSettings.redirectUrlOnExit", {
-                          setValueAs: (v) => (!v || v.trim() === "" ? null : v),
-                        })}
-                      />
-                      <ErrorMessage
-                        errors={formMethods.formState.errors?.calVideoSettings}
-                        name="redirectUrlOnExit"
-                        className={classNames("text-error text-sm")}
-                        as="div"
-                        id="calVideoSettings.redirectUrlOnExit-error"
-                      />
-                    </div>
-                  </div>
-                </div>
-              )}
+              {isCalVideo && !isPlatform && <CalVideoSettings />}

              {eventLocationType?.organizerInputType && (
                <div className="mt-2 space-y-2">
@@ -5,8 +5,6 @@ import type { MultiValue } from "react-select";

 import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
-import type { LocationCustomClassNames } from "@calcom/features/eventtypes/components/Locations";
-import Locations from "@calcom/features/eventtypes/components/Locations";
 import type {
  EventTypeSetupProps,
  InputClassNames,
@@ -28,6 +26,9 @@ import { Select } from "@calcom/ui/components/form";
 import { SettingsToggle } from "@calcom/ui/components/form";
 import { Skeleton } from "@calcom/ui/components/skeleton";

+import type { LocationCustomClassNames } from "../../locations/Locations";
+import Locations from "../../locations/Locations";
+
 export type EventSetupTabCustomClassNames = {
  wrapper?: string;
  titleSection?: {
@@ -153,6 +153,17 @@ export const getPublicEventSelect = (fetchAllUsers: boolean) => {
    hidden: true,
    assignAllTeamMembers: true,
    rescheduleWithSameRoundRobinHost: true,
+    parent: {
+      select: {
+        team: {
+          select: {
+            theme: true,
+            brandColor: true,
+            darkBrandColor: true,
+          },
+        },
+      },
+    },
  } satisfies Prisma.EventTypeSelect;
 };

@@ -866,10 +877,11 @@ type GetProfileFromEventInput = Omit<Event, "hosts"> & {

 export function getProfileFromEvent(event: GetProfileFromEventInput) {
  const { team, subsetOfHosts: hosts, owner } = event;
-  const nonTeamprofile = hosts?.[0]?.user || owner;
-  const profile = team || nonTeamprofile;
+  const nonTeamProfile = hosts?.[0]?.user || owner;
+  const profile = team || nonTeamProfile;
  if (!profile) throw new Error("Event has no owner");

+  const styleProfile = team || event.parent?.team || nonTeamProfile;
  const username = "username" in profile ? profile.username : team?.slug;
  const weekStart = hosts?.[0]?.user?.weekStart || owner?.weekStart || "Monday";
  const eventMetaData = eventTypeMetaDataSchemaWithTypedApps.parse(event.metadata || {});
@@ -882,11 +894,11 @@ export function getProfileFromEvent(event: GetProfileFromEventInput) {
    image: team
      ? getOrgOrTeamAvatar(team)
      : getUserAvatarUrl({
-          avatarUrl: nonTeamprofile?.avatarUrl,
+          avatarUrl: nonTeamProfile?.avatarUrl,
        }),
-    brandColor: profile.brandColor,
-    darkBrandColor: profile.darkBrandColor,
-    theme: profile.theme,
+    brandColor: styleProfile.brandColor,
+    darkBrandColor: styleProfile.darkBrandColor,
+    theme: styleProfile.theme,
    bookerLayouts: bookerLayoutsSchema.parse(
      eventMetaData?.bookerLayouts ||
        (userMetaData && "defaultBookerLayouts" in userMetaData ? userMetaData.defaultBookerLayouts : null)
@@ -168,15 +168,7 @@ export type FormValues = {
  restrictionScheduleId: number | null;
  useBookerTimezone: boolean;
  restrictionScheduleName: string | null;
-  calVideoSettings?: {
-    disableRecordingForOrganizer?: boolean;
-    disableRecordingForGuests?: boolean;
-    enableAutomaticTranscription?: boolean;
-    enableAutomaticRecordingForOrganizer?: boolean;
-    disableTranscriptionForGuests?: boolean;
-    disableTranscriptionForOrganizer?: boolean;
-    redirectUrlOnExit?: string;
-  };
+  calVideoSettings?: CalVideoSettings;
  maxActiveBookingPerBookerOfferReschedule: boolean;
 };

@@ -243,3 +235,13 @@ export interface EventTypePlatformWrapperRef {
  validateForm: () => Promise<FormValidationResult>;
  handleFormSubmit: (callbacks?: { onSuccess?: () => void; onError?: (error: Error) => void }) => void;
 }
+
+export interface CalVideoSettings {
+  disableRecordingForOrganizer?: boolean;
+  disableRecordingForGuests?: boolean;
+  enableAutomaticTranscription?: boolean;
+  enableAutomaticRecordingForOrganizer?: boolean;
+  disableTranscriptionForGuests?: boolean;
+  disableTranscriptionForOrganizer?: boolean;
+  redirectUrlOnExit?: string;
+}
@@ -3,6 +3,7 @@ import { useForm } from "react-hook-form";

 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
+import { BookerStoreProvider } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import { Dialog } from "@calcom/features/components/controlled-dialog";
 import { yyyymmdd } from "@calcom/lib/dayjs";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -136,19 +137,21 @@ const DateOverrideForm = ({
      className="p-6 sm:flex sm:p-0 xl:flex-row">
      <div className="sm:border-subtle w-full sm:border-r sm:p-4 sm:pr-6 md:p-8">
        <DialogHeader title={t("date_overrides_dialog_title")} />
-        <DatePicker
-          excludedDates={excludedDates}
-          weekStart={weekStart}
-          selected={selectedDates}
-          onChange={(day) => {
-            if (day) onDateChange(day);
-          }}
-          onMonthChange={(newMonth) => {
-            setBrowsingDate(newMonth);
-          }}
-          browsingDate={browsingDate}
-          locale={isLocaleReady ? i18n.language : "en"}
-        />
+        <BookerStoreProvider>
+          <DatePicker
+            excludedDates={excludedDates}
+            weekStart={weekStart}
+            selected={selectedDates}
+            onChange={(day) => {
+              if (day) onDateChange(day);
+            }}
+            onMonthChange={(newMonth) => {
+              setBrowsingDate(newMonth);
+            }}
+            browsingDate={browsingDate}
+            locale={isLocaleReady ? i18n.language : "en"}
+          />
+        </BookerStoreProvider>
      </div>
      <div className="relative mt-8 flex w-full flex-col sm:mt-0 sm:p-4 md:p-8">
        {selectedDates[0] ? (
@@ -136,13 +136,11 @@ export const useSchedule = ({
    eventTypeId: eventId ?? undefined,
  });

-  const schedule = isTeamEvent
-    ? trpc.viewer.highPerf.getTeamSchedule.useQuery(input, {
-        ...options,
-        // Only enable if we're not using API V2
-        enabled: options.enabled && !isCallingApiV2Slots,
-      })
-    : trpc.viewer.slots.getSchedule.useQuery(input, options);
+  const schedule = trpc.viewer.slots.getSchedule.useQuery(input, {
+    ...options,
+    // Only enable if we're not using API V2
+    enabled: options.enabled && !isCallingApiV2Slots,
+  });

  if (isCallingApiV2Slots && !teamScheduleV2.failureReason) {
    updateEmbedBookerState({
@@ -56,6 +56,7 @@ const user: User & { credentials: CredentialPayload[] } = {
  timeFormat: 12,
  travelSchedules: [],
  locked: false,
+  isPlatformManaged: false,
 };

 const customInputs: CustomInputSchema[] = [];
@@ -213,21 +213,6 @@ describe("getAllDelegationCredentialsForUserIncludeServiceAccountKey", () => {
      buildDelegationCredentialGoogleMeetCredential(),
    ]);
  });
-
-  it("should return empty array for non-Google platforms(as they are not supported yet)", async () => {
-    vi.mocked(
-      DelegationCredentialRepository.findUniqueByOrgMemberEmailIncludeSensitiveServiceAccountKey
-    ).mockResolvedValue(
-      buildMockDelegationCredential({
-        workspacePlatform: {
-          name: "Microsoft",
-          slug: "microsoft",
-        },
-      })
-    );
-    const result = await getAllDelegationCredentialsForUserIncludeServiceAccountKey({ user: mockUser });
-    expect(result).toEqual([]);
-  });
 });

 describe("buildAllCredentials", () => {
@@ -1,14 +1,16 @@
-import prisma from "@calcom/prisma";
+import type { PrismaClient } from "@calcom/prisma";

 export class PrismaAttributeRepository {
-  static async findManyByNamesAndOrgIdIncludeOptions({
+  constructor(private prismaClient: PrismaClient) {}
+
+  async findManyByNamesAndOrgIdIncludeOptions({
    attributeNames,
    orgId,
  }: {
    attributeNames: string[];
    orgId: number;
  }) {
-    return prisma.attribute.findMany({
+    return this.prismaClient.attribute.findMany({
      where: {
        name: { in: attributeNames, mode: "insensitive" },
        teamId: orgId,
@@ -25,9 +27,9 @@ export class PrismaAttributeRepository {
    });
  }

-  static async findManyByOrgId({ orgId }: { orgId: number }) {
+  async findManyByOrgId({ orgId }: { orgId: number }) {
    // It should be a faster query because of lesser number of attributes record and index on teamId
-    const result = await prisma.attribute.findMany({
+    const result = await this.prismaClient.attribute.findMany({
      where: {
        teamId: orgId,
      },
@@ -43,8 +45,8 @@ export class PrismaAttributeRepository {
    return result;
  }

-  static async findAllByOrgIdWithOptions({ orgId }: { orgId: number }) {
-    return await prisma.attribute.findMany({
+  async findAllByOrgIdWithOptions({ orgId }: { orgId: number }) {
+    return await this.prismaClient.attribute.findMany({
      where: {
        teamId: orgId,
      },
@@ -1,8 +1,10 @@
-import prisma from "@calcom/prisma";
+import type { PrismaClient } from "@calcom/prisma";

 export class HostRepository {
-  static async updateHostsSchedule(userId: number, oldScheduleId: number, newScheduleId: number) {
-    return await prisma.host.updateMany({
+  constructor(private prismaClient: PrismaClient) {}
+
+  async updateHostsSchedule(userId: number, oldScheduleId: number, newScheduleId: number) {
+    return await this.prismaClient.host.updateMany({
      where: {
        userId,
        scheduleId: oldScheduleId,
@@ -37,7 +37,8 @@ const findAttributesByName = async ({
  orgId: number;
  attributeNames: AttributeName[];
 }) => {
-  const attributesFromDb = await PrismaAttributeRepository.findManyByNamesAndOrgIdIncludeOptions({
+  const attributeRepo = new PrismaAttributeRepository(prisma);
+  const attributesFromDb = await attributeRepo.findManyByNamesAndOrgIdIncludeOptions({
    attributeNames,
    orgId,
  });
@@ -216,9 +216,11 @@ async function _getOrgMembershipToUserIdForTeam({ orgId, teamId }: { orgId: numb
 }

 async function _queryAllData({ orgId, teamId }: { orgId: number; teamId: number }) {
+  const attributeRepo = new PrismaAttributeRepository(prisma);
+
  const [orgMembershipToUserIdForTeamMembers, attributesOfTheOrg] = await Promise.all([
    _getOrgMembershipToUserIdForTeam({ orgId, teamId }),
-    PrismaAttributeRepository.findManyByOrgId({ orgId }),
+    attributeRepo.findManyByOrgId({ orgId }),
  ]);

  const orgMembershipIds = Array.from(orgMembershipToUserIdForTeamMembers.keys());
@@ -1,5 +1,11 @@
 ## 1.1.2

+## 1.5.0
+
+### Minor Changes
+
+- [#23174](https://github.com/calcom/cal.com/pull/23174) [`618ef63`](https://github.com/calcom/cal.com/commit/618ef630170eb1c05b4a131a01d0c2316b3d1880) Thanks [@SomayChauhan](https://github.com/SomayChauhan)! - fix: Availability atom handleFormSubmit callbacks not triggering
+
 ## 1.4.0

 ### Minor Changes
@@ -124,6 +124,7 @@ type AvailabilitySettingsProps = {
    isEventTypesFetching?: boolean;
    handleBulkEditDialogToggle: () => void;
  };
+  callbacksRef?: React.MutableRefObject<{ onSuccess?: () => void; onError?: (error: Error) => void }>;
 };

 const DeleteDialogButton = ({
@@ -306,6 +307,7 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avai
      bulkUpdateModalProps,
      allowSetToDefault = true,
      allowDelete = true,
+      callbacksRef,
    } = props;
    const [openSidebar, setOpenSidebar] = useState(false);
    const { t, i18n } = useLocale();
@@ -336,11 +338,9 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avai

    const saveButtonRef = useRef<HTMLButtonElement>(null);

-    const callbacksRef = useRef<{ onSuccess?: () => void; onError?: (error: Error) => void }>({});
-
    const handleFormSubmit = useCallback(
      (customCallbacks?: { onSuccess?: () => void; onError?: (error: Error) => void }) => {
-        if (customCallbacks) {
+        if (callbacksRef && customCallbacks) {
          callbacksRef.current = customCallbacks;
        }

@@ -350,14 +350,14 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avai
          form.handleSubmit(async (data) => {
            try {
              await handleSubmit(data);
-              callbacksRef.current?.onSuccess?.();
+              callbacksRef?.current?.onSuccess?.();
            } catch (error) {
-              callbacksRef.current?.onError?.(error as Error);
+              callbacksRef?.current?.onError?.(error as Error);
            }
          })();
        }
      },
-      [form, handleSubmit]
+      [form, handleSubmit, callbacksRef]
    );

    const validateForm = useCallback(async () => {
@@ -39,7 +39,7 @@ export type AvailabilitySettingsPlatformWrapperProps = {
 };

 export const AvailabilitySettingsPlatformWrapper = forwardRef<
-AvailabilitySettingsFormRef,
+  AvailabilitySettingsFormRef,
  AvailabilitySettingsPlatformWrapperProps
 >(function AvailabilitySettingsPlatformWrapper(props, ref) {
  const {
@@ -202,6 +202,7 @@ AvailabilitySettingsFormRef,
        allowDelete={allowDelete}
        allowSetToDefault={allowSetToDefault}
        onFormStateChange={onFormStateChange}
+        callbacksRef={callbacksRef}
      />
    </AtomsWrapper>
  );
@@ -4,7 +4,7 @@
  "type": "module",
  "description": "Customizable UI components to integrate scheduling into your product.",
  "authors": "Cal.com, Inc.",
-  "version": "1.4.0",
+  "version": "1.5.0",
  "scripts": {
    "dev": "yarn vite build --watch & npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify --watch",
    "build": "NODE_OPTIONS='--max_old_space_size=12288' rm -rf dist && yarn vite build && npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify && mkdir ./dist/packages/prisma-client && cp -rf ../../../node_modules/.prisma/client/*.d.ts ./dist/packages/prisma-client",
@@ -446,6 +446,11 @@ class BaseCreateEventTypeInput {
    type: CalVideoSettings,
  })
  calVideoSettings?: CalVideoSettings;
+
+  @IsOptional()
+  @IsBoolean()
+  @DocsPropertyOptional()
+  hidden?: boolean;
 }
 export class CreateEventTypeInput_2024_06_14 extends BaseCreateEventTypeInput {
  @IsOptional()
@@ -414,6 +414,11 @@ class BaseUpdateEventTypeInput {
    type: CalVideoSettings,
  })
  calVideoSettings?: CalVideoSettings;
+
+  @IsOptional()
+  @IsBoolean()
+  @DocsPropertyOptional()
+  hidden?: boolean;
 }
 export class UpdateEventTypeInput_2024_06_14 extends BaseUpdateEventTypeInput {
  @IsOptional()
@@ -439,6 +439,11 @@ class BaseEventTypeOutput_2024_06_14 {
    type: CalVideoSettings,
  })
  calVideoSettings?: CalVideoSettings | null;
+
+  @IsOptional()
+  @IsBoolean()
+  @DocsProperty()
+  hidden?: boolean;
 }

 export class TeamEventTypeResponseHost extends TeamEventTypeHostInput {
@@ -90,6 +90,9 @@ type OmitPrismaClient = Omit<
 // we cant pass tx to functions as types miss match since we have a custom prisma client https://github.com/prisma/prisma/discussions/20924#discussioncomment-10077649
 export type PrismaTransaction = OmitPrismaClient;

+/**
+ * @deprecated Use named export `prisma` instead
+ */
 export default prisma;

 export * from "./selects";
@@ -10,6 +10,7 @@ export const availabilityUserSelect = {
  endTime: true,
  timeFormat: true,
  defaultScheduleId: true,
+  isPlatformManaged: true,
  // Relationships
  schedules: {
    select: {
@@ -17,7 +17,6 @@ export const ENDPOINTS = [
  "dsync",
  "eventTypes",
  "features",
-  "highPerf",
  "i18n",
  "insights",
  "me",
@@ -25,7 +25,6 @@ import { dsyncRouter } from "./dsync/_router";
 import { eventTypesRouter } from "./eventTypes/_router";
 import { filterSegmentsRouter } from "./filterSegments/_router";
 import { googleWorkspaceRouter } from "./googleWorkspace/_router";
-import { highPerfRouter } from "./highPerf/_router";
 import { i18nRouter } from "./i18n/_router";
 import { meRouter } from "./me/_router";
 import { oAuthRouter } from "./oAuth/_router";
@@ -79,7 +78,6 @@ export const viewerRouter = router({
  googleWorkspace: googleWorkspaceRouter,
  admin: adminRouter,
  attributes: attributesRouter,
-  highPerf: highPerfRouter,
  routingForms: routingFormsRouter,
  credits: creditsRouter,
  ooo: oooRouter,
@@ -1,4 +1,5 @@
 import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import prisma from "@calcom/prisma";

 import { TRPCError } from "@trpc/server";

@@ -19,8 +20,9 @@ const listHandler = async (opts: GetOptions) => {
      message: "You need to be apart of an organization to use this feature",
    });
  }
+  const attributeRepo = new PrismaAttributeRepository(prisma);

-  return await PrismaAttributeRepository.findAllByOrgIdWithOptions({ orgId: org.id });
+  return await attributeRepo.findAllByOrgIdWithOptions({ orgId: org.id });
 };

 export default listHandler;
@@ -1,9 +1,9 @@
+import { HostRepository } from "@calcom/lib/server/repository/host";
 import { prisma } from "@calcom/prisma";

 import { TRPCError } from "@trpc/server";

 import type { TrpcSessionUser } from "../../../../types";
-import { updateHostsWithNewDefaultSchedule } from "../util";
 import type { TDeleteInputSchema } from "./delete.schema";

 type DeleteOptions = {
@@ -15,6 +15,7 @@ type DeleteOptions = {

 export const deleteHandler = async ({ input, ctx }: DeleteOptions) => {
  const { user } = ctx;
+  const hostRepo = new HostRepository(prisma);

  const scheduleToDelete = await prisma.schedule.findUnique({
    where: {
@@ -46,7 +47,7 @@ export const deleteHandler = async ({ input, ctx }: DeleteOptions) => {
    // to throw the error if there arent any other schedules
    if (!scheduleToSetAsDefault) throw new TRPCError({ code: "BAD_REQUEST" });

-    await updateHostsWithNewDefaultSchedule(user.id, input.scheduleId, scheduleToSetAsDefault.id);
+    await hostRepo.updateHostsSchedule(user.id, input.scheduleId, scheduleToSetAsDefault.id);

    await prisma.user.update({
      where: {
@@ -57,7 +58,7 @@ export const deleteHandler = async ({ input, ctx }: DeleteOptions) => {
      },
    });
  } else if (user.defaultScheduleId) {
-    await updateHostsWithNewDefaultSchedule(user.id, input.scheduleId, user.defaultScheduleId);
+    await hostRepo.updateHostsSchedule(user.id, input.scheduleId, user.defaultScheduleId);
  }

  await prisma.schedule.delete({
@@ -1,13 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";

+import { HostRepository } from "@calcom/lib/server/repository/host";
 import { PrismaClient } from "@calcom/prisma";

-import {
-  getDefaultScheduleId,
-  hasDefaultSchedule,
-  setupDefaultSchedule,
-  updateHostsWithNewDefaultSchedule,
-} from "./util";
+import { getDefaultScheduleId, hasDefaultSchedule, setupDefaultSchedule } from "./util";

 vi.mock("@calcom/prisma", () => {
  const mockPrisma = {
@@ -31,9 +27,11 @@ vi.mock("@calcom/prisma", () => {

 describe("Availability Utils", () => {
  let prisma: PrismaClient;
+  let hostRepo: HostRepository;

  beforeEach(() => {
    prisma = new PrismaClient();
+    hostRepo = new HostRepository(prisma);
    vi.clearAllMocks();
  });

@@ -158,7 +156,7 @@ describe("Availability Utils", () => {

      (prisma.host.updateMany as any).mockResolvedValue(updateResult);

-      const result = await updateHostsWithNewDefaultSchedule(userId, oldScheduleId, newScheduleId, prisma);
+      const result = await hostRepo.updateHostsSchedule(userId, oldScheduleId, newScheduleId);

      expect(prisma.host.updateMany).toHaveBeenCalledWith({
        where: {
@@ -180,7 +178,7 @@ describe("Availability Utils", () => {

      (prisma.host.updateMany as any).mockResolvedValue(updateResult);

-      const result = await updateHostsWithNewDefaultSchedule(userId, oldScheduleId, newScheduleId, prisma);
+      const result = await hostRepo.updateHostsSchedule(userId, oldScheduleId, newScheduleId);

      expect(prisma.host.updateMany).toHaveBeenCalledWith({
        where: {
@@ -1,6 +1,5 @@
 import type { User } from "@prisma/client";

-import { HostRepository } from "@calcom/lib/server/repository/host";
 import type { PrismaClient } from "@calcom/prisma";

 export const getDefaultScheduleId = async (userId: number, prisma: PrismaClient) => {
@@ -54,11 +53,3 @@ export const setupDefaultSchedule = async (userId: number, scheduleId: number, p
    },
  });
 };
-
-export const updateHostsWithNewDefaultSchedule = async (
-  userId: number,
-  defaultScheduleId: number,
-  scheduleId: number
-) => {
-  return await HostRepository.updateHostsSchedule(userId, defaultScheduleId, scheduleId);
-};
@@ -440,5 +440,63 @@ const checkIfUserIsAuthorizedToConfirmBooking = async ({
    if (membership) return;
  }

+  if (bookingUserId && (await isLoggedInUserOrgAdminOfBookingUser(loggedInUserId, bookingUserId))) {
+    return;
+  }
+
  throw new TRPCError({ code: "UNAUTHORIZED", message: "User is not authorized to confirm this booking" });
 };
+
+async function isLoggedInUserOrgAdminOfBookingUser(loggedInUserId: number, bookingUserId: number) {
+  const orgIdsWhereLoggedInUserAdmin = await getOrgIdsWhereAdmin(loggedInUserId);
+
+  if (orgIdsWhereLoggedInUserAdmin.length === 0) {
+    return false;
+  }
+
+  const bookingUserOrgMembership = await prisma.membership.findFirst({
+    where: {
+      userId: bookingUserId,
+      teamId: {
+        in: orgIdsWhereLoggedInUserAdmin,
+      },
+      team: {
+        parentId: null,
+      },
+    },
+  });
+
+  if (bookingUserOrgMembership) return true;
+
+  const bookingUserOrgTeamMembership = await prisma.membership.findFirst({
+    where: {
+      userId: bookingUserId,
+      team: {
+        parentId: {
+          in: orgIdsWhereLoggedInUserAdmin,
+        },
+      },
+    },
+  });
+
+  return !!bookingUserOrgTeamMembership;
+}
+
+async function getOrgIdsWhereAdmin(loggedInUserId: number) {
+  const loggedInUserOrgMemberships = await prisma.membership.findMany({
+    where: {
+      userId: loggedInUserId,
+      role: {
+        in: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      },
+      team: {
+        parentId: null,
+      },
+    },
+    select: {
+      teamId: true,
+    },
+  });
+
+  return loggedInUserOrgMemberships.map((m) => m.teamId);
+}
@@ -80,7 +80,7 @@ export async function toggleDelegationCredentialEnabled(
    if (slug === "google") {
      calendarAppName = "Google Calendar";
      conferencingAppName = "Google Meet";
-    } else if (slug === "microsoft") {
+    } else if (slug === "office365") {
      calendarAppName = "Microsoft 365";
      conferencingAppName = "Microsoft Teams";
    } else {
@@ -1,19 +0,0 @@
-import publicProcedure from "../../../procedures/publicProcedure";
-import { router } from "../../../trpc";
-import { ZGetTeamScheduleInputSchema } from "./getTeamSchedule.schema";
-
-type SlotsRouterHandlerCache = {
-  getTeamSchedule?: typeof import("./getTeamSchedule.handler").getTeamScheduleHandler;
-};
-
-/** This should be called getAvailableSlots */
-export const highPerfRouter = router({
-  getTeamSchedule: publicProcedure.input(ZGetTeamScheduleInputSchema).query(async ({ input, ctx }) => {
-    const { getTeamScheduleHandler } = await import("./getTeamSchedule.handler");
-
-    return getTeamScheduleHandler({
-      ctx,
-      input,
-    });
-  }),
-});
@@ -1,19 +0,0 @@
-import type { IncomingMessage } from "http";
-
-import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots";
-
-import type { TGetTeamScheduleInputSchema } from "./getTeamSchedule.schema";
-
-export type GetTeamScheduleOptions = {
-  ctx?: ContextForGetSchedule;
-  input: TGetTeamScheduleInputSchema;
-};
-
-interface ContextForGetSchedule extends Record<string, unknown> {
-  req?: (IncomingMessage & { cookies: Partial<{ [key: string]: string }> }) | undefined;
-}
-
-export const getTeamScheduleHandler = async ({ ctx, input }: GetTeamScheduleOptions) => {
-  const availableSlotsService = getAvailableSlotsService();
-  return await availableSlotsService.getAvailableSlots({ ctx, input });
-};
@@ -1,7 +0,0 @@
-import type { z } from "zod";
-
-import { getScheduleSchema } from "../slots/types";
-
-export const ZGetTeamScheduleInputSchema = getScheduleSchema;
-
-export type TGetTeamScheduleInputSchema = z.infer<typeof ZGetTeamScheduleInputSchema>;
@@ -165,7 +165,7 @@ export const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function
              "w-full min-w-0 truncate border-0 bg-transparent focus:outline-none focus:ring-0",
              "text-default rounded-lg text-sm font-medium leading-none",
              "placeholder:text-muted disabled:cursor-not-allowed disabled:bg-transparent",
-              addOnLeading && "pl-0.5 pr-0",
+              addOnLeading && "rounded-none pl-0.5 pr-0",
              addOnSuffix && "pl-0",
              className
            )}
Author	SHA1	Message	Date
Volnei Munhoz	3f8d2f2b38	chore: add coderabbit config file (#23200 ) Post release / release (push) Canceled after 0s Details * chore: add coderabbit config file * remove wrong config * add coderabbit instructions * remove unnecessary paths * add path instructions * Fix duplicated instructions on yaml file * Fix coderabbit.yaml syntax	2025-08-20 22:55:27 +00:00
emrysal	c3731d9f17	chore: release v5.6.3	2025-08-20 22:49:28 +00:00
Vitor Monteiro	6e4b2d8886	fix: addOnLeading text field caret cropping (#23225 )	2025-08-20 22:32:19 +00:00
Joe Au-Yeung coderabbitai[bot]Alex van Andel	cf13c06c57	chore: Upgrade `boxyhq/saml-jackson` to 1.52.2 (#23231 ) * Upgrade jackson to 1.52.2 * Update apps/web/package.json Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Remove unused option prop --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>	2025-08-20 23:13:36 +01:00
Anik Dhabal Babu	e309e72be3	fix: duplicate event created on attendee calendar (#23216 )	2025-08-20 15:53:15 +00:00
Lauris Skraucis Anik Dhabal Babu Rajiv Sahal	b4d804de7c	chore: hide cal branding for platform bookings (#22979 ) Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>	2025-08-20 12:27:09 -03:00
Volnei Munhoz	f501ef3269	refactor: remove highperf endpoints (#23171 ) * refactor: remove highperf endpoints * fix trpc function name * chore: remove isTeamEvent logic * chore: remove isTeamEvent at all * revert wrong change * Revert "chore: remove isTeamEvent at all" This reverts commit 6dbc8c31f16c40a7654a05240661d7892aa48bb8. * revert wrong change	2025-08-20 15:12:31 +00:00
Volnei Munhoz	79f1074f93	chore: Remove Vercel functions memory config (#23125 ) * chore:Remove Vercel memory config * chore: remove empty vercel.json configs	2025-08-20 14:51:45 +00:00
Vansh GilhotraandKartik Saini	48aa6bf489	fix: Add missing CSS variable for switch component accent color in getting-started flow (#23129 ) - Fix switch component thumb appearing all white when ON - Add --cal-brand-accent CSS variable definitions for light and dark modes - Ensures proper contrast: white accent on dark bg, black accent on light bg - Resolves UI issue on /getting-started/connected-calendar and /getting-started/setup-availability pages Fixes switch components using bg-brand-accent class that maps to var(--cal-brand-accent,white) When CSS variable was undefined, it defaulted to white causing invisible thumbs. Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com>	2025-08-20 18:29:03 +05:30
Hariom Balhara	8ed2aacd9e	Add organization rewrite logs (#23210 )	2025-08-20 11:51:55 +00:00
Hariom BalharaandDevin AI	dfc5d914fc	chore: Routing Forms - remove unused report.handler.ts and jsonLogicToPrisma functionality (#23032 ) * feat: remove unused report.handler.ts and jsonLogicToPrisma functionality - Remove unused packages/app-store/routing-forms/trpc/report.handler.ts - Remove packages/app-store/routing-forms/jsonLogicToPrisma.ts implementation - Remove packages/app-store/routing-forms/__tests__/jsonLogicToPrisma.test.ts test file These files were no longer being used in the routing-forms package. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: clean up remaining references to removed report functionality - Remove unused report.schema.ts file - Remove buildResponsesForReporting test file - Remove report endpoint from router - Update comment referencing jsonLogicToPrisma All references to the removed jsonLogicToPrisma and report handler functionality have been cleaned up. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Update packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>	2025-08-20 15:17:35 +05:30
Tim NeutkensandKeith Williams	0a11c45065	perf: Only run Sentry in production (#23167 ) * Only run Sentry in production * Only run Sentry in production for instrumentation-client --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com>	2025-08-20 07:27:51 +00:00
Tim Neutkens	4ae5de5a3a	Only apply autoprefixer in production (#23168 )	2025-08-20 07:26:32 +00:00
github-actions[bot]	e6959f3c7c	chore: version packages (#23188 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-08-20 04:57:40 +00:00
emrysal	67af8b4973	chore: release v5.6.2 Post release / release (push) Canceled after 0s Details	2025-08-20 01:36:25 +00:00
Volnei Munhoz	7794f2596e	chore: deprecated prisma default export (#23199 )	2025-08-19 19:42:10 +00:00
Shaunak Das Ryukemeister Rajiv Sahal	167cf6e352	feat: add team schedules (#22954 ) * feat: add team schedules * fixup: implement feedback for teams controller * cleanup unused functions * fixup: implement PR feedback * fixup: move over teams schedule controller inside of teams module * remove unused param and update summary * fixup: move over teams schedules controller inside of teams module * update e2e tests * add team schedule module * update teams schedules module * fixup: update guards * init tests for teams schedules controller * implement code rabbit feedback * fixup: implement PR feedback * fixup: remove getTeamSchedulesByUserIds --------- Co-authored-by: Ryukemeister <sahalrajiv6900@gmail.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>	2025-08-19 17:03:55 +03:00
Lauris SkraucisandSomay Chauhan	3d778ba481	fix: get organization bookings bookingUid parameter (#23186 ) * fix: get organization bookings bookingUid parameter * chore: bump @calcom/platform-libraries from 0.0.315 to 0.0.318 --------- Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>	2025-08-19 15:46:40 +02:00
Eunjae Lee Devin AI Udit Takkar	b8f0000b59	feat: hide member filter for users with only MEMBER role (#23097 ) - Conditionally disable userId column filter based on isTeamAdminOrOwner flag - Prevents MEMBER-only users from encountering backend permission errors - Users with ADMIN/OWNER role in any team can still access the filter Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>	2025-08-19 22:28:02 +09:00
Somay Chauhan	618ef63017	fix: Availability atom handleFormSubmit callbacks not triggering (#23174 ) * fix: form submit callbacks trigger * added changelog * fix: type-error	2025-08-19 17:46:26 +05:30
Morgan	ae8e633716	fix: correct impossible logical condition in Office365 calendar error handling #23151 (#23185 )	2025-08-19 12:10:28 +00:00
Somay Chauhan	4a23832388	refactor: update `microsoft` platform slug to `office365` for consistency (#23179 ) * refactor: update Microsoft platform slug to office365 for consistency * Update server.test.ts	2025-08-19 15:04:47 +03:00
Benny Joo	02e486d757	perf: og image caching v1 (#23180 ) * perf: og image caching v1 * fix * fix	2025-08-19 08:54:39 -03:00
Anik Dhabal Babu	af6e24f433	fix: error oening date override input dialog (#23182 )	2025-08-19 11:00:33 +00:00
Joe Au-Yeung	f9e24f51a7	refactor: Extract `<CalVideoSettings />` from `<Locations /> (#23113 ) * Create `CalVideoSettings` type * Create `LocationOptionContainer` * Extract cal video settings to `CalVideoSettings` * Refactor `<Locations />` component to use `<CalVideoSettings />` * Unify naming * Move location folder back under components * Type fixes * Delete console.log	2025-08-19 10:24:28 +00:00
Morgan	9e9f815809	refactor: replace static methods of HostRepository and PrismaAttributeRepository (#23175 )	2025-08-19 07:59:16 +00:00
Lauris Skraucis	a91561f3c2	fix: allow org admin to accept/reject booking (#23164 ) * fix: allow org admin to accept/reject booking * chore: bump platform libraries	2025-08-19 12:10:24 +05:30
Joe Au-YeungandHariom Balhara	ff79064ca7	fix: Managed event types - children inherit team's appearance settings (#23116 ) * Get parent event type team's appearance settings * Use style profile to get brand colours * Update packages/features/eventtypes/lib/getPublicEvent.ts --------- Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>	2025-08-19 05:52:27 +00:00
Radhey MugdalandKartik Saini	1a573e1619	feat: v2 api hidden event types (#22715 ) * feat: v2 api hidden event types * feat: Add 'hidden' property to Input type in output.service.ts --------- Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com>	2025-08-19 11:07:12 +05:30
沙什瓦特	511be7386c	Fixed scroll issue while configuring workflow (#23142 )	2025-08-19 11:03:54 +05:30