From 69c383214282252723d2815490419b5fd67640c6 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 7 Oct 2025 17:26:58 +0530
Subject: [PATCH 01/54] feat: report booking

---
 .../components/booking/BookingListItem.tsx    |  39 ++++
 apps/web/components/booking/bookingActions.ts |  22 ++
 .../components/dialog/ReportBookingDialog.tsx | 191 ++++++++++++++++++
 apps/web/public/static/locales/en/common.json |  13 ++
 .../booking-report.repository.interface.ts    |  39 ++++
 .../bookings/lib/booking-report.repository.ts | 115 +++++++++++
 .../bookings/lib/booking-report.utils.ts      |   7 +
 .../repositories/BookingRepository.ts         |  26 +++
 .../migration.sql                             |  44 ++++
 packages/prisma/schema.prisma                 |  34 ++++
 .../routers/viewer/bookings/_router.tsx       |  11 +
 .../routers/viewer/bookings/get.handler.ts    |  11 +
 .../viewer/bookings/reportBooking.handler.ts  | 150 ++++++++++++++
 .../viewer/bookings/reportBooking.schema.ts   |  13 ++
 14 files changed, 715 insertions(+)
 create mode 100644 apps/web/components/dialog/ReportBookingDialog.tsx
 create mode 100644 packages/features/bookings/lib/booking-report.repository.interface.ts
 create mode 100644 packages/features/bookings/lib/booking-report.repository.ts
 create mode 100644 packages/features/bookings/lib/booking-report.utils.ts
 create mode 100644 packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
 create mode 100644 packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index f673aa9f6440fb..fd83c668a2b46b 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -52,6 +52,7 @@ import { AddGuestsDialog } from "@components/dialog/AddGuestsDialog";
 import { ChargeCardDialog } from "@components/dialog/ChargeCardDialog";
 import { EditLocationDialog } from "@components/dialog/EditLocationDialog";
 import { ReassignDialog } from "@components/dialog/ReassignDialog";
+import { ReportBookingDialog } from "@components/dialog/ReportBookingDialog";
 import { RerouteDialog } from "@components/dialog/RerouteDialog";
 import { RescheduleDialog } from "@components/dialog/RescheduleDialog";
 
@@ -60,6 +61,7 @@ import {
   getCancelEventAction,
   getEditEventActions,
   getAfterEventActions,
+  getReportAction,
   shouldShowPendingActions,
   shouldShowEditActions,
   shouldShowRecurringCancelAction,
@@ -292,6 +294,7 @@ function BookingListItem(booking: BookingItemProps) {
   const [isOpenReassignDialog, setIsOpenReassignDialog] = useState(false);
   const [isOpenSetLocationDialog, setIsOpenLocationDialog] = useState(false);
   const [isOpenAddGuestsDialog, setIsOpenAddGuestsDialog] = useState(false);
+  const [isOpenReportDialog, setIsOpenReportDialog] = useState(false);
   const [rerouteDialogIsOpen, setRerouteDialogIsOpen] = useState(false);
   const setLocationMutation = trpc.viewer.bookings.editLocation.useMutation({
     onSuccess: () => {
@@ -402,6 +405,14 @@ function BookingListItem(booking: BookingItemProps) {
       (action.id === "view_recordings" && !booking.isRecorded),
   })) as ActionType[];
 
+  const reportAction = getReportAction(actionContext);
+  const reportActionWithHandler = reportAction
+    ? {
+        ...reportAction,
+        onClick: () => setIsOpenReportDialog(true),
+      }
+    : null;
+
   return (
     <>
       <RescheduleDialog
@@ -430,6 +441,12 @@ function BookingListItem(booking: BookingItemProps) {
         setIsOpenDialog={setIsOpenAddGuestsDialog}
         bookingId={booking.id}
       />
+      <ReportBookingDialog
+        isOpenDialog={isOpenReportDialog}
+        setIsOpenDialog={setIsOpenReportDialog}
+        bookingId={booking.id}
+        isRecurring={isRecurring}
+      />
       {booking.paid && booking.payment[0] && (
         <ChargeCardDialog
           isOpenDialog={chargeCardDialogIsOpen}
@@ -685,6 +702,21 @@ function BookingListItem(booking: BookingItemProps) {
                         </DropdownItem>
                       </DropdownMenuItem>
                     ))}
+                    {reportActionWithHandler && (
+                      <>
+                        <DropdownMenuSeparator />
+                        <DropdownMenuItem className="rounded-lg" key={reportActionWithHandler.id}>
+                          <DropdownItem
+                            type="button"
+                            color={reportActionWithHandler.color}
+                            StartIcon={reportActionWithHandler.icon}
+                            onClick={reportActionWithHandler.onClick}
+                            data-testid={reportActionWithHandler.id}>
+                            {reportActionWithHandler.label}
+                          </DropdownItem>
+                        </DropdownMenuItem>
+                      </>
+                    )}
                     <DropdownMenuSeparator />
                     <DropdownMenuItem
                       className="rounded-lg"
@@ -776,6 +808,13 @@ const BookingItemBadges = ({
       {booking?.assignmentReason.length > 0 && (
         <AssignmentReasonTooltip assignmentReason={booking.assignmentReason[0]} />
       )}
+      {booking.reports && booking.reports.length > 0 && (
+        <Badge className="ltr:mr-2 rtl:ml-2" variant="red">
+          {booking.reportedByCurrentUser
+            ? t("reported_by_you")
+            : t("reported_count", { count: booking.reports.length })}
+        </Badge>
+      )}
       {booking.paid && !booking.payment[0] ? (
         <Badge className="ltr:mr-2 rtl:ml-2" variant="orange">
           {t("error_collecting_card")}
diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index 7d50942ebf450a..d202acb71ebe5a 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -165,6 +165,28 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
   return actions.filter(Boolean) as ActionType[];
 }
 
+export function getReportAction(context: BookingActionContext): ActionType | null {
+  const { booking, isCancelled, isRejected, t } = context;
+
+  // Don't show if current user already reported
+  if (booking.reportedByCurrentUser) {
+    return null;
+  }
+
+  // For cancelled/rejected: only show if others already reported
+  if ((isCancelled || isRejected) && (!booking.reports || booking.reports.length === 0)) {
+    return null;
+  }
+
+  return {
+    id: "report",
+    label: booking.reports && booking.reports.length > 0 ? t("add_to_report") : t("report_booking"),
+    icon: "flag",
+    color: "destructive",
+    disabled: false,
+  };
+}
+
 export function getAfterEventActions(context: BookingActionContext): ActionType[] {
   const { booking, cardCharged, attendeeList, t } = context;
 
diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
new file mode 100644
index 00000000000000..04b0826e4f8158
--- /dev/null
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -0,0 +1,191 @@
+import type { Dispatch, SetStateAction } from "react";
+import { useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+
+import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { ReportReason } from "@calcom/prisma/enums";
+import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
+import { Checkbox } from "@calcom/ui/components/form";
+import { DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { Icon } from "@calcom/ui/components/icon";
+import { Label } from "@calcom/ui/components/label";
+import { Select } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { TextArea } from "@calcom/ui/components/form";
+
+interface IReportBookingDialog {
+  isOpenDialog: boolean;
+  setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
+  bookingId: number;
+  isRecurring: boolean;
+}
+
+interface FormValues {
+  reason: ReportReason;
+  description: string;
+  cancelBooking: boolean;
+  allRemainingBookings: boolean;
+}
+
+export const ReportBookingDialog = (props: IReportBookingDialog) => {
+  const { t } = useLocale();
+  const utils = trpc.useUtils();
+  const { isOpenDialog, setIsOpenDialog, bookingId, isRecurring } = props;
+
+  const {
+    control,
+    handleSubmit,
+    watch,
+    formState: { errors },
+  } = useForm<FormValues>({
+    defaultValues: {
+      reason: ReportReason.SPAM,
+      description: "",
+      cancelBooking: false,
+      allRemainingBookings: false,
+    },
+  });
+
+  const cancelBooking = watch("cancelBooking");
+
+  const { mutate: reportBooking, isPending } = trpc.viewer.bookings.reportBooking.useMutation({
+    async onSuccess(data) {
+      showToast(data.message, "success");
+      setIsOpenDialog(false);
+      await utils.viewer.bookings.invalidate();
+    },
+    onError(error) {
+      showToast(error.message || t("unexpected_error_try_again"), "error");
+    },
+  });
+
+  const onSubmit = (data: FormValues) => {
+    reportBooking({
+      bookingId,
+      reason: data.reason,
+      description: data.description || undefined,
+      cancelBooking: data.cancelBooking,
+      allRemainingBookings: data.allRemainingBookings,
+    });
+  };
+
+  const reasonOptions = [
+    { label: t("report_reason_spam"), value: ReportReason.SPAM },
+    { label: t("report_reason_dont_know_person"), value: ReportReason.DONT_KNOW_PERSON },
+    { label: t("report_reason_other"), value: ReportReason.OTHER },
+  ];
+
+  return (
+    <Dialog open={isOpenDialog} onOpenChange={setIsOpenDialog}>
+      <DialogContent enableOverflow>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <div className="flex flex-row space-x-3">
+            <div className="bg-subtle flex h-10 w-10 flex-shrink-0 justify-center rounded-full">
+              <Icon name="flag" className="text-destructive m-auto h-6 w-6" />
+            </div>
+            <div className="w-full pt-1">
+              <DialogHeader title={t("report_booking")} />
+              <p className="text-subtle mb-6 text-sm">{t("report_booking_description")}</p>
+
+              <div className="mb-4">
+                <Label htmlFor="reason" className="text-emphasis mb-2 block text-sm font-medium">
+                  {t("reason")} <span className="text-destructive">*</span>
+                </Label>
+                <Controller
+                  name="reason"
+                  control={control}
+                  rules={{ required: t("field_required") }}
+                  render={({ field }) => (
+                    <Select
+                      {...field}
+                      options={reasonOptions}
+                      onChange={(option) => {
+                        if (option) field.onChange(option.value);
+                      }}
+                      value={reasonOptions.find((opt) => opt.value === field.value)}
+                    />
+                  )}
+                />
+                {errors.reason && (
+                  <p className="text-destructive mt-1 text-sm">{errors.reason.message}</p>
+                )}
+              </div>
+
+              <div className="mb-4">
+                <Label htmlFor="description" className="text-emphasis mb-2 block text-sm font-medium">
+                  {t("description")} <span className="text-subtle font-normal">({t("optional")})</span>
+                </Label>
+                <Controller
+                  name="description"
+                  control={control}
+                  render={({ field }) => (
+                    <TextArea
+                      {...field}
+                      placeholder={t("report_booking_description_placeholder")}
+                      rows={3}
+                    />
+                  )}
+                />
+              </div>
+
+              <div className="mb-4">
+                <Controller
+                  name="cancelBooking"
+                  control={control}
+                  render={({ field }) => (
+                    <div className="flex items-center">
+                      <Checkbox
+                        id="cancelBooking"
+                        checked={field.value}
+                        onCheckedChange={field.onChange}
+                      />
+                      <Label htmlFor="cancelBooking" className="text-emphasis ml-2 text-sm">
+                        {t("cancel_booking_when_reporting")}
+                      </Label>
+                    </div>
+                  )}
+                />
+              </div>
+
+              {isRecurring && cancelBooking && (
+                <div className="mb-4">
+                  <Controller
+                    name="allRemainingBookings"
+                    control={control}
+                    render={({ field }) => (
+                      <div className="flex items-center">
+                        <Checkbox
+                          id="allRemainingBookings"
+                          checked={field.value}
+                          onCheckedChange={field.onChange}
+                        />
+                        <Label htmlFor="allRemainingBookings" className="text-emphasis ml-2 text-sm">
+                          {t("report_all_remaining_bookings")}
+                        </Label>
+                      </div>
+                    )}
+                  />
+                </div>
+              )}
+            </div>
+          </div>
+
+          <DialogFooter showDivider className="mt-8">
+            <Button
+              type="button"
+              color="secondary"
+              onClick={() => setIsOpenDialog(false)}
+              disabled={isPending}>
+              {t("cancel")}
+            </Button>
+            <Button type="submit" color="destructive" disabled={isPending} loading={isPending}>
+              {t("submit_report")}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index ce2c3c4f432215..ca653cebdee172 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -86,6 +86,14 @@
   "rejection_reason_title": "Reject the booking request?",
   "rejection_reason_description": "Are you sure you want to reject the booking? We'll let the person who tried to book know. You can provide a reason below.",
   "rejection_confirmation": "Reject the booking",
+  "report_booking_description": "Report this booking as problematic. This helps us identify and prevent spam or unwanted bookings.",
+  "report_reason_spam": "Spam or unwanted booking",
+  "report_reason_dont_know_person": "I don't know this person",
+  "report_reason_other": "Other",
+  "cancel_booking_when_reporting": "Cancel this booking",
+  "report_all_remaining_bookings": "Report all remaining bookings in series",
+  "submit_report": "Submit Report",
+  "report_booking_description_placeholder": "Please provide additional details about why you're reporting this booking (optional)",
   "manage_this_event": "Manage this event",
   "invite_team_member": "Invite team member",
   "invite_team_individual_segment": "Invite individual",
@@ -759,6 +767,11 @@
   "cancel_all_remaining": "Cancel all remaining",
   "apply": "Apply",
   "cancel_event": "Cancel event",
+  "report_booking": "Report booking",
+  "add_to_report": "Add to report",
+  "reported": "Reported",
+  "reported_by_you": "Reported by you",
+  "reported_count": "Reported ({{count}})",
   "continue": "Continue",
   "confirm": "Confirm",
   "confirm_all": "Confirm all",
diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
new file mode 100644
index 00000000000000..4c789dd27e32d6
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -0,0 +1,39 @@
+import type { ReportReason } from "@calcom/prisma/enums";
+
+export interface CreateBookingReportInput {
+  bookingId: number;
+  bookerEmail: string;
+  reportedById: number;
+  reason: ReportReason;
+  description?: string;
+  cancelled: boolean;
+}
+
+export interface BookingReportSummary {
+  id: string;
+  reportedById: number;
+  reason: ReportReason;
+  createdAt: Date;
+}
+
+export interface IBookingReportRepository {
+  /**
+   * Creates a new booking report
+   */
+  createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
+
+  /**
+   * Finds a report by a specific user for a specific booking
+   */
+  findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null>;
+
+  /**
+   * Finds all reports for a specific booking
+   */
+  findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]>;
+
+  /**
+   * Checks if a user has reported any booking in a recurring series
+   */
+  hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean>;
+}
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
new file mode 100644
index 00000000000000..4bbecfe82c626f
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -0,0 +1,115 @@
+import { captureException } from "@sentry/nextjs";
+
+import type { PrismaClient } from "@calcom/prisma";
+import type { ReportReason } from "@calcom/prisma/enums";
+
+import type {
+  BookingReportSummary,
+  CreateBookingReportInput,
+  IBookingReportRepository,
+} from "./booking-report.repository.interface";
+
+export class BookingReportRepository implements IBookingReportRepository {
+  constructor(private readonly prismaClient: PrismaClient) {}
+
+  /**
+   * Creates a new booking report
+   */
+  async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
+    try {
+      const report = await this.prismaClient.bookingReport.create({
+        data: {
+          bookingId: input.bookingId,
+          bookerEmail: input.bookerEmail,
+          reportedById: input.reportedById,
+          reason: input.reason,
+          description: input.description,
+          cancelled: input.cancelled,
+        },
+        select: {
+          id: true,
+        },
+      });
+      return report;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
+  /**
+   * Finds a report by a specific user for a specific booking
+   * Uses the composite unique constraint (bookingId, reportedById)
+   */
+  async findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null> {
+    try {
+      const report = await this.prismaClient.bookingReport.findUnique({
+        where: {
+          bookingId_reportedById: {
+            bookingId,
+            reportedById: userId,
+          },
+        },
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          createdAt: true,
+        },
+      });
+      return report;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
+  /**
+   * Finds all reports for a specific booking
+   */
+  async findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]> {
+    try {
+      const reports = await this.prismaClient.bookingReport.findMany({
+        where: {
+          bookingId,
+        },
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          createdAt: true,
+        },
+        orderBy: {
+          createdAt: "asc",
+        },
+      });
+      return reports;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
+  /**
+   * Checks if a user has reported any booking in a recurring series
+   */
+  async hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean> {
+    try {
+      const report = await this.prismaClient.bookingReport.findFirst({
+        where: {
+          reportedById: userId,
+          booking: {
+            recurringEventId,
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+      return !!report;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+}
diff --git a/packages/features/bookings/lib/booking-report.utils.ts b/packages/features/bookings/lib/booking-report.utils.ts
new file mode 100644
index 00000000000000..fb799d71e43cd6
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.utils.ts
@@ -0,0 +1,7 @@
+/**
+ * Extracts the booker email from booking attendees
+ * Convention: first attendee is the booker
+ */
+export function extractBookerEmail(attendees: Array<{ email: string }>): string | null {
+  return attendees[0]?.email || null;
+}
diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index 4aaf5c641b7542..f9896efd408714 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -187,6 +187,32 @@ export class BookingRepository {
     });
   }
 
+  async getBookingForReporting({ bookingId }: { bookingId: number }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        id: true,
+        uid: true,
+        startTime: true,
+        status: true,
+        recurringEventId: true,
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+        reports: {
+          select: {
+            id: true,
+            reportedById: true,
+          },
+        },
+      },
+    });
+  }
+
   private async _findAllExistingBookingsForEventTypeBetween({
     eventTypeId,
     seatedEvent = false,
diff --git a/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql b/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
new file mode 100644
index 00000000000000..dc1369a0ceb59a
--- /dev/null
+++ b/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
@@ -0,0 +1,44 @@
+-- CreateEnum
+CREATE TYPE "ReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
+
+-- CreateTable
+CREATE TABLE "BookingReport" (
+    "id" UUID NOT NULL,
+    "bookingId" INTEGER NOT NULL,
+    "bookerEmail" TEXT NOT NULL,
+    "reportedById" INTEGER NOT NULL,
+    "reason" "ReportReason" NOT NULL,
+    "description" TEXT,
+    "cancelled" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "watchlistId" UUID,
+
+    CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "BookingReport_bookingId_idx" ON "BookingReport"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "BookingReport_bookingId_reportedById_key" ON "BookingReport"("bookingId", "reportedById");
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index d4e8a01ca5be9c..a5645e6be32537 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -451,6 +451,7 @@ model User {
   updatedAttributeToUsers        AttributeToUser[]             @relation("updatedBy")
   createdTranslations            EventTypeTranslation[]        @relation("CreatedEventTypeTranslations")
   updatedTranslations            EventTypeTranslation[]        @relation("UpdatedEventTypeTranslations")
+  reportedBookings               BookingReport[]               @relation("ReportedBookings")
   BookingInternalNote            BookingInternalNote[]
   creationSource                 CreationSource?
   createdOrganizationOnboardings OrganizationOnboarding[]      @relation("CreatedOrganizationOnboardings")
@@ -848,6 +849,7 @@ model Booking {
   tracking                     Tracking?
   routingFormResponses         RoutingFormResponseDenormalized[]
   expenseLogs                  CreditExpenseLog[]
+  reports                      BookingReport[]
 
   @@index([eventTypeId])
   @@index([userId])
@@ -2316,6 +2318,8 @@ model Watchlist {
   source         WatchlistSource @default(MANUAL)
   lastUpdatedAt  DateTime        @default(now())
 
+  bookingReports BookingReport[]
+
   @@unique([type, value, organizationId])
   @@index([type, value, organizationId, action])
 }
@@ -2344,6 +2348,36 @@ model WatchlistEventAudit {
   timestamp   DateTime        @default(now())
 }
 
+enum ReportReason {
+  SPAM
+  DONT_KNOW_PERSON @map("dont_know_person")
+  OTHER
+}
+
+model BookingReport {
+  id           String       @id @default(uuid()) @db.Uuid
+  bookingId    Int
+  bookerEmail  String
+  reportedById Int
+  reason       ReportReason
+  description  String?
+  cancelled    Boolean      @default(false)
+  createdAt    DateTime     @default(now())
+
+  watchlistId String? @db.Uuid
+
+  booking    Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
+  reportedBy User       @relation("ReportedBookings", fields: [reportedById], references: [id], onDelete: Cascade)
+  watchlist  Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
+
+  @@unique([bookingId, reportedById])
+  @@index([bookingId])
+  @@index([bookerEmail])
+  @@index([reportedById])
+  @@index([watchlistId])
+  @@index([createdAt])
+}
+
 enum BillingPeriod {
   MONTHLY
   ANNUALLY
diff --git a/packages/trpc/server/routers/viewer/bookings/_router.tsx b/packages/trpc/server/routers/viewer/bookings/_router.tsx
index d5eaff4f0505c6..6a6bfb6254b67f 100644
--- a/packages/trpc/server/routers/viewer/bookings/_router.tsx
+++ b/packages/trpc/server/routers/viewer/bookings/_router.tsx
@@ -8,6 +8,7 @@ import { ZFindInputSchema } from "./find.schema";
 import { ZGetInputSchema } from "./get.schema";
 import { ZGetBookingAttendeesInputSchema } from "./getBookingAttendees.schema";
 import { ZInstantBookingInputSchema } from "./getInstantBookingLocation.schema";
+import { ZReportBookingInputSchema } from "./reportBooking.schema";
 import { ZRequestRescheduleInputSchema } from "./requestReschedule.schema";
 import { bookingsProcedure } from "./util";
 
@@ -20,6 +21,7 @@ type BookingsRouterHandlerCache = {
   getBookingAttendees?: typeof import("./getBookingAttendees.handler").getBookingAttendeesHandler;
   find?: typeof import("./find.handler").getHandler;
   getInstantBookingLocation?: typeof import("./getInstantBookingLocation.handler").getHandler;
+  reportBooking?: typeof import("./reportBooking.handler").reportBookingHandler;
 };
 
 export const bookingsRouter = router({
@@ -98,4 +100,13 @@ export const bookingsRouter = router({
         input,
       });
     }),
+
+  reportBooking: authedProcedure.input(ZReportBookingInputSchema).mutation(async ({ input, ctx }) => {
+    const { reportBookingHandler } = await import("./reportBooking.handler");
+
+    return reportBookingHandler({
+      ctx,
+      input,
+    });
+  }),
 });
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 9aea7ee396099d..835034bc10522e 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -3,6 +3,7 @@ import { type SelectQueryBuilder } from "kysely";
 import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";
 
 import dayjs from "@calcom/dayjs";
+import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
 import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
 import type { DB } from "@calcom/kysely";
 import kysely from "@calcom/kysely";
@@ -714,9 +715,19 @@ export async function getBookings({
         }
       }
 
+      // Fetch reports if exist
+      const bookingReportRepo = new BookingReportRepository(ctx.prisma);
+      const reports = await bookingReportRepo.findAllReportsForBooking(booking.id);
+
+      // Check if current user reported
+      const reportedByCurrentUser = reports.some((r) => r.reportedById === ctx.user.id);
+
       return {
         ...booking,
         rescheduler,
+        reports,
+        reportedByCurrentUser,
+        reportCount: reports.length,
         eventType: {
           ...booking.eventType,
           recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
new file mode 100644
index 00000000000000..9fe3a6948bf2d3
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -0,0 +1,150 @@
+import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
+import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
+import { extractBookerEmail } from "@calcom/features/bookings/lib/booking-report.utils";
+import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { prisma } from "@calcom/prisma";
+import { BookingStatus } from "@calcom/prisma/enums";
+import type { TrpcSessionUser } from "@calcom/trpc/server/types";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TReportBookingInputSchema } from "./reportBooking.schema";
+
+type ReportBookingOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TReportBookingInputSchema;
+};
+
+export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions) => {
+  const { user } = ctx;
+  const { bookingId, reason, description, cancelBooking, allRemainingBookings } = input;
+
+  const bookingRepo = new BookingRepository(prisma);
+  const bookingReportRepo = new BookingReportRepository(prisma);
+
+  const hasAccess = await bookingRepo.doesUserIdHaveAccessToBooking({
+    userId: user.id,
+    bookingId,
+  });
+
+  if (!hasAccess) {
+    throw new TRPCError({ code: "FORBIDDEN", message: "You don't have access to this booking" });
+  }
+
+  const booking = await bookingRepo.getBookingForReporting({ bookingId });
+
+  if (!booking) {
+    throw new TRPCError({ code: "NOT_FOUND", message: "Booking not found" });
+  }
+
+  // Check cancellation status - allow reporting cancelled bookings ONLY if others already reported
+  if (booking.status === BookingStatus.CANCELLED || booking.status === BookingStatus.REJECTED) {
+    if (booking.reports.length === 0) {
+      throw new TRPCError({
+        code: "BAD_REQUEST",
+        message: "Cannot report cancelled or rejected bookings",
+      });
+    }
+  }
+
+  const userReport = booking.reports.find((r) => r.reportedById === user.id);
+  if (userReport) {
+    throw new TRPCError({ code: "BAD_REQUEST", message: "You have already reported this booking" });
+  }
+
+  if (booking.recurringEventId && allRemainingBookings) {
+    // For recurring bookings, check if THIS USER has reported any booking in the series
+    const hasReportedSeries = await bookingReportRepo.hasUserReportedSeries(
+      booking.recurringEventId,
+      user.id
+    );
+
+    if (hasReportedSeries) {
+      throw new TRPCError({
+        code: "BAD_REQUEST",
+        message: "You have already reported this recurring booking series",
+      });
+    }
+  }
+
+  // Get the booker email (first attendee)
+  const bookerEmail = extractBookerEmail(booking.attendees);
+  if (!bookerEmail) {
+    throw new TRPCError({ code: "BAD_REQUEST", message: "Booking has no attendees" });
+  }
+
+  // Determine which bookings to report
+  let reportedBookingIds: number[] = [bookingId];
+
+  if (booking.recurringEventId && allRemainingBookings) {
+    // Get all remaining bookings in the series from the selected occurrence onward
+    const remainingRecurringBookings = await prisma.booking.findMany({
+      where: {
+        recurringEventId: booking.recurringEventId,
+        startTime: { gte: booking.startTime },
+      },
+      select: { id: true },
+      orderBy: { startTime: "asc" },
+    });
+    reportedBookingIds = remainingRecurringBookings.map((b) => b.id);
+  }
+
+  // Create reports for all relevant bookings
+  let createdCount = 0;
+  for (const id of reportedBookingIds) {
+    try {
+      await bookingReportRepo.createReport({
+        bookingId: id,
+        bookerEmail: bookerEmail,
+        reportedById: user.id,
+        reason,
+        description,
+        cancelled: cancelBooking,
+      });
+      createdCount++;
+    } catch (error) {
+      console.warn(`Failed to create report for booking ${id}:`, error);
+    }
+  }
+
+  const reportedBooking = { id: reportedBookingIds[0] };
+
+  // Cancel booking if requested and conditions are met
+  let cancellationError = null;
+  if (
+    cancelBooking &&
+    (booking.status === BookingStatus.ACCEPTED || booking.status === BookingStatus.PENDING) &&
+    new Date(booking.startTime) > new Date()
+  ) {
+    try {
+      await handleCancelBooking({
+        bookingData: {
+          uid: booking.uid,
+          cancelledBy: user.email,
+          allRemainingBookings: booking.recurringEventId && allRemainingBookings ? true : undefined,
+        },
+        userId: user.id,
+      });
+    } catch (error) {
+      cancellationError = error;
+      console.error("Failed to cancel booking after reporting:", error);
+    }
+  }
+
+  const isRecurring = Boolean(booking.recurringEventId) && createdCount > 1;
+  const baseMessage = isRecurring ? `${createdCount} recurring bookings reported` : "Booking reported";
+
+  return {
+    success: true,
+    message: cancellationError
+      ? `${baseMessage} successfully, but cancellation failed`
+      : cancelBooking
+      ? `${baseMessage} and cancelled successfully`
+      : `${baseMessage} successfully`,
+    bookingId: reportedBooking.id,
+    reportedCount: createdCount,
+    cancellationError: cancellationError ? String(cancellationError) : undefined,
+  };
+};
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
new file mode 100644
index 00000000000000..a905d137351862
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+import { ReportReason } from "@calcom/prisma/enums";
+
+export const ZReportBookingInputSchema = z.object({
+  bookingId: z.number(),
+  reason: z.nativeEnum(ReportReason),
+  description: z.string().optional(),
+  cancelBooking: z.boolean().default(false),
+  allRemainingBookings: z.boolean().default(false),
+});
+
+export type TReportBookingInputSchema = z.infer<typeof ZReportBookingInputSchema>;

From cf54de907551c3b1f64304b245faaec38171a965 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 01:38:30 +0530
Subject: [PATCH 02/54] refactor: improvements

---
 .../components/booking/BookingListItem.tsx    | 42 ++++++++++++++++---
 apps/web/components/booking/bookingActions.ts |  6 ++-
 .../components/dialog/ReportBookingDialog.tsx | 31 ++++----------
 .../booking-report.repository.interface.ts    |  1 +
 .../bookings/lib/booking-report.repository.ts |  2 +
 .../repositories/BookingRepository.ts         | 10 +++++
 .../routers/viewer/bookings/get.handler.ts    |  7 ++--
 .../viewer/bookings/reportBooking.handler.ts  | 25 +++++++----
 8 files changed, 84 insertions(+), 40 deletions(-)

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index fd83c668a2b46b..7c4a35adcdeb4c 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -65,6 +65,7 @@ import {
   shouldShowPendingActions,
   shouldShowEditActions,
   shouldShowRecurringCancelAction,
+  shouldShowIndividualReportButton,
   type BookingActionContext,
 } from "./bookingActions";
 
@@ -740,6 +741,21 @@ function BookingListItem(booking: BookingItemProps) {
               </Dropdown>
             )}
             {shouldShowRecurringCancelAction(actionContext) && <TableActions actions={[cancelEventAction]} />}
+            {shouldShowIndividualReportButton(actionContext) && reportActionWithHandler && (
+              <div className="flex items-center space-x-2">
+                <Button
+                  type="button"
+                  variant="icon"
+                  color="destructive"
+                  StartIcon={reportActionWithHandler.icon}
+                  onClick={reportActionWithHandler.onClick}
+                  disabled={reportActionWithHandler.disabled}
+                  data-testid={reportActionWithHandler.id}
+                  className="h-8 w-8"
+                  tooltip={reportActionWithHandler.label}
+                />
+              </div>
+            )}
             {isRejected && <div className="text-subtle text-sm">{t("rejected")}</div>}
             {isCancelled && booking.rescheduled && (
               <div className="hidden h-full items-center md:flex">
@@ -809,11 +825,27 @@ const BookingItemBadges = ({
         <AssignmentReasonTooltip assignmentReason={booking.assignmentReason[0]} />
       )}
       {booking.reports && booking.reports.length > 0 && (
-        <Badge className="ltr:mr-2 rtl:ml-2" variant="red">
-          {booking.reportedByCurrentUser
-            ? t("reported_by_you")
-            : t("reported_count", { count: booking.reports.length })}
-        </Badge>
+        <Tooltip
+          content={
+            <div className="space-y-1">
+              {booking.reports.map((report) => {
+                const reasonKey = `report_reason_${report.reason.toLowerCase()}`;
+                const reasonText = t(reasonKey);
+                const displayText = report.description ? `${reasonText}: ${report.description}` : reasonText;
+                return (
+                  <div key={report.id} className="text-xs">
+                    {displayText}
+                  </div>
+                );
+              })}
+            </div>
+          }>
+          <Badge className="ltr:mr-2 rtl:ml-2" variant="red">
+            {booking.reportedByCurrentUser
+              ? t("reported_by_you")
+              : t("reported_count", { count: booking.reports.length })}
+          </Badge>
+        </Tooltip>
       )}
       {booking.paid && !booking.payment[0] ? (
         <Badge className="ltr:mr-2 rtl:ml-2" variant="orange">
diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index d202acb71ebe5a..f6d7da1623fd78 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -168,7 +168,6 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
 export function getReportAction(context: BookingActionContext): ActionType | null {
   const { booking, isCancelled, isRejected, t } = context;
 
-  // Don't show if current user already reported
   if (booking.reportedByCurrentUser) {
     return null;
   }
@@ -227,6 +226,11 @@ export function shouldShowRecurringCancelAction(context: BookingActionContext):
   return isTabRecurring && isRecurring;
 }
 
+export function shouldShowIndividualReportButton(context: BookingActionContext): boolean {
+  const { isPending, isUpcoming, isCancelled } = context;
+  return isPending && isUpcoming && !isCancelled;
+}
+
 export function isActionDisabled(actionId: string, context: BookingActionContext): boolean {
   const { booking, isBookingInPast, isDisabledRescheduling, isDisabledCancelling, isPending, isConfirmed } =
     context;
diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 04b0826e4f8158..9d60121bcb6d06 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -1,5 +1,4 @@
 import type { Dispatch, SetStateAction } from "react";
-import { useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 
 import { Dialog } from "@calcom/features/components/controlled-dialog";
@@ -7,13 +6,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { ReportReason } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
-import { Checkbox } from "@calcom/ui/components/form";
 import { DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
-import { Icon } from "@calcom/ui/components/icon";
-import { Label } from "@calcom/ui/components/label";
-import { Select } from "@calcom/ui/components/form";
-import { showToast } from "@calcom/ui/components/toast";
+import { Checkbox } from "@calcom/ui/components/form";
+import { Select, Label } from "@calcom/ui/components/form";
 import { TextArea } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
 
 interface IReportBookingDialog {
   isOpenDialog: boolean;
@@ -82,13 +79,8 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
       <DialogContent enableOverflow>
         <form onSubmit={handleSubmit(onSubmit)}>
           <div className="flex flex-row space-x-3">
-            <div className="bg-subtle flex h-10 w-10 flex-shrink-0 justify-center rounded-full">
-              <Icon name="flag" className="text-destructive m-auto h-6 w-6" />
-            </div>
-            <div className="w-full pt-1">
-              <DialogHeader title={t("report_booking")} />
-              <p className="text-subtle mb-6 text-sm">{t("report_booking_description")}</p>
-
+            <div className="w-full">
+              <DialogHeader title={t("report_booking")} subtitle={t("report_booking_description")} />
               <div className="mb-4">
                 <Label htmlFor="reason" className="text-emphasis mb-2 block text-sm font-medium">
                   {t("reason")} <span className="text-destructive">*</span>
@@ -108,9 +100,7 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
                     />
                   )}
                 />
-                {errors.reason && (
-                  <p className="text-destructive mt-1 text-sm">{errors.reason.message}</p>
-                )}
+                {errors.reason && <p className="text-destructive mt-1 text-sm">{errors.reason.message}</p>}
               </div>
 
               <div className="mb-4">
@@ -121,11 +111,7 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
                   name="description"
                   control={control}
                   render={({ field }) => (
-                    <TextArea
-                      {...field}
-                      placeholder={t("report_booking_description_placeholder")}
-                      rows={3}
-                    />
+                    <TextArea {...field} placeholder={t("report_booking_description_placeholder")} rows={3} />
                   )}
                 />
               </div>
@@ -139,6 +125,7 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
                       <Checkbox
                         id="cancelBooking"
                         checked={field.value}
+                        className="mb-2"
                         onCheckedChange={field.onChange}
                       />
                       <Label htmlFor="cancelBooking" className="text-emphasis ml-2 text-sm">
@@ -180,7 +167,7 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
               disabled={isPending}>
               {t("cancel")}
             </Button>
-            <Button type="submit" color="destructive" disabled={isPending} loading={isPending}>
+            <Button type="submit" color="primary" disabled={isPending} loading={isPending}>
               {t("submit_report")}
             </Button>
           </DialogFooter>
diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
index 4c789dd27e32d6..bbc39c883d5a86 100644
--- a/packages/features/bookings/lib/booking-report.repository.interface.ts
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -13,6 +13,7 @@ export interface BookingReportSummary {
   id: string;
   reportedById: number;
   reason: ReportReason;
+  description: string | null;
   createdAt: Date;
 }
 
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
index 4bbecfe82c626f..7e6a4158c01379 100644
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -54,6 +54,7 @@ export class BookingReportRepository implements IBookingReportRepository {
           id: true,
           reportedById: true,
           reason: true,
+          description: true,
           createdAt: true,
         },
       });
@@ -77,6 +78,7 @@ export class BookingReportRepository implements IBookingReportRepository {
           id: true,
           reportedById: true,
           reason: true,
+          description: true,
           createdAt: true,
         },
         orderBy: {
diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index f9896efd408714..b861fa09d2bfb4 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -203,6 +203,16 @@ export class BookingRepository {
             email: true,
           },
         },
+        seatsReferences: {
+          select: {
+            referenceUid: true,
+            attendee: {
+              select: {
+                email: true,
+              },
+            },
+          },
+        },
         reports: {
           select: {
             id: true,
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 835034bc10522e..615365b99749f6 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -689,6 +689,9 @@ export async function getBookings({
       return hostUser?.id === userId && attendeeEmails.has(hostUser.email);
     });
   };
+
+  const bookingReportRepo = new BookingReportRepository(prisma);
+
   const bookings = await Promise.all(
     plainBookings.map(async (booking) => {
       // If seats are enabled, the event is not set to show attendees, and the current user is not the host, filter out attendees who are not the current user
@@ -715,12 +718,10 @@ export async function getBookings({
         }
       }
 
-      // Fetch reports if exist
-      const bookingReportRepo = new BookingReportRepository(ctx.prisma);
       const reports = await bookingReportRepo.findAllReportsForBooking(booking.id);
 
       // Check if current user reported
-      const reportedByCurrentUser = reports.some((r) => r.reportedById === ctx.user.id);
+      const reportedByCurrentUser = reports.some((r) => r.reportedById === user.id);
 
       return {
         ...booking,
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 9fe3a6948bf2d3..89fd9ef782ba81 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -1,6 +1,7 @@
-import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
 import { extractBookerEmail } from "@calcom/features/bookings/lib/booking-report.utils";
+import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
+import logger from "@calcom/lib/logger";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import { prisma } from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -17,6 +18,8 @@ type ReportBookingOptions = {
   input: TReportBookingInputSchema;
 };
 
+const log = logger.getSubLogger({ prefix: ["reportBookingHandler"] });
+
 export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions) => {
   const { user } = ctx;
   const { bookingId, reason, description, cancelBooking, allRemainingBookings } = input;
@@ -69,17 +72,14 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     }
   }
 
-  // Get the booker email (first attendee)
   const bookerEmail = extractBookerEmail(booking.attendees);
   if (!bookerEmail) {
     throw new TRPCError({ code: "BAD_REQUEST", message: "Booking has no attendees" });
   }
 
-  // Determine which bookings to report
   let reportedBookingIds: number[] = [bookingId];
 
   if (booking.recurringEventId && allRemainingBookings) {
-    // Get all remaining bookings in the series from the selected occurrence onward
     const remainingRecurringBookings = await prisma.booking.findMany({
       where: {
         recurringEventId: booking.recurringEventId,
@@ -91,7 +91,6 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     reportedBookingIds = remainingRecurringBookings.map((b) => b.id);
   }
 
-  // Create reports for all relevant bookings
   let createdCount = 0;
   for (const id of reportedBookingIds) {
     try {
@@ -105,13 +104,12 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
       });
       createdCount++;
     } catch (error) {
-      console.warn(`Failed to create report for booking ${id}:`, error);
+      log.warn(`Failed to create report for booking ${id}:`, error);
     }
   }
 
   const reportedBooking = { id: reportedBookingIds[0] };
 
-  // Cancel booking if requested and conditions are met
   let cancellationError = null;
   if (
     cancelBooking &&
@@ -119,17 +117,26 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     new Date(booking.startTime) > new Date()
   ) {
     try {
+      const userSeat = booking.seatsReferences.find((seat) => seat.attendee?.email === user.email);
+      const seatReferenceUid = userSeat?.referenceUid;
+
       await handleCancelBooking({
         bookingData: {
           uid: booking.uid,
           cancelledBy: user.email,
-          allRemainingBookings: booking.recurringEventId && allRemainingBookings ? true : undefined,
+          cancellationReason: description ?? reason,
+          // For recurring events: use cancelSubsequentBookings for proper cancellation
+          // allRemainingBookings cancels all future occurrences, cancelSubsequentBookings cancels from this one onward
+          ...(booking.recurringEventId && allRemainingBookings
+            ? { cancelSubsequentBookings: true }
+            : { allRemainingBookings: undefined }),
+          ...(seatReferenceUid ? { seatReferenceUid } : {}),
         },
         userId: user.id,
       });
     } catch (error) {
       cancellationError = error;
-      console.error("Failed to cancel booking after reporting:", error);
+      log.error("Failed to cancel booking after reporting:", error);
     }
   }
 

From d508b2ff697452b2f950337d493bf439e471fe36 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 01:58:01 +0530
Subject: [PATCH 03/54] test: add unit test

---
 apps/web/components/booking/bookingActions.ts |   4 +-
 .../bookings/reportBooking.handler.test.ts    | 429 ++++++++++++++++++
 .../viewer/bookings/reportBooking.handler.ts  |  16 +-
 3 files changed, 439 insertions(+), 10 deletions(-)
 create mode 100644 packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts

diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index f6d7da1623fd78..3b6d3596dd2020 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -172,8 +172,8 @@ export function getReportAction(context: BookingActionContext): ActionType | nul
     return null;
   }
 
-  // For cancelled/rejected: only show if others already reported
-  if ((isCancelled || isRejected) && (!booking.reports || booking.reports.length === 0)) {
+  // Don't allow reporting cancelled or rejected bookings
+  if (isCancelled || isRejected) {
     return null;
   }
 
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
new file mode 100644
index 00000000000000..94619a97530cfc
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -0,0 +1,429 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
+import { extractBookerEmail } from "@calcom/features/bookings/lib/booking-report.utils";
+import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
+import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingStatus, ReportReason } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import { reportBookingHandler } from "./reportBooking.handler";
+
+vi.mock("@calcom/features/bookings/lib/booking-report.repository");
+vi.mock("@calcom/features/bookings/lib/booking-report.utils");
+vi.mock("@calcom/features/bookings/lib/handleCancelBooking");
+vi.mock("@calcom/lib/server/repository/booking");
+vi.mock("@calcom/lib/logger", () => ({
+  default: {
+    getSubLogger: () => ({
+      warn: vi.fn(),
+      error: vi.fn(),
+    }),
+  },
+}));
+
+describe("reportBookingHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "user@example.com",
+    name: "Test User",
+  };
+
+  const mockBooking = {
+    id: 100,
+    uid: "test-booking-uid",
+    startTime: new Date("2025-12-01T10:00:00Z"),
+    status: BookingStatus.ACCEPTED,
+    recurringEventId: null,
+    attendees: [{ email: "booker@example.com" }],
+    seatsReferences: [],
+    reports: [],
+  };
+
+  let mockBookingRepo: any;
+  let mockReportRepo: any;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    mockBookingRepo = {
+      doesUserIdHaveAccessToBooking: vi.fn(),
+      getBookingForReporting: vi.fn(),
+    };
+    mockReportRepo = {
+      createReport: vi.fn(),
+      hasUserReportedSeries: vi.fn(),
+    };
+
+    vi.mocked(BookingRepository).mockImplementation(() => mockBookingRepo);
+    vi.mocked(BookingReportRepository).mockImplementation(() => mockReportRepo);
+    vi.mocked(extractBookerEmail).mockReturnValue("booker@example.com");
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user doesn't have access to booking", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(false);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: false,
+          },
+        })
+      ).rejects.toThrow(TRPCError);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: false,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You don't have access to this booking",
+      });
+    });
+
+    it("should throw NOT_FOUND when booking doesn't exist", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue(null);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: false,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: "Booking not found",
+      });
+    });
+  });
+
+  describe("cancelled/rejected booking validation", () => {
+    it("should throw BAD_REQUEST when trying to report cancelled booking", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        status: BookingStatus.CANCELLED,
+      });
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: false,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Cannot report cancelled or rejected bookings",
+      });
+    });
+
+    it("should throw BAD_REQUEST when trying to report rejected booking", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        status: BookingStatus.REJECTED,
+      });
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: false,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Cannot report cancelled or rejected bookings",
+      });
+    });
+  });
+
+  describe("duplicate report prevention", () => {
+    it("should throw BAD_REQUEST when user already reported this booking", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        reports: [{ id: "existing-report", reportedById: mockUser.id }],
+      });
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: false,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "You have already reported this booking",
+      });
+    });
+  });
+
+  describe("recurring bookings", () => {
+    it("should throw BAD_REQUEST when user already reported recurring series", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        recurringEventId: "recurring-123",
+      });
+      mockReportRepo.hasUserReportedSeries.mockResolvedValue(true);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingId: 100,
+            reason: ReportReason.SPAM,
+            cancelBooking: false,
+            allRemainingBookings: true,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "You have already reported this recurring booking series",
+      });
+    });
+  });
+
+  describe("successful report creation", () => {
+    it("should successfully create a single booking report", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue(mockBooking);
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.SPAM,
+          description: "This is spam",
+          cancelBooking: false,
+          allRemainingBookings: false,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.message).toBe("Booking reported successfully");
+      expect(result.reportedCount).toBe(1);
+      expect(mockReportRepo.createReport).toHaveBeenCalledWith({
+        bookingId: 100,
+        bookerEmail: "booker@example.com",
+        reportedById: mockUser.id,
+        reason: ReportReason.SPAM,
+        description: "This is spam",
+        cancelled: false,
+      });
+    });
+
+    it("should create report without description", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue(mockBooking);
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+
+      await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.DONT_KNOW_PERSON,
+          cancelBooking: false,
+          allRemainingBookings: false,
+        },
+      });
+
+      expect(mockReportRepo.createReport).toHaveBeenCalledWith({
+        bookingId: 100,
+        bookerEmail: "booker@example.com",
+        reportedById: mockUser.id,
+        reason: ReportReason.DONT_KNOW_PERSON,
+        description: undefined,
+        cancelled: false,
+      });
+    });
+  });
+
+  describe("cancellation integration", () => {
+    it("should cancel booking when cancelBooking is true", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000), // Tomorrow
+      });
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingId: 100,
+        bookingUid: "test-booking-uid",
+      });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.SPAM,
+          description: "Spam booking",
+          cancelBooking: true,
+          allRemainingBookings: false,
+        },
+      });
+
+      expect(result.message).toBe("Booking reported and cancelled successfully");
+      expect(handleCancelBooking).toHaveBeenCalledWith({
+        bookingData: {
+          uid: "test-booking-uid",
+          cancelledBy: mockUser.email,
+          cancellationReason: "Spam booking",
+          allRemainingBookings: undefined,
+        },
+        userId: mockUser.id,
+      });
+    });
+
+    it("should not cancel booking if it's in the past", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() - 86400000),
+      });
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.SPAM,
+          cancelBooking: true,
+          allRemainingBookings: false,
+        },
+      });
+
+      expect(handleCancelBooking).not.toHaveBeenCalled();
+      expect(result.message).toBe("Booking reported successfully");
+    });
+
+    it("should handle cancellation failure gracefully", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000),
+      });
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+      vi.mocked(handleCancelBooking).mockRejectedValue(new Error("Cancellation failed"));
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.SPAM,
+          cancelBooking: true,
+          allRemainingBookings: false,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.message).toBe("Booking reported successfully, but cancellation failed");
+      expect(result.cancellationError).toBeDefined();
+    });
+
+    it("should use cancelSubsequentBookings for recurring events", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        recurringEventId: "recurring-123",
+        startTime: new Date(Date.now() + 86400000),
+      });
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+      mockReportRepo.hasUserReportedSeries.mockResolvedValue(false);
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingId: 100,
+        bookingUid: "test-booking-uid",
+      });
+
+      await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.SPAM,
+          cancelBooking: true,
+          allRemainingBookings: true,
+        },
+      });
+
+      expect(handleCancelBooking).toHaveBeenCalledWith({
+        bookingData: expect.objectContaining({
+          cancelSubsequentBookings: true,
+        }),
+        userId: mockUser.id,
+      });
+    });
+
+    it("should pass seatReferenceUid for seated events", async () => {
+      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000),
+        seatsReferences: [
+          { referenceUid: "seat-123", attendee: { email: mockUser.email } },
+          { referenceUid: "seat-456", attendee: { email: "other@example.com" } },
+        ],
+      });
+      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingId: 100,
+        bookingUid: "test-booking-uid",
+      });
+
+      await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingId: 100,
+          reason: ReportReason.SPAM,
+          cancelBooking: true,
+          allRemainingBookings: false,
+        },
+      });
+
+      expect(handleCancelBooking).toHaveBeenCalledWith({
+        bookingData: expect.objectContaining({
+          seatReferenceUid: "seat-123",
+        }),
+        userId: mockUser.id,
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 89fd9ef782ba81..d11a62523b89a5 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -42,14 +42,12 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     throw new TRPCError({ code: "NOT_FOUND", message: "Booking not found" });
   }
 
-  // Check cancellation status - allow reporting cancelled bookings ONLY if others already reported
+  // Prevent reporting cancelled or rejected bookings
   if (booking.status === BookingStatus.CANCELLED || booking.status === BookingStatus.REJECTED) {
-    if (booking.reports.length === 0) {
-      throw new TRPCError({
-        code: "BAD_REQUEST",
-        message: "Cannot report cancelled or rejected bookings",
-      });
-    }
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "Cannot report cancelled or rejected bookings",
+    });
   }
 
   const userReport = booking.reports.find((r) => r.reportedById === user.id);
@@ -111,11 +109,13 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   const reportedBooking = { id: reportedBookingIds[0] };
 
   let cancellationError = null;
+  let cancellationAttempted = false;
   if (
     cancelBooking &&
     (booking.status === BookingStatus.ACCEPTED || booking.status === BookingStatus.PENDING) &&
     new Date(booking.startTime) > new Date()
   ) {
+    cancellationAttempted = true;
     try {
       const userSeat = booking.seatsReferences.find((seat) => seat.attendee?.email === user.email);
       const seatReferenceUid = userSeat?.referenceUid;
@@ -147,7 +147,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     success: true,
     message: cancellationError
       ? `${baseMessage} successfully, but cancellation failed`
-      : cancelBooking
+      : cancellationAttempted
       ? `${baseMessage} and cancelled successfully`
       : `${baseMessage} successfully`,
     bookingId: reportedBooking.id,

From 136b706f2bf5da983b3af9f20195d32130855348 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 02:08:24 +0530
Subject: [PATCH 04/54] test: add unit test

---
 .../lib/booking-report.repository.test.ts     | 188 ++++++++++++++++++
 .../bookings/reportBooking.handler.test.ts    |  20 +-
 2 files changed, 197 insertions(+), 11 deletions(-)
 create mode 100644 packages/features/bookings/lib/booking-report.repository.test.ts

diff --git a/packages/features/bookings/lib/booking-report.repository.test.ts b/packages/features/bookings/lib/booking-report.repository.test.ts
new file mode 100644
index 00000000000000..6ecd8f3456d2f7
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.repository.test.ts
@@ -0,0 +1,188 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import type { PrismaClient } from "@calcom/prisma";
+import { ReportReason } from "@calcom/prisma/enums";
+
+import { BookingReportRepository } from "./booking-report.repository";
+import type { CreateBookingReportInput } from "./booking-report.repository.interface";
+
+vi.mock("@sentry/nextjs", () => ({
+  captureException: vi.fn(),
+}));
+
+describe("BookingReportRepository", () => {
+  let repository: BookingReportRepository;
+
+  const mockPrisma = {
+    bookingReport: {
+      create: vi.fn(),
+      findUnique: vi.fn(),
+      findMany: vi.fn(),
+      findFirst: vi.fn(),
+    },
+  } as unknown as PrismaClient;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    repository = new BookingReportRepository(mockPrisma);
+  });
+
+  describe("createReport", () => {
+    it("should create a booking report with all fields", async () => {
+      const input: CreateBookingReportInput = {
+        bookingId: 100,
+        bookerEmail: "booker@example.com",
+        reportedById: 1,
+        reason: ReportReason.SPAM,
+        description: "This is spam",
+        cancelled: true,
+      };
+
+      const mockCreatedReport = { id: "report-123" };
+      mockPrisma.bookingReport.create.mockResolvedValue(mockCreatedReport);
+
+      const result = await repository.createReport(input);
+
+      expect(result).toEqual({ id: "report-123" });
+      expect(mockPrisma.bookingReport.create).toHaveBeenCalledWith({
+        data: {
+          bookingId: 100,
+          bookerEmail: "booker@example.com",
+          reportedById: 1,
+          reason: ReportReason.SPAM,
+          description: "This is spam",
+          cancelled: true,
+        },
+        select: { id: true },
+      });
+    });
+
+    it("should create a booking report without optional fields", async () => {
+      const input: CreateBookingReportInput = {
+        bookingId: 200,
+        bookerEmail: "user@example.com",
+        reportedById: 2,
+        reason: ReportReason.DONT_KNOW_PERSON,
+        cancelled: false,
+      };
+
+      const mockCreatedReport = { id: "report-456" };
+      mockPrisma.bookingReport.create.mockResolvedValue(mockCreatedReport);
+
+      const result = await repository.createReport(input);
+
+      expect(result).toEqual({ id: "report-456" });
+      expect(mockPrisma.bookingReport.create).toHaveBeenCalledWith({
+        data: {
+          bookingId: 200,
+          bookerEmail: "user@example.com",
+          reportedById: 2,
+          reason: ReportReason.DONT_KNOW_PERSON,
+          description: undefined,
+          cancelled: false,
+        },
+        select: { id: true },
+      });
+    });
+
+  });
+
+  describe("findUserReport", () => {
+    it("should find a report by booking ID and user ID", async () => {
+      const mockReport = {
+        id: "report-123",
+        reportedById: 1,
+        reason: ReportReason.SPAM,
+        description: "Spam booking",
+        createdAt: new Date("2025-01-01T10:00:00Z"),
+      };
+
+      mockPrisma.bookingReport.findUnique.mockResolvedValue(mockReport);
+
+      const result = await repository.findUserReport(100, 1);
+
+      expect(result).toEqual(mockReport);
+      expect(mockPrisma.bookingReport.findUnique).toHaveBeenCalledWith({
+        where: {
+          bookingId_reportedById: {
+            bookingId: 100,
+            reportedById: 1,
+          },
+        },
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          description: true,
+          createdAt: true,
+        },
+      });
+    });
+  });
+
+  describe("findAllReportsForBooking", () => {
+    it("should find all reports for a booking", async () => {
+      const mockReports = [
+        {
+          id: "report-1",
+          reportedById: 1,
+          reason: ReportReason.SPAM,
+          description: "Spam",
+          createdAt: new Date("2025-01-01T10:00:00Z"),
+        },
+        {
+          id: "report-2",
+          reportedById: 2,
+          reason: ReportReason.DONT_KNOW_PERSON,
+          description: null,
+          createdAt: new Date("2025-01-01T11:00:00Z"),
+        },
+      ];
+
+      mockPrisma.bookingReport.findMany.mockResolvedValue(mockReports);
+
+      const result = await repository.findAllReportsForBooking(100);
+
+      expect(result).toEqual(mockReports);
+      expect(mockPrisma.bookingReport.findMany).toHaveBeenCalledWith({
+        where: { bookingId: 100 },
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          description: true,
+          createdAt: true,
+        },
+        orderBy: { createdAt: "asc" },
+      });
+    });
+  });
+
+  describe("hasUserReportedSeries", () => {
+    it("should return true when user has reported a booking in the series", async () => {
+      const mockReport = { id: "report-123" };
+      mockPrisma.bookingReport.findFirst.mockResolvedValue(mockReport);
+
+      const result = await repository.hasUserReportedSeries("recurring-123", 1);
+
+      expect(result).toBe(true);
+      expect(mockPrisma.bookingReport.findFirst).toHaveBeenCalledWith({
+        where: {
+          reportedById: 1,
+          booking: {
+            recurringEventId: "recurring-123",
+          },
+        },
+        select: { id: true },
+      });
+    });
+
+    it("should return false when user has not reported any booking in the series", async () => {
+      mockPrisma.bookingReport.findFirst.mockResolvedValue(null);
+
+      const result = await repository.hasUserReportedSeries("recurring-123", 1);
+
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index 94619a97530cfc..aa878bd92b0286 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -41,21 +41,19 @@ describe("reportBookingHandler", () => {
     reports: [],
   };
 
-  let mockBookingRepo: any;
-  let mockReportRepo: any;
+  const mockBookingRepo = {
+    doesUserIdHaveAccessToBooking: vi.fn(),
+    getBookingForReporting: vi.fn(),
+  };
+
+  const mockReportRepo = {
+    createReport: vi.fn(),
+    hasUserReportedSeries: vi.fn(),
+  };
 
   beforeEach(() => {
     vi.clearAllMocks();
 
-    mockBookingRepo = {
-      doesUserIdHaveAccessToBooking: vi.fn(),
-      getBookingForReporting: vi.fn(),
-    };
-    mockReportRepo = {
-      createReport: vi.fn(),
-      hasUserReportedSeries: vi.fn(),
-    };
-
     vi.mocked(BookingRepository).mockImplementation(() => mockBookingRepo);
     vi.mocked(BookingReportRepository).mockImplementation(() => mockReportRepo);
     vi.mocked(extractBookerEmail).mockReturnValue("booker@example.com");

From 41fef45a698f0d2d100ec21ddfb3f6a5a38cd832 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 02:40:03 +0530
Subject: [PATCH 05/54] chore

---
 .../server/routers/viewer/bookings/reportBooking.handler.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index d11a62523b89a5..4e1c39030b81a6 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -3,7 +3,7 @@ import { extractBookerEmail } from "@calcom/features/bookings/lib/booking-report
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import logger from "@calcom/lib/logger";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
-import { prisma } from "@calcom/prisma";
+import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 

From f4864ec5411f2c2f8963341efd15e9d2b8987731 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 03:03:01 +0530
Subject: [PATCH 06/54] refactor: feedback

---
 .../components/dialog/ReportBookingDialog.tsx |  8 +++
 .../repositories/BookingRepository.ts         | 18 +++++
 .../bookings/reportBooking.handler.test.ts    | 10 ++-
 .../viewer/bookings/reportBooking.handler.ts  | 72 +++++++++----------
 4 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 9d60121bcb6d06..17e3c3737b1b65 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -1,4 +1,5 @@
 import type { Dispatch, SetStateAction } from "react";
+import { useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
 
 import { Dialog } from "@calcom/features/components/controlled-dialog";
@@ -35,6 +36,7 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
     control,
     handleSubmit,
     watch,
+    setValue,
     formState: { errors },
   } = useForm<FormValues>({
     defaultValues: {
@@ -47,6 +49,12 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
 
   const cancelBooking = watch("cancelBooking");
 
+  useEffect(() => {
+    if (!cancelBooking) {
+      setValue("allRemainingBookings", false);
+    }
+  }, [cancelBooking, setValue]);
+
   const { mutate: reportBooking, isPending } = trpc.viewer.bookings.reportBooking.useMutation({
     async onSuccess(data) {
       showToast(data.message, "success");
diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index b861fa09d2bfb4..d7816f1a096deb 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -223,6 +223,24 @@ export class BookingRepository {
     });
   }
 
+  async getActiveRecurringBookingsFromDate({
+    recurringEventId,
+    fromDate,
+  }: {
+    recurringEventId: string;
+    fromDate: Date;
+  }) {
+    return await this.prismaClient.booking.findMany({
+      where: {
+        recurringEventId,
+        startTime: { gte: fromDate },
+        status: { in: [BookingStatus.ACCEPTED, BookingStatus.PENDING] },
+      },
+      select: { id: true },
+      orderBy: { startTime: "asc" },
+    });
+  }
+
   private async _findAllExistingBookingsForEventTypeBetween({
     eventTypeId,
     seatedEvent = false,
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index aa878bd92b0286..63e00665e4ee64 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -44,6 +44,7 @@ describe("reportBookingHandler", () => {
   const mockBookingRepo = {
     doesUserIdHaveAccessToBooking: vi.fn(),
     getBookingForReporting: vi.fn(),
+    getActiveRecurringBookingsFromDate: vi.fn(),
   };
 
   const mockReportRepo = {
@@ -349,7 +350,7 @@ describe("reportBookingHandler", () => {
 
       expect(result.success).toBe(true);
       expect(result.message).toBe("Booking reported successfully, but cancellation failed");
-      expect(result.cancellationError).toBeDefined();
+      expect(result).not.toHaveProperty("cancellationError");
     });
 
     it("should use cancelSubsequentBookings for recurring events", async () => {
@@ -359,6 +360,11 @@ describe("reportBookingHandler", () => {
         recurringEventId: "recurring-123",
         startTime: new Date(Date.now() + 86400000),
       });
+      mockBookingRepo.getActiveRecurringBookingsFromDate.mockResolvedValue([
+        { id: 100 },
+        { id: 101 },
+        { id: 102 },
+      ]);
       mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
       mockReportRepo.hasUserReportedSeries.mockResolvedValue(false);
       vi.mocked(handleCancelBooking).mockResolvedValue({
@@ -424,4 +430,4 @@ describe("reportBookingHandler", () => {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 4e1c39030b81a6..ba5f398ece99b9 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -78,38 +78,16 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   let reportedBookingIds: number[] = [bookingId];
 
   if (booking.recurringEventId && allRemainingBookings) {
-    const remainingRecurringBookings = await prisma.booking.findMany({
-      where: {
-        recurringEventId: booking.recurringEventId,
-        startTime: { gte: booking.startTime },
-      },
-      select: { id: true },
-      orderBy: { startTime: "asc" },
+    const remainingBookings = await bookingRepo.getActiveRecurringBookingsFromDate({
+      recurringEventId: booking.recurringEventId,
+      fromDate: booking.startTime,
     });
-    reportedBookingIds = remainingRecurringBookings.map((b) => b.id);
+    reportedBookingIds = remainingBookings.map((b) => b.id);
   }
 
-  let createdCount = 0;
-  for (const id of reportedBookingIds) {
-    try {
-      await bookingReportRepo.createReport({
-        bookingId: id,
-        bookerEmail: bookerEmail,
-        reportedById: user.id,
-        reason,
-        description,
-        cancelled: cancelBooking,
-      });
-      createdCount++;
-    } catch (error) {
-      log.warn(`Failed to create report for booking ${id}:`, error);
-    }
-  }
-
-  const reportedBooking = { id: reportedBookingIds[0] };
-
-  let cancellationError = null;
+  let cancellationError: unknown = null;
   let cancellationAttempted = false;
+  let didCancel = false;
   if (
     cancelBooking &&
     (booking.status === BookingStatus.ACCEPTED || booking.status === BookingStatus.PENDING) &&
@@ -125,8 +103,6 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
           uid: booking.uid,
           cancelledBy: user.email,
           cancellationReason: description ?? reason,
-          // For recurring events: use cancelSubsequentBookings for proper cancellation
-          // allRemainingBookings cancels all future occurrences, cancelSubsequentBookings cancels from this one onward
           ...(booking.recurringEventId && allRemainingBookings
             ? { cancelSubsequentBookings: true }
             : { allRemainingBookings: undefined }),
@@ -134,24 +110,46 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
         },
         userId: user.id,
       });
+      didCancel = true;
     } catch (error) {
       cancellationError = error;
       log.error("Failed to cancel booking after reporting:", error);
     }
   }
 
+  let createdCount = 0;
+  for (const id of reportedBookingIds) {
+    try {
+      await bookingReportRepo.createReport({
+        bookingId: id,
+        bookerEmail,
+        reportedById: user.id,
+        reason,
+        description,
+        cancelled: didCancel,
+      });
+      createdCount++;
+    } catch (error) {
+      log.warn(`Failed to create report for booking ${id}:`, error);
+    }
+  }
+
+  const reportedBooking = { id: reportedBookingIds[0] };
+
   const isRecurring = Boolean(booking.recurringEventId) && createdCount > 1;
   const baseMessage = isRecurring ? `${createdCount} recurring bookings reported` : "Booking reported";
+  const success = createdCount > 0;
 
   return {
-    success: true,
-    message: cancellationError
-      ? `${baseMessage} successfully, but cancellation failed`
-      : cancellationAttempted
-      ? `${baseMessage} and cancelled successfully`
-      : `${baseMessage} successfully`,
+    success,
+    message: success
+      ? cancellationAttempted
+        ? cancellationError
+          ? `${baseMessage} successfully, but cancellation failed`
+          : `${baseMessage} and cancelled successfully`
+        : `${baseMessage} successfully`
+      : "No reports created",
     bookingId: reportedBooking.id,
     reportedCount: createdCount,
-    cancellationError: cancellationError ? String(cancellationError) : undefined,
   };
 };

From b2ea8ebb8e8abcdf4bd3d20c1c1f9a838f600c14 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 14:04:07 +0530
Subject: [PATCH 07/54] refactor: feedback

---
 .../components/booking/BookingListItem.tsx    |  26 ++--
 apps/web/components/booking/bookingActions.ts |  15 +-
 .../components/dialog/ReportBookingDialog.tsx |  47 ++----
 apps/web/public/static/locales/en/common.json |   6 +-
 .../booking-report.repository.interface.ts    |  22 +--
 .../lib/booking-report.repository.test.ts     |  60 +++-----
 .../bookings/lib/booking-report.repository.ts | 144 ++++++------------
 .../bookings/lib/booking-report.utils.ts      |   7 -
 .../repositories/BookingRepository.ts         |   3 +-
 .../migration.sql                             |   5 +-
 packages/prisma/schema.prisma                 |   6 +-
 .../routers/viewer/bookings/get.handler.ts    |   9 +-
 .../bookings/reportBooking.handler.test.ts    | 140 +++++------------
 .../viewer/bookings/reportBooking.handler.ts  |  41 +----
 .../viewer/bookings/reportBooking.schema.ts   |   1 -
 15 files changed, 151 insertions(+), 381 deletions(-)
 delete mode 100644 packages/features/bookings/lib/booking-report.utils.ts
 rename packages/prisma/migrations/{20251007112732_add_booking_report => 20251008074026_add_booking_report}/migration.sql (87%)

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 7c4a35adcdeb4c..9adc242305392e 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -447,6 +447,9 @@ function BookingListItem(booking: BookingItemProps) {
         setIsOpenDialog={setIsOpenReportDialog}
         bookingId={booking.id}
         isRecurring={isRecurring}
+        isUpcoming={isUpcoming}
+        isCancelled={isCancelled}
+        isRejected={isRejected}
       />
       {booking.paid && booking.payment[0] && (
         <ChargeCardDialog
@@ -824,26 +827,21 @@ const BookingItemBadges = ({
       {booking?.assignmentReason.length > 0 && (
         <AssignmentReasonTooltip assignmentReason={booking.assignmentReason[0]} />
       )}
-      {booking.reports && booking.reports.length > 0 && (
+      {booking.report && (
         <Tooltip
           content={
-            <div className="space-y-1">
-              {booking.reports.map((report) => {
-                const reasonKey = `report_reason_${report.reason.toLowerCase()}`;
+            <div className="text-xs">
+              {(() => {
+                const reasonKey = `report_reason_${booking.report.reason.toLowerCase()}`;
                 const reasonText = t(reasonKey);
-                const displayText = report.description ? `${reasonText}: ${report.description}` : reasonText;
-                return (
-                  <div key={report.id} className="text-xs">
-                    {displayText}
-                  </div>
-                );
-              })}
+                return booking.report.description
+                  ? `${reasonText}: ${booking.report.description}`
+                  : reasonText;
+              })()}
             </div>
           }>
           <Badge className="ltr:mr-2 rtl:ml-2" variant="red">
-            {booking.reportedByCurrentUser
-              ? t("reported_by_you")
-              : t("reported_count", { count: booking.reports.length })}
+            {t("reported")}
           </Badge>
         </Tooltip>
       )}
diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index 3b6d3596dd2020..6d074d68189897 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -166,20 +166,15 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
 }
 
 export function getReportAction(context: BookingActionContext): ActionType | null {
-  const { booking, isCancelled, isRejected, t } = context;
+  const { booking, t } = context;
 
-  if (booking.reportedByCurrentUser) {
-    return null;
-  }
-
-  // Don't allow reporting cancelled or rejected bookings
-  if (isCancelled || isRejected) {
+  if (booking.report) {
     return null;
   }
 
   return {
     id: "report",
-    label: booking.reports && booking.reports.length > 0 ? t("add_to_report") : t("report_booking"),
+    label: t("report_booking"),
     icon: "flag",
     color: "destructive",
     disabled: false,
@@ -227,8 +222,8 @@ export function shouldShowRecurringCancelAction(context: BookingActionContext):
 }
 
 export function shouldShowIndividualReportButton(context: BookingActionContext): boolean {
-  const { isPending, isUpcoming, isCancelled } = context;
-  return isPending && isUpcoming && !isCancelled;
+  const { booking, isBookingInPast } = context;
+  return !booking.report && !isBookingInPast;
 }
 
 export function isActionDisabled(actionId: string, context: BookingActionContext): boolean {
diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 17e3c3737b1b65..f9636668acdb48 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -1,11 +1,11 @@
 import type { Dispatch, SetStateAction } from "react";
-import { useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
 
 import { Dialog } from "@calcom/features/components/controlled-dialog";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { ReportReason } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
+import { Alert } from "@calcom/ui/components/alert";
 import { Button } from "@calcom/ui/components/button";
 import { DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
 import { Checkbox } from "@calcom/ui/components/form";
@@ -18,43 +18,36 @@ interface IReportBookingDialog {
   setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
   bookingId: number;
   isRecurring: boolean;
+  isUpcoming: boolean;
+  isCancelled: boolean;
+  isRejected: boolean;
 }
 
 interface FormValues {
   reason: ReportReason;
   description: string;
-  cancelBooking: boolean;
   allRemainingBookings: boolean;
 }
 
 export const ReportBookingDialog = (props: IReportBookingDialog) => {
   const { t } = useLocale();
   const utils = trpc.useUtils();
-  const { isOpenDialog, setIsOpenDialog, bookingId, isRecurring } = props;
+  const { isOpenDialog, setIsOpenDialog, bookingId, isRecurring, isUpcoming, isCancelled, isRejected } = props;
+
+  const willBeCancelled = isUpcoming && !isCancelled && !isRejected;
 
   const {
     control,
     handleSubmit,
-    watch,
-    setValue,
     formState: { errors },
   } = useForm<FormValues>({
     defaultValues: {
       reason: ReportReason.SPAM,
       description: "",
-      cancelBooking: false,
       allRemainingBookings: false,
     },
   });
 
-  const cancelBooking = watch("cancelBooking");
-
-  useEffect(() => {
-    if (!cancelBooking) {
-      setValue("allRemainingBookings", false);
-    }
-  }, [cancelBooking, setValue]);
-
   const { mutate: reportBooking, isPending } = trpc.viewer.bookings.reportBooking.useMutation({
     async onSuccess(data) {
       showToast(data.message, "success");
@@ -71,7 +64,6 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
       bookingId,
       reason: data.reason,
       description: data.description || undefined,
-      cancelBooking: data.cancelBooking,
       allRemainingBookings: data.allRemainingBookings,
     });
   };
@@ -125,26 +117,17 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
               </div>
 
               <div className="mb-4">
-                <Controller
-                  name="cancelBooking"
-                  control={control}
-                  render={({ field }) => (
-                    <div className="flex items-center">
-                      <Checkbox
-                        id="cancelBooking"
-                        checked={field.value}
-                        className="mb-2"
-                        onCheckedChange={field.onChange}
-                      />
-                      <Label htmlFor="cancelBooking" className="text-emphasis ml-2 text-sm">
-                        {t("cancel_booking_when_reporting")}
-                      </Label>
-                    </div>
-                  )}
+                <Alert
+                  severity={willBeCancelled ? "warning" : "info"}
+                  title={
+                    willBeCancelled
+                      ? t("report_booking_will_cancel_description")
+                      : t("report_booking_will_not_cancel_description")
+                  }
                 />
               </div>
 
-              {isRecurring && cancelBooking && (
+              {isRecurring && willBeCancelled && (
                 <div className="mb-4">
                   <Controller
                     name="allRemainingBookings"
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index ca653cebdee172..06a156028109bb 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -86,7 +86,7 @@
   "rejection_reason_title": "Reject the booking request?",
   "rejection_reason_description": "Are you sure you want to reject the booking? We'll let the person who tried to book know. You can provide a reason below.",
   "rejection_confirmation": "Reject the booking",
-  "report_booking_description": "Report this booking as problematic. This helps us identify and prevent spam or unwanted bookings.",
+  "report_booking_description": "Report this booking as suspicious. This helps us identify and prevent spam or unwanted bookings.",
   "report_reason_spam": "Spam or unwanted booking",
   "report_reason_dont_know_person": "I don't know this person",
   "report_reason_other": "Other",
@@ -768,10 +768,10 @@
   "apply": "Apply",
   "cancel_event": "Cancel event",
   "report_booking": "Report booking",
+  "report_booking_will_cancel_description": "Reporting this booking will automatically cancel it",
+  "report_booking_will_not_cancel_description": "This booking will be reported only",
   "add_to_report": "Add to report",
   "reported": "Reported",
-  "reported_by_you": "Reported by you",
-  "reported_count": "Reported ({{count}})",
   "continue": "Continue",
   "confirm": "Confirm",
   "confirm_all": "Confirm all",
diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
index bbc39c883d5a86..ac79ad190c57e7 100644
--- a/packages/features/bookings/lib/booking-report.repository.interface.ts
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -2,7 +2,7 @@ import type { ReportReason } from "@calcom/prisma/enums";
 
 export interface CreateBookingReportInput {
   bookingId: number;
-  bookerEmail: string;
+  bookerEmail: string | null;
   reportedById: number;
   reason: ReportReason;
   description?: string;
@@ -18,23 +18,13 @@ export interface BookingReportSummary {
 }
 
 export interface IBookingReportRepository {
-  /**
-   * Creates a new booking report
-   */
   createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
 
-  /**
-   * Finds a report by a specific user for a specific booking
-   */
-  findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null>;
+  findReportForBooking(bookingId: number): Promise<BookingReportSummary | null>;
 
-  /**
-   * Finds all reports for a specific booking
-   */
-  findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]>;
 
-  /**
-   * Checks if a user has reported any booking in a recurring series
-   */
-  hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean>;
+  findAllReportedBookings(params: {
+    skip?: number;
+    take?: number;
+  }): Promise<BookingReportSummary[]>;
 }
diff --git a/packages/features/bookings/lib/booking-report.repository.test.ts b/packages/features/bookings/lib/booking-report.repository.test.ts
index 6ecd8f3456d2f7..dda1a29a7a6e96 100644
--- a/packages/features/bookings/lib/booking-report.repository.test.ts
+++ b/packages/features/bookings/lib/booking-report.repository.test.ts
@@ -87,8 +87,8 @@ describe("BookingReportRepository", () => {
 
   });
 
-  describe("findUserReport", () => {
-    it("should find a report by booking ID and user ID", async () => {
+  describe("findReportForBooking", () => {
+    it("should find the report for a booking", async () => {
       const mockReport = {
         id: "report-123",
         reportedById: 1,
@@ -99,16 +99,11 @@ describe("BookingReportRepository", () => {
 
       mockPrisma.bookingReport.findUnique.mockResolvedValue(mockReport);
 
-      const result = await repository.findUserReport(100, 1);
+      const result = await repository.findReportForBooking(100);
 
       expect(result).toEqual(mockReport);
       expect(mockPrisma.bookingReport.findUnique).toHaveBeenCalledWith({
-        where: {
-          bookingId_reportedById: {
-            bookingId: 100,
-            reportedById: 1,
-          },
-        },
+        where: { bookingId: 100 },
         select: {
           id: true,
           reportedById: true,
@@ -118,10 +113,18 @@ describe("BookingReportRepository", () => {
         },
       });
     });
+
+    it("should return null when no report exists", async () => {
+      mockPrisma.bookingReport.findUnique.mockResolvedValue(null);
+
+      const result = await repository.findReportForBooking(100);
+
+      expect(result).toBeNull();
+    });
   });
 
-  describe("findAllReportsForBooking", () => {
-    it("should find all reports for a booking", async () => {
+  describe("findAllReportedBookings", () => {
+    it("should find all reported bookings with pagination", async () => {
       const mockReports = [
         {
           id: "report-1",
@@ -141,11 +144,12 @@ describe("BookingReportRepository", () => {
 
       mockPrisma.bookingReport.findMany.mockResolvedValue(mockReports);
 
-      const result = await repository.findAllReportsForBooking(100);
+      const result = await repository.findAllReportedBookings({ skip: 0, take: 10 });
 
       expect(result).toEqual(mockReports);
       expect(mockPrisma.bookingReport.findMany).toHaveBeenCalledWith({
-        where: { bookingId: 100 },
+        skip: 0,
+        take: 10,
         select: {
           id: true,
           reportedById: true,
@@ -153,36 +157,8 @@ describe("BookingReportRepository", () => {
           description: true,
           createdAt: true,
         },
-        orderBy: { createdAt: "asc" },
-      });
-    });
-  });
-
-  describe("hasUserReportedSeries", () => {
-    it("should return true when user has reported a booking in the series", async () => {
-      const mockReport = { id: "report-123" };
-      mockPrisma.bookingReport.findFirst.mockResolvedValue(mockReport);
-
-      const result = await repository.hasUserReportedSeries("recurring-123", 1);
-
-      expect(result).toBe(true);
-      expect(mockPrisma.bookingReport.findFirst).toHaveBeenCalledWith({
-        where: {
-          reportedById: 1,
-          booking: {
-            recurringEventId: "recurring-123",
-          },
-        },
-        select: { id: true },
+        orderBy: { createdAt: "desc" },
       });
     });
-
-    it("should return false when user has not reported any booking in the series", async () => {
-      mockPrisma.bookingReport.findFirst.mockResolvedValue(null);
-
-      const result = await repository.hasUserReportedSeries("recurring-123", 1);
-
-      expect(result).toBe(false);
-    });
   });
 });
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
index 7e6a4158c01379..6c2ac28d242b22 100644
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -1,117 +1,59 @@
-import { captureException } from "@sentry/nextjs";
-
 import type { PrismaClient } from "@calcom/prisma";
-import type { ReportReason } from "@calcom/prisma/enums";
 
 import type {
-  BookingReportSummary,
-  CreateBookingReportInput,
   IBookingReportRepository,
+  CreateBookingReportInput,
+  BookingReportSummary,
 } from "./booking-report.repository.interface";
 
 export class BookingReportRepository implements IBookingReportRepository {
   constructor(private readonly prismaClient: PrismaClient) {}
 
-  /**
-   * Creates a new booking report
-   */
   async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
-    try {
-      const report = await this.prismaClient.bookingReport.create({
-        data: {
-          bookingId: input.bookingId,
-          bookerEmail: input.bookerEmail,
-          reportedById: input.reportedById,
-          reason: input.reason,
-          description: input.description,
-          cancelled: input.cancelled,
-        },
-        select: {
-          id: true,
-        },
-      });
-      return report;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
-  }
-
-  /**
-   * Finds a report by a specific user for a specific booking
-   * Uses the composite unique constraint (bookingId, reportedById)
-   */
-  async findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null> {
-    try {
-      const report = await this.prismaClient.bookingReport.findUnique({
-        where: {
-          bookingId_reportedById: {
-            bookingId,
-            reportedById: userId,
-          },
-        },
-        select: {
-          id: true,
-          reportedById: true,
-          reason: true,
-          description: true,
-          createdAt: true,
-        },
-      });
-      return report;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
+    const report = await this.prismaClient.bookingReport.create({
+      data: {
+        bookingId: input.bookingId,
+        bookerEmail: input.bookerEmail ?? "",
+        reportedById: input.reportedById,
+        reason: input.reason,
+        description: input.description,
+        cancelled: input.cancelled,
+      },
+      select: { id: true },
+    });
+    return report;
   }
 
-  /**
-   * Finds all reports for a specific booking
-   */
-  async findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]> {
-    try {
-      const reports = await this.prismaClient.bookingReport.findMany({
-        where: {
-          bookingId,
-        },
-        select: {
-          id: true,
-          reportedById: true,
-          reason: true,
-          description: true,
-          createdAt: true,
-        },
-        orderBy: {
-          createdAt: "asc",
-        },
-      });
-      return reports;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
+  async findReportForBooking(bookingId: number): Promise<BookingReportSummary | null> {
+    const report = await this.prismaClient.bookingReport.findUnique({
+      where: { bookingId },
+      select: {
+        id: true,
+        reportedById: true,
+        reason: true,
+        description: true,
+        createdAt: true,
+      },
+    });
+    return report;
   }
 
-  /**
-   * Checks if a user has reported any booking in a recurring series
-   */
-  async hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean> {
-    try {
-      const report = await this.prismaClient.bookingReport.findFirst({
-        where: {
-          reportedById: userId,
-          booking: {
-            recurringEventId,
-          },
-        },
-        select: {
-          id: true,
-        },
-      });
-      return !!report;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
+  async findAllReportedBookings(params: {
+    skip?: number;
+    take?: number;
+  }): Promise<BookingReportSummary[]> {
+    const reports = await this.prismaClient.bookingReport.findMany({
+      skip: params.skip,
+      take: params.take,
+      select: {
+        id: true,
+        reportedById: true,
+        reason: true,
+        description: true,
+        createdAt: true,
+      },
+      orderBy: { createdAt: "desc" },
+    });
+    return reports;
   }
 }
diff --git a/packages/features/bookings/lib/booking-report.utils.ts b/packages/features/bookings/lib/booking-report.utils.ts
deleted file mode 100644
index fb799d71e43cd6..00000000000000
--- a/packages/features/bookings/lib/booking-report.utils.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Extracts the booker email from booking attendees
- * Convention: first attendee is the booker
- */
-export function extractBookerEmail(attendees: Array<{ email: string }>): string | null {
-  return attendees[0]?.email || null;
-}
diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index d7816f1a096deb..df5700a61d3927 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -213,10 +213,9 @@ export class BookingRepository {
             },
           },
         },
-        reports: {
+        report: {
           select: {
             id: true,
-            reportedById: true,
           },
         },
       },
diff --git a/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql b/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
similarity index 87%
rename from packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
index dc1369a0ceb59a..adf78cf9be492e 100644
--- a/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
@@ -17,7 +17,7 @@ CREATE TABLE "BookingReport" (
 );
 
 -- CreateIndex
-CREATE INDEX "BookingReport_bookingId_idx" ON "BookingReport"("bookingId");
+CREATE UNIQUE INDEX "BookingReport_bookingId_key" ON "BookingReport"("bookingId");
 
 -- CreateIndex
 CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
@@ -31,9 +31,6 @@ CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
 -- CreateIndex
 CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
 
--- CreateIndex
-CREATE UNIQUE INDEX "BookingReport_bookingId_reportedById_key" ON "BookingReport"("bookingId", "reportedById");
-
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index a5645e6be32537..d424303ba532f4 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -849,7 +849,7 @@ model Booking {
   tracking                     Tracking?
   routingFormResponses         RoutingFormResponseDenormalized[]
   expenseLogs                  CreditExpenseLog[]
-  reports                      BookingReport[]
+  report                       BookingReport?
 
   @@index([eventTypeId])
   @@index([userId])
@@ -2356,7 +2356,7 @@ enum ReportReason {
 
 model BookingReport {
   id           String       @id @default(uuid()) @db.Uuid
-  bookingId    Int
+  bookingId    Int          @unique
   bookerEmail  String
   reportedById Int
   reason       ReportReason
@@ -2370,8 +2370,6 @@ model BookingReport {
   reportedBy User       @relation("ReportedBookings", fields: [reportedById], references: [id], onDelete: Cascade)
   watchlist  Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
 
-  @@unique([bookingId, reportedById])
-  @@index([bookingId])
   @@index([bookerEmail])
   @@index([reportedById])
   @@index([watchlistId])
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 615365b99749f6..d513cf71f9f1ee 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -718,17 +718,12 @@ export async function getBookings({
         }
       }
 
-      const reports = await bookingReportRepo.findAllReportsForBooking(booking.id);
-
-      // Check if current user reported
-      const reportedByCurrentUser = reports.some((r) => r.reportedById === user.id);
+      const report = await bookingReportRepo.findReportForBooking(booking.id);
 
       return {
         ...booking,
         rescheduler,
-        reports,
-        reportedByCurrentUser,
-        reportCount: reports.length,
+        report,
         eventType: {
           ...booking.eventType,
           recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index 63e00665e4ee64..e1e9d4ca9a3055 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
-import { extractBookerEmail } from "@calcom/features/bookings/lib/booking-report.utils";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import { BookingStatus, ReportReason } from "@calcom/prisma/enums";
@@ -11,7 +10,6 @@ import { TRPCError } from "@trpc/server";
 import { reportBookingHandler } from "./reportBooking.handler";
 
 vi.mock("@calcom/features/bookings/lib/booking-report.repository");
-vi.mock("@calcom/features/bookings/lib/booking-report.utils");
 vi.mock("@calcom/features/bookings/lib/handleCancelBooking");
 vi.mock("@calcom/lib/server/repository/booking");
 vi.mock("@calcom/lib/logger", () => ({
@@ -38,7 +36,7 @@ describe("reportBookingHandler", () => {
     recurringEventId: null,
     attendees: [{ email: "booker@example.com" }],
     seatsReferences: [],
-    reports: [],
+    report: null,
   };
 
   const mockBookingRepo = {
@@ -49,7 +47,8 @@ describe("reportBookingHandler", () => {
 
   const mockReportRepo = {
     createReport: vi.fn(),
-    hasUserReportedSeries: vi.fn(),
+    findReportForBooking: vi.fn(),
+    findAllReportedBookings: vi.fn(),
   };
 
   beforeEach(() => {
@@ -57,7 +56,7 @@ describe("reportBookingHandler", () => {
 
     vi.mocked(BookingRepository).mockImplementation(() => mockBookingRepo);
     vi.mocked(BookingReportRepository).mockImplementation(() => mockReportRepo);
-    vi.mocked(extractBookerEmail).mockReturnValue("booker@example.com");
+    mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
   });
 
   describe("access control", () => {
@@ -70,7 +69,7 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            cancelBooking: false,
+            
             allRemainingBookings: false,
           },
         })
@@ -82,7 +81,7 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            cancelBooking: false,
+            
             allRemainingBookings: false,
           },
         })
@@ -102,7 +101,7 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            cancelBooking: false,
+            
             allRemainingBookings: false,
           },
         })
@@ -113,60 +112,12 @@ describe("reportBookingHandler", () => {
     });
   });
 
-  describe("cancelled/rejected booking validation", () => {
-    it("should throw BAD_REQUEST when trying to report cancelled booking", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
-        ...mockBooking,
-        status: BookingStatus.CANCELLED,
-      });
-
-      await expect(
-        reportBookingHandler({
-          ctx: { user: mockUser },
-          input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
-            cancelBooking: false,
-            allRemainingBookings: false,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: "Cannot report cancelled or rejected bookings",
-      });
-    });
-
-    it("should throw BAD_REQUEST when trying to report rejected booking", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
-        ...mockBooking,
-        status: BookingStatus.REJECTED,
-      });
-
-      await expect(
-        reportBookingHandler({
-          ctx: { user: mockUser },
-          input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
-            cancelBooking: false,
-            allRemainingBookings: false,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: "Cannot report cancelled or rejected bookings",
-      });
-    });
-  });
-
   describe("duplicate report prevention", () => {
-    it("should throw BAD_REQUEST when user already reported this booking", async () => {
+    it("should throw BAD_REQUEST when booking already has a report", async () => {
       mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
-        reports: [{ id: "existing-report", reportedById: mockUser.id }],
+        report: { id: "existing-report" },
       });
 
       await expect(
@@ -175,48 +126,32 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            cancelBooking: false,
+            
             allRemainingBookings: false,
           },
         })
       ).rejects.toMatchObject({
         code: "BAD_REQUEST",
-        message: "You have already reported this booking",
+        message: "This booking has already been reported",
       });
     });
   });
 
-  describe("recurring bookings", () => {
-    it("should throw BAD_REQUEST when user already reported recurring series", async () => {
+
+  describe("successful report creation", () => {
+    it("should successfully create a single booking report and auto-cancel upcoming booking", async () => {
       mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
-        recurringEventId: "recurring-123",
+        startTime: new Date(Date.now() + 86400000), // Tomorrow
       });
-      mockReportRepo.hasUserReportedSeries.mockResolvedValue(true);
-
-      await expect(
-        reportBookingHandler({
-          ctx: { user: mockUser },
-          input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
-            cancelBooking: false,
-            allRemainingBookings: true,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: "You have already reported this recurring booking series",
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingId: 100,
+        bookingUid: "test-booking-uid",
       });
-    });
-  });
-
-  describe("successful report creation", () => {
-    it("should successfully create a single booking report", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue(mockBooking);
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
 
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
@@ -224,13 +159,12 @@ describe("reportBookingHandler", () => {
           bookingId: 100,
           reason: ReportReason.SPAM,
           description: "This is spam",
-          cancelBooking: false,
           allRemainingBookings: false,
         },
       });
 
       expect(result.success).toBe(true);
-      expect(result.message).toBe("Booking reported successfully");
+      expect(result.message).toBe("Booking reported and cancelled successfully");
       expect(result.reportedCount).toBe(1);
       expect(mockReportRepo.createReport).toHaveBeenCalledWith({
         bookingId: 100,
@@ -238,25 +172,27 @@ describe("reportBookingHandler", () => {
         reportedById: mockUser.id,
         reason: ReportReason.SPAM,
         description: "This is spam",
-        cancelled: false,
+        cancelled: true,
       });
     });
 
-    it("should create report without description", async () => {
+    it("should create report without description for past booking", async () => {
       mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue(mockBooking);
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() - 86400000), // Yesterday
+      });
 
-      await reportBookingHandler({
+      const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
           bookingId: 100,
           reason: ReportReason.DONT_KNOW_PERSON,
-          cancelBooking: false,
           allRemainingBookings: false,
         },
       });
 
+      expect(result.message).toBe("Booking reported successfully");
       expect(mockReportRepo.createReport).toHaveBeenCalledWith({
         bookingId: 100,
         bookerEmail: "booker@example.com",
@@ -275,7 +211,6 @@ describe("reportBookingHandler", () => {
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
       });
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
       vi.mocked(handleCancelBooking).mockResolvedValue({
         success: true,
         message: "Cancelled",
@@ -290,7 +225,7 @@ describe("reportBookingHandler", () => {
           bookingId: 100,
           reason: ReportReason.SPAM,
           description: "Spam booking",
-          cancelBooking: true,
+          
           allRemainingBookings: false,
         },
       });
@@ -313,14 +248,13 @@ describe("reportBookingHandler", () => {
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000),
       });
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
 
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          cancelBooking: true,
+          
           allRemainingBookings: false,
         },
       });
@@ -335,7 +269,6 @@ describe("reportBookingHandler", () => {
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),
       });
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
       vi.mocked(handleCancelBooking).mockRejectedValue(new Error("Cancellation failed"));
 
       const result = await reportBookingHandler({
@@ -343,7 +276,7 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          cancelBooking: true,
+          
           allRemainingBookings: false,
         },
       });
@@ -365,8 +298,6 @@ describe("reportBookingHandler", () => {
         { id: 101 },
         { id: 102 },
       ]);
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
-      mockReportRepo.hasUserReportedSeries.mockResolvedValue(false);
       vi.mocked(handleCancelBooking).mockResolvedValue({
         success: true,
         message: "Cancelled",
@@ -380,7 +311,7 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          cancelBooking: true,
+          
           allRemainingBookings: true,
         },
       });
@@ -403,7 +334,6 @@ describe("reportBookingHandler", () => {
           { referenceUid: "seat-456", attendee: { email: "other@example.com" } },
         ],
       });
-      mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
       vi.mocked(handleCancelBooking).mockResolvedValue({
         success: true,
         message: "Cancelled",
@@ -417,7 +347,7 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          cancelBooking: true,
+          
           allRemainingBookings: false,
         },
       });
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index ba5f398ece99b9..1c76518c5b677c 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -1,5 +1,4 @@
 import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
-import { extractBookerEmail } from "@calcom/features/bookings/lib/booking-report.utils";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import logger from "@calcom/lib/logger";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
@@ -22,7 +21,7 @@ const log = logger.getSubLogger({ prefix: ["reportBookingHandler"] });
 
 export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions) => {
   const { user } = ctx;
-  const { bookingId, reason, description, cancelBooking, allRemainingBookings } = input;
+  const { bookingId, reason, description, allRemainingBookings } = input;
 
   const bookingRepo = new BookingRepository(prisma);
   const bookingReportRepo = new BookingReportRepository(prisma);
@@ -42,35 +41,11 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     throw new TRPCError({ code: "NOT_FOUND", message: "Booking not found" });
   }
 
-  // Prevent reporting cancelled or rejected bookings
-  if (booking.status === BookingStatus.CANCELLED || booking.status === BookingStatus.REJECTED) {
-    throw new TRPCError({
-      code: "BAD_REQUEST",
-      message: "Cannot report cancelled or rejected bookings",
-    });
-  }
-
-  const userReport = booking.reports.find((r) => r.reportedById === user.id);
-  if (userReport) {
-    throw new TRPCError({ code: "BAD_REQUEST", message: "You have already reported this booking" });
+  if (booking.report) {
+    throw new TRPCError({ code: "BAD_REQUEST", message: "This booking has already been reported" });
   }
 
-  if (booking.recurringEventId && allRemainingBookings) {
-    // For recurring bookings, check if THIS USER has reported any booking in the series
-    const hasReportedSeries = await bookingReportRepo.hasUserReportedSeries(
-      booking.recurringEventId,
-      user.id
-    );
-
-    if (hasReportedSeries) {
-      throw new TRPCError({
-        code: "BAD_REQUEST",
-        message: "You have already reported this recurring booking series",
-      });
-    }
-  }
-
-  const bookerEmail = extractBookerEmail(booking.attendees);
+  const bookerEmail = booking.attendees[0]?.email;
   if (!bookerEmail) {
     throw new TRPCError({ code: "BAD_REQUEST", message: "Booking has no attendees" });
   }
@@ -88,11 +63,11 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   let cancellationError: unknown = null;
   let cancellationAttempted = false;
   let didCancel = false;
-  if (
-    cancelBooking &&
+  const isUpcoming =
     (booking.status === BookingStatus.ACCEPTED || booking.status === BookingStatus.PENDING) &&
-    new Date(booking.startTime) > new Date()
-  ) {
+    new Date(booking.startTime) > new Date();
+
+  if (isUpcoming) {
     cancellationAttempted = true;
     try {
       const userSeat = booking.seatsReferences.find((seat) => seat.attendee?.email === user.email);
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
index a905d137351862..39516bc838f302 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
@@ -6,7 +6,6 @@ export const ZReportBookingInputSchema = z.object({
   bookingId: z.number(),
   reason: z.nativeEnum(ReportReason),
   description: z.string().optional(),
-  cancelBooking: z.boolean().default(false),
   allRemainingBookings: z.boolean().default(false),
 });
 

From 51077dfc661b1279fc61472a3b000d621e27053d Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 14:25:14 +0530
Subject: [PATCH 08/54] refactor: feedback

---
 apps/web/components/booking/BookingListItem.tsx    | 11 ++++++++---
 apps/web/components/booking/bookingActions.ts      |  5 +++--
 apps/web/components/dialog/ReportBookingDialog.tsx | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 9adc242305392e..e936deb3bcf38f 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -184,6 +184,13 @@ function BookingListItem(booking: BookingItemProps) {
   const isPending = booking.status === BookingStatus.PENDING;
   const isRescheduled = booking.fromReschedule !== null;
   const isRecurring = booking.recurringEventId !== null;
+
+  const getReportStatus = (): "upcoming" | "past" | "cancelled" | "rejected" => {
+    if (isCancelled) return "cancelled";
+    if (isRejected) return "rejected";
+    if (isBookingInPast) return "past";
+    return "upcoming";
+  };
   const isTabRecurring = booking.listingStatus === "recurring";
   const isTabUnconfirmed = booking.listingStatus === "unconfirmed";
   const isBookingFromRoutingForm = isBookingReroutable(parsedBooking);
@@ -447,9 +454,7 @@ function BookingListItem(booking: BookingItemProps) {
         setIsOpenDialog={setIsOpenReportDialog}
         bookingId={booking.id}
         isRecurring={isRecurring}
-        isUpcoming={isUpcoming}
-        isCancelled={isCancelled}
-        isRejected={isRejected}
+        status={getReportStatus()}
       />
       {booking.paid && booking.payment[0] && (
         <ChargeCardDialog
diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index 6d074d68189897..f4958edc683a6e 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -222,8 +222,9 @@ export function shouldShowRecurringCancelAction(context: BookingActionContext):
 }
 
 export function shouldShowIndividualReportButton(context: BookingActionContext): boolean {
-  const { booking, isBookingInPast } = context;
-  return !booking.report && !isBookingInPast;
+  const { booking, isPending, isUpcoming, isCancelled, isRejected } = context;
+  const hasDropdown = shouldShowEditActions(context);
+  return !booking.report && !hasDropdown && (isCancelled || isRejected || (isPending && isUpcoming));
 }
 
 export function isActionDisabled(actionId: string, context: BookingActionContext): boolean {
diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index f9636668acdb48..d109ffaf0cc854 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -13,14 +13,14 @@ import { Select, Label } from "@calcom/ui/components/form";
 import { TextArea } from "@calcom/ui/components/form";
 import { showToast } from "@calcom/ui/components/toast";
 
+type BookingReportStatus = "upcoming" | "past" | "cancelled" | "rejected";
+
 interface IReportBookingDialog {
   isOpenDialog: boolean;
   setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
   bookingId: number;
   isRecurring: boolean;
-  isUpcoming: boolean;
-  isCancelled: boolean;
-  isRejected: boolean;
+  status: BookingReportStatus;
 }
 
 interface FormValues {
@@ -32,9 +32,9 @@ interface FormValues {
 export const ReportBookingDialog = (props: IReportBookingDialog) => {
   const { t } = useLocale();
   const utils = trpc.useUtils();
-  const { isOpenDialog, setIsOpenDialog, bookingId, isRecurring, isUpcoming, isCancelled, isRejected } = props;
+  const { isOpenDialog, setIsOpenDialog, bookingId, isRecurring, status } = props;
 
-  const willBeCancelled = isUpcoming && !isCancelled && !isRejected;
+  const willBeCancelled = status === "upcoming";
 
   const {
     control,

From b05b7ffa4fa56d8bd4bf7cbd79ac241f036c40b1 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 14:28:52 +0530
Subject: [PATCH 09/54] fix: use string

---
 .../bookings/lib/booking-report.repository.interface.ts         | 2 +-
 packages/features/bookings/lib/booking-report.repository.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
index ac79ad190c57e7..e6eb096504ec8e 100644
--- a/packages/features/bookings/lib/booking-report.repository.interface.ts
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -2,7 +2,7 @@ import type { ReportReason } from "@calcom/prisma/enums";
 
 export interface CreateBookingReportInput {
   bookingId: number;
-  bookerEmail: string | null;
+  bookerEmail: string;
   reportedById: number;
   reason: ReportReason;
   description?: string;
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
index 6c2ac28d242b22..5fa4ba83e474e5 100644
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -13,7 +13,7 @@ export class BookingReportRepository implements IBookingReportRepository {
     const report = await this.prismaClient.bookingReport.create({
       data: {
         bookingId: input.bookingId,
-        bookerEmail: input.bookerEmail ?? "",
+        bookerEmail: input.bookerEmail,
         reportedById: input.reportedById,
         reason: input.reason,
         description: input.description,

From e895e0f0255595ae4f70ece31ccf5826aa3e5879 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 15:11:16 +0530
Subject: [PATCH 10/54] fix: schema

---
 .../server/repository/bookingReport.interface.ts}      |  0
 .../server/repository/bookingReport.test.ts}           | 10 +++++-----
 .../server/repository/bookingReport.ts}                |  4 ++--
 .../migration.sql                                      |  3 ---
 packages/prisma/schema.prisma                          |  6 ++----
 .../trpc/server/routers/viewer/bookings/get.handler.ts |  4 ++--
 .../viewer/bookings/reportBooking.handler.test.ts      |  6 +++---
 .../routers/viewer/bookings/reportBooking.handler.ts   |  4 ++--
 8 files changed, 16 insertions(+), 21 deletions(-)
 rename packages/{features/bookings/lib/booking-report.repository.interface.ts => lib/server/repository/bookingReport.interface.ts} (100%)
 rename packages/{features/bookings/lib/booking-report.repository.test.ts => lib/server/repository/bookingReport.test.ts} (93%)
 rename packages/{features/bookings/lib/booking-report.repository.ts => lib/server/repository/bookingReport.ts} (92%)
 rename packages/prisma/migrations/{20251008074026_add_booking_report => 20251008094052_add_booking_report}/migration.sql (88%)

diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
similarity index 100%
rename from packages/features/bookings/lib/booking-report.repository.interface.ts
rename to packages/lib/server/repository/bookingReport.interface.ts
diff --git a/packages/features/bookings/lib/booking-report.repository.test.ts b/packages/lib/server/repository/bookingReport.test.ts
similarity index 93%
rename from packages/features/bookings/lib/booking-report.repository.test.ts
rename to packages/lib/server/repository/bookingReport.test.ts
index dda1a29a7a6e96..450125fc30ce31 100644
--- a/packages/features/bookings/lib/booking-report.repository.test.ts
+++ b/packages/lib/server/repository/bookingReport.test.ts
@@ -3,15 +3,15 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import type { PrismaClient } from "@calcom/prisma";
 import { ReportReason } from "@calcom/prisma/enums";
 
-import { BookingReportRepository } from "./booking-report.repository";
-import type { CreateBookingReportInput } from "./booking-report.repository.interface";
+import { PrismaBookingReportRepository } from "./bookingReport";
+import type { CreateBookingReportInput } from "./bookingReport.interface";
 
 vi.mock("@sentry/nextjs", () => ({
   captureException: vi.fn(),
 }));
 
-describe("BookingReportRepository", () => {
-  let repository: BookingReportRepository;
+describe("PrismaBookingReportRepository", () => {
+  let repository: PrismaBookingReportRepository;
 
   const mockPrisma = {
     bookingReport: {
@@ -24,7 +24,7 @@ describe("BookingReportRepository", () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    repository = new BookingReportRepository(mockPrisma);
+    repository = new PrismaBookingReportRepository(mockPrisma);
   });
 
   describe("createReport", () => {
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/lib/server/repository/bookingReport.ts
similarity index 92%
rename from packages/features/bookings/lib/booking-report.repository.ts
rename to packages/lib/server/repository/bookingReport.ts
index 5fa4ba83e474e5..c982f5e1588bb8 100644
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -4,9 +4,9 @@ import type {
   IBookingReportRepository,
   CreateBookingReportInput,
   BookingReportSummary,
-} from "./booking-report.repository.interface";
+} from "./bookingReport.interface";
 
-export class BookingReportRepository implements IBookingReportRepository {
+export class PrismaBookingReportRepository implements IBookingReportRepository {
   constructor(private readonly prismaClient: PrismaClient) {}
 
   async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
diff --git a/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql b/packages/prisma/migrations/20251008094052_add_booking_report/migration.sql
similarity index 88%
rename from packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251008094052_add_booking_report/migration.sql
index adf78cf9be492e..286f4aee05fafa 100644
--- a/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251008094052_add_booking_report/migration.sql
@@ -34,8 +34,5 @@ CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index d424303ba532f4..85389997911ef5 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -451,7 +451,6 @@ model User {
   updatedAttributeToUsers        AttributeToUser[]             @relation("updatedBy")
   createdTranslations            EventTypeTranslation[]        @relation("CreatedEventTypeTranslations")
   updatedTranslations            EventTypeTranslation[]        @relation("UpdatedEventTypeTranslations")
-  reportedBookings               BookingReport[]               @relation("ReportedBookings")
   BookingInternalNote            BookingInternalNote[]
   creationSource                 CreationSource?
   createdOrganizationOnboardings OrganizationOnboarding[]      @relation("CreatedOrganizationOnboardings")
@@ -2366,9 +2365,8 @@ model BookingReport {
 
   watchlistId String? @db.Uuid
 
-  booking    Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
-  reportedBy User       @relation("ReportedBookings", fields: [reportedById], references: [id], onDelete: Cascade)
-  watchlist  Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
+  booking   Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
+  watchlist Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
 
   @@index([bookerEmail])
   @@index([reportedById])
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index d513cf71f9f1ee..18bac35ff594b6 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -3,7 +3,7 @@ import { type SelectQueryBuilder } from "kysely";
 import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";
 
 import dayjs from "@calcom/dayjs";
-import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
 import type { DB } from "@calcom/kysely";
 import kysely from "@calcom/kysely";
@@ -690,7 +690,7 @@ export async function getBookings({
     });
   };
 
-  const bookingReportRepo = new BookingReportRepository(prisma);
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
 
   const bookings = await Promise.all(
     plainBookings.map(async (booking) => {
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index e1e9d4ca9a3055..ab1499ab2ca6be 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
-import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import { BookingStatus, ReportReason } from "@calcom/prisma/enums";
@@ -9,7 +9,7 @@ import { TRPCError } from "@trpc/server";
 
 import { reportBookingHandler } from "./reportBooking.handler";
 
-vi.mock("@calcom/features/bookings/lib/booking-report.repository");
+vi.mock("@calcom/lib/server/repository/bookingReport");
 vi.mock("@calcom/features/bookings/lib/handleCancelBooking");
 vi.mock("@calcom/lib/server/repository/booking");
 vi.mock("@calcom/lib/logger", () => ({
@@ -55,7 +55,7 @@ describe("reportBookingHandler", () => {
     vi.clearAllMocks();
 
     vi.mocked(BookingRepository).mockImplementation(() => mockBookingRepo);
-    vi.mocked(BookingReportRepository).mockImplementation(() => mockReportRepo);
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo);
     mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
   });
 
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 1c76518c5b677c..4a9d5570ccd6c8 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -1,4 +1,4 @@
-import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import logger from "@calcom/lib/logger";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
@@ -24,7 +24,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   const { bookingId, reason, description, allRemainingBookings } = input;
 
   const bookingRepo = new BookingRepository(prisma);
-  const bookingReportRepo = new BookingReportRepository(prisma);
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
 
   const hasAccess = await bookingRepo.doesUserIdHaveAccessToBooking({
     userId: user.id,

From 62513a7589b470f4efcd447db507b06d74e0bbca Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 00:34:21 +0530
Subject: [PATCH 11/54] chore: improvements

---
 .../web/components/dialog/ReportBookingDialog.tsx | 15 +++++----------
 apps/web/public/static/locales/en/common.json     |  1 -
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index d109ffaf0cc854..116c946ab936ee 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -116,16 +116,11 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
                 />
               </div>
 
-              <div className="mb-4">
-                <Alert
-                  severity={willBeCancelled ? "warning" : "info"}
-                  title={
-                    willBeCancelled
-                      ? t("report_booking_will_cancel_description")
-                      : t("report_booking_will_not_cancel_description")
-                  }
-                />
-              </div>
+              {willBeCancelled && (
+                <div className="mb-4">
+                  <Alert severity="warning" title={t("report_booking_will_cancel_description")} />
+                </div>
+              )}
 
               {isRecurring && willBeCancelled && (
                 <div className="mb-4">
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 06a156028109bb..916dabb87eacca 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -769,7 +769,6 @@
   "cancel_event": "Cancel event",
   "report_booking": "Report booking",
   "report_booking_will_cancel_description": "Reporting this booking will automatically cancel it",
-  "report_booking_will_not_cancel_description": "This booking will be reported only",
   "add_to_report": "Add to report",
   "reported": "Reported",
   "continue": "Continue",

From 071d74cc4bada6b6277e5c0089f0a1a9a4247d40 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 01:00:28 +0530
Subject: [PATCH 12/54] refactor: create service

---
 .../repositories/BookingRepository.ts         | 16 +++++
 .../users/repositories/UserRepository.ts      | 13 ++++
 .../server/service/bookingAccessService.ts    | 68 +++++++++++++++++++
 .../viewer/bookings/reportBooking.handler.ts  |  4 +-
 4 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 packages/lib/server/service/bookingAccessService.ts

diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index df5700a61d3927..4221083e7f01f7 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -131,6 +131,22 @@ export class BookingRepository {
     });
   }
 
+  async getBookingWithEventTypeTeamId({ bookingId }: { bookingId: number }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        userId: true,
+        eventType: {
+          select: {
+            teamId: true,
+          },
+        },
+      },
+    });
+  }
+
   /** Determines if the user is the organizer, team admin, or org admin that the booking was created under */
   async doesUserIdHaveAccessToBooking({ userId, bookingId }: { userId: number; bookingId: number }) {
     const booking = await this.prismaClient.booking.findUnique({
diff --git a/packages/features/users/repositories/UserRepository.ts b/packages/features/users/repositories/UserRepository.ts
index e61f99cf8f3bb9..627460bc5ddd63 100644
--- a/packages/features/users/repositories/UserRepository.ts
+++ b/packages/features/users/repositories/UserRepository.ts
@@ -770,6 +770,19 @@ export class UserRepository {
     });
     return !!isAdminOrOwnerOfTeam;
   }
+
+  async getUserOrganizationAndTeams({ userId }: { userId: number }) {
+    return await this.prismaClient.user.findUnique({
+      where: { id: userId },
+      select: {
+        organizationId: true,
+        teams: {
+          where: { accepted: true },
+          select: { teamId: true },
+        },
+      },
+    });
+  }
   async getTimeZoneAndDefaultScheduleId({ userId }: { userId: number }) {
     return await this.prismaClient.user.findUnique({
       where: {
diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/lib/server/service/bookingAccessService.ts
new file mode 100644
index 00000000000000..e4c633f9a4ae0e
--- /dev/null
+++ b/packages/lib/server/service/bookingAccessService.ts
@@ -0,0 +1,68 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+import { BookingRepository } from "../repository/booking";
+import { UserRepository } from "../repository/user";
+
+export class BookingAccessService {
+  constructor(private prismaClient: PrismaClient) {}
+
+  /**
+   * Determines if a user has access to a booking based on:
+   * 1. Being the booking organizer
+   * 2. Being a team/org admin where the event type belongs
+   * 3. Being an org admin where the booking organizer belongs (for personal bookings)
+   * 4. Being a team admin of any team the booking organizer belongs to (for personal bookings)
+   */
+  async doesUserIdHaveAccessToBooking({
+    userId,
+    bookingId,
+  }: {
+    userId: number;
+    bookingId: number;
+  }): Promise<boolean> {
+    const bookingRepo = new BookingRepository(this.prismaClient);
+    const userRepo = new UserRepository(this.prismaClient);
+
+    const booking = await bookingRepo.getBookingWithEventTypeTeamId({ bookingId });
+
+    if (!booking) return false;
+
+    // User is the organizer
+    if (userId === booking.userId) return true;
+
+    // If booking has a teamId, check if user is admin of that team/org
+    if (booking.eventType?.teamId) {
+      const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: booking.eventType.teamId,
+      });
+      return isAdminOrUser;
+    }
+
+    if (!booking.userId) return false;
+
+    const bookingOwner = await userRepo.getUserOrganizationAndTeams({ userId: booking.userId });
+
+    if (!bookingOwner) return false;
+
+    // Check if user is admin of booking organizer's organization
+    if (bookingOwner.organizationId) {
+      const isOrgAdmin = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: bookingOwner.organizationId,
+      });
+      if (isOrgAdmin) return true;
+    }
+
+    // Check if user is admin of any team the booking organizer belongs to
+    for (const membership of bookingOwner.teams) {
+      const isTeamAdmin = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: membership.teamId,
+      });
+      if (isTeamAdmin) return true;
+    }
+
+    return false;
+  }
+}
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 4a9d5570ccd6c8..005e9424278f90 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -2,6 +2,7 @@ import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/boo
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import logger from "@calcom/lib/logger";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
 import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
@@ -25,8 +26,9 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
 
   const bookingRepo = new BookingRepository(prisma);
   const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+  const bookingAccessService = new BookingAccessService(prisma);
 
-  const hasAccess = await bookingRepo.doesUserIdHaveAccessToBooking({
+  const hasAccess = await bookingAccessService.doesUserIdHaveAccessToBooking({
     userId: user.id,
     bookingId,
   });

From 7be8017c00a81d0a4501929218bfc945838dbc27 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 01:24:16 +0530
Subject: [PATCH 13/54] fix: udate test

---
 .../bookings/reportBooking.handler.test.ts    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index ab1499ab2ca6be..660f10d1ad7d59 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -3,6 +3,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
 import { BookingStatus, ReportReason } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
@@ -12,6 +13,7 @@ import { reportBookingHandler } from "./reportBooking.handler";
 vi.mock("@calcom/lib/server/repository/bookingReport");
 vi.mock("@calcom/features/bookings/lib/handleCancelBooking");
 vi.mock("@calcom/lib/server/repository/booking");
+vi.mock("@calcom/lib/server/service/bookingAccessService");
 vi.mock("@calcom/lib/logger", () => ({
   default: {
     getSubLogger: () => ({
@@ -40,7 +42,6 @@ describe("reportBookingHandler", () => {
   };
 
   const mockBookingRepo = {
-    doesUserIdHaveAccessToBooking: vi.fn(),
     getBookingForReporting: vi.fn(),
     getActiveRecurringBookingsFromDate: vi.fn(),
   };
@@ -51,17 +52,22 @@ describe("reportBookingHandler", () => {
     findAllReportedBookings: vi.fn(),
   };
 
+  const mockBookingAccessService = {
+    doesUserIdHaveAccessToBooking: vi.fn(),
+  };
+
   beforeEach(() => {
     vi.clearAllMocks();
 
     vi.mocked(BookingRepository).mockImplementation(() => mockBookingRepo);
     vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo);
+    vi.mocked(BookingAccessService).mockImplementation(() => mockBookingAccessService);
     mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
   });
 
   describe("access control", () => {
     it("should throw FORBIDDEN when user doesn't have access to booking", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(false);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(false);
 
       await expect(
         reportBookingHandler({
@@ -92,7 +98,7 @@ describe("reportBookingHandler", () => {
     });
 
     it("should throw NOT_FOUND when booking doesn't exist", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue(null);
 
       await expect(
@@ -114,7 +120,7 @@ describe("reportBookingHandler", () => {
 
   describe("duplicate report prevention", () => {
     it("should throw BAD_REQUEST when booking already has a report", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         report: { id: "existing-report" },
@@ -140,7 +146,7 @@ describe("reportBookingHandler", () => {
 
   describe("successful report creation", () => {
     it("should successfully create a single booking report and auto-cancel upcoming booking", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
@@ -177,7 +183,7 @@ describe("reportBookingHandler", () => {
     });
 
     it("should create report without description for past booking", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000), // Yesterday
@@ -206,7 +212,7 @@ describe("reportBookingHandler", () => {
 
   describe("cancellation integration", () => {
     it("should cancel booking when cancelBooking is true", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
@@ -243,7 +249,7 @@ describe("reportBookingHandler", () => {
     });
 
     it("should not cancel booking if it's in the past", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000),
@@ -264,7 +270,7 @@ describe("reportBookingHandler", () => {
     });
 
     it("should handle cancellation failure gracefully", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),
@@ -287,7 +293,7 @@ describe("reportBookingHandler", () => {
     });
 
     it("should use cancelSubsequentBookings for recurring events", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         recurringEventId: "recurring-123",
@@ -325,7 +331,7 @@ describe("reportBookingHandler", () => {
     });
 
     it("should pass seatReferenceUid for seated events", async () => {
-      mockBookingRepo.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
       mockBookingRepo.getBookingForReporting.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),

From 5acb4d8b289168de4951fb7523153a1b31e638e4 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 00:51:16 +0530
Subject: [PATCH 14/54] fix: feedback

---
 .../components/dialog/ReportBookingDialog.tsx | 27 +-----------
 .../bookings/lib/handleCancelBooking.ts       |  3 +-
 .../repositories/BookingRepository.ts         | 43 +++++++++++++++++++
 .../server/service/bookingAccessService.ts    | 38 +++++++++++++---
 .../migration.sql                             |  3 ++
 packages/prisma/schema.prisma                 |  2 +
 packages/prisma/zod-utils.ts                  |  1 +
 .../viewer/bookings/reportBooking.handler.ts  | 10 ++---
 .../viewer/bookings/reportBooking.schema.ts   |  1 -
 9 files changed, 89 insertions(+), 39 deletions(-)
 rename packages/prisma/migrations/{20251008094052_add_booking_report => 20251011182311_add_booking_report}/migration.sql (88%)

diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 116c946ab936ee..79e81bef2b18be 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -8,7 +8,6 @@ import { trpc } from "@calcom/trpc/react";
 import { Alert } from "@calcom/ui/components/alert";
 import { Button } from "@calcom/ui/components/button";
 import { DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
-import { Checkbox } from "@calcom/ui/components/form";
 import { Select, Label } from "@calcom/ui/components/form";
 import { TextArea } from "@calcom/ui/components/form";
 import { showToast } from "@calcom/ui/components/toast";
@@ -26,13 +25,12 @@ interface IReportBookingDialog {
 interface FormValues {
   reason: ReportReason;
   description: string;
-  allRemainingBookings: boolean;
 }
 
 export const ReportBookingDialog = (props: IReportBookingDialog) => {
   const { t } = useLocale();
   const utils = trpc.useUtils();
-  const { isOpenDialog, setIsOpenDialog, bookingId, isRecurring, status } = props;
+  const { isOpenDialog, setIsOpenDialog, bookingId, status } = props;
 
   const willBeCancelled = status === "upcoming";
 
@@ -44,7 +42,6 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
     defaultValues: {
       reason: ReportReason.SPAM,
       description: "",
-      allRemainingBookings: false,
     },
   });
 
@@ -64,7 +61,6 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
       bookingId,
       reason: data.reason,
       description: data.description || undefined,
-      allRemainingBookings: data.allRemainingBookings,
     });
   };
 
@@ -121,27 +117,6 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
                   <Alert severity="warning" title={t("report_booking_will_cancel_description")} />
                 </div>
               )}
-
-              {isRecurring && willBeCancelled && (
-                <div className="mb-4">
-                  <Controller
-                    name="allRemainingBookings"
-                    control={control}
-                    render={({ field }) => (
-                      <div className="flex items-center">
-                        <Checkbox
-                          id="allRemainingBookings"
-                          checked={field.value}
-                          onCheckedChange={field.onChange}
-                        />
-                        <Label htmlFor="allRemainingBookings" className="text-emphasis ml-2 text-sm">
-                          {t("report_all_remaining_bookings")}
-                        </Label>
-                      </div>
-                    )}
-                  />
-                </div>
-              )}
             </div>
           </div>
 
diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts
index 02fc09ec4f974e..090cb8dea0366e 100644
--- a/packages/features/bookings/lib/handleCancelBooking.ts
+++ b/packages/features/bookings/lib/handleCancelBooking.ts
@@ -79,6 +79,7 @@ async function handler(input: CancelBookingInput) {
     cancelledBy,
     cancelSubsequentBookings,
     internalNote,
+    skipCancellationReasonValidation = false,
   } = bookingCancelInput.parse(body);
   const bookingToDelete = await getBookingToDelete(id, uid);
   const {
@@ -117,7 +118,7 @@ async function handler(input: CancelBookingInput) {
   const isCancellationUserHost =
     bookingToDelete.userId == userId || bookingToDelete.user.email === cancelledBy;
 
-  if (!platformClientId && !cancellationReason?.trim() && isCancellationUserHost) {
+  if (!platformClientId && !cancellationReason?.trim() && isCancellationUserHost && !skipCancellationReasonValidation) {
     throw new HttpError({
       statusCode: 400,
       message: "Cancellation reason is required when you are the host",
diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index 4221083e7f01f7..dd46cad4680183 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -147,6 +147,49 @@ export class BookingRepository {
     });
   }
 
+  async getBookingForAccessCheck({ bookingId }: { bookingId: number }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        userId: true,
+        user: {
+          select: {
+            id: true,
+            email: true,
+          },
+        },
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+        eventType: {
+          select: {
+            teamId: true,
+            hosts: {
+              select: {
+                userId: true,
+                user: {
+                  select: {
+                    email: true,
+                  },
+                },
+              },
+            },
+            users: {
+              select: {
+                id: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+
   /** Determines if the user is the organizer, team admin, or org admin that the booking was created under */
   async doesUserIdHaveAccessToBooking({ userId, bookingId }: { userId: number; bookingId: number }) {
     const booking = await this.prismaClient.booking.findUnique({
diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/lib/server/service/bookingAccessService.ts
index e4c633f9a4ae0e..9909b0c8a245d5 100644
--- a/packages/lib/server/service/bookingAccessService.ts
+++ b/packages/lib/server/service/bookingAccessService.ts
@@ -3,15 +3,42 @@ import type { PrismaClient } from "@calcom/prisma";
 import { BookingRepository } from "../repository/booking";
 import { UserRepository } from "../repository/user";
 
+type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["getBookingForAccessCheck"]>>>;
+
 export class BookingAccessService {
   constructor(private prismaClient: PrismaClient) {}
 
+  private isUserAHost(userId: number, booking: BookingForAccessCheck): boolean {
+    const hostMap = new Map<number, { id: number; email: string }>();
+
+    const addHost = (id: number, email: string) => {
+      if (!hostMap.has(id)) {
+        hostMap.set(id, { id, email });
+      }
+    };
+
+    booking?.eventType?.hosts?.forEach((host) => addHost(host.userId, host.user.email));
+    booking?.eventType?.users?.forEach((user) => addHost(user.id, user.email));
+
+    if (booking?.user?.id && booking?.user?.email) {
+      addHost(booking.user.id, booking.user.email);
+    }
+
+    const attendeeEmails = new Set(booking.attendees?.map((attendee) => attendee.email));
+    const filteredHosts = Array.from(hostMap.values()).filter(
+      (host) => attendeeEmails.has(host.email) || host.id === booking.user?.id
+    );
+
+    return filteredHosts.some((host) => host.id === userId);
+  }
+
   /**
    * Determines if a user has access to a booking based on:
    * 1. Being the booking organizer
-   * 2. Being a team/org admin where the event type belongs
-   * 3. Being an org admin where the booking organizer belongs (for personal bookings)
-   * 4. Being a team admin of any team the booking organizer belongs to (for personal bookings)
+   * 2. Being one of the hosts in a multi-host booking
+   * 3. Being a team/org admin where the event type belongs
+   * 4. Being an org admin where the booking organizer belongs (for personal bookings)
+   * 5. Being a team admin of any team the booking organizer belongs to (for personal bookings)
    */
   async doesUserIdHaveAccessToBooking({
     userId,
@@ -23,13 +50,14 @@ export class BookingAccessService {
     const bookingRepo = new BookingRepository(this.prismaClient);
     const userRepo = new UserRepository(this.prismaClient);
 
-    const booking = await bookingRepo.getBookingWithEventTypeTeamId({ bookingId });
+    const booking = await bookingRepo.getBookingForAccessCheck({ bookingId });
 
     if (!booking) return false;
 
-    // User is the organizer
     if (userId === booking.userId) return true;
 
+    if (this.isUserAHost(userId, booking)) return true;
+
     // If booking has a teamId, check if user is admin of that team/org
     if (booking.eventType?.teamId) {
       const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
diff --git a/packages/prisma/migrations/20251008094052_add_booking_report/migration.sql b/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
similarity index 88%
rename from packages/prisma/migrations/20251008094052_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
index 286f4aee05fafa..adf78cf9be492e 100644
--- a/packages/prisma/migrations/20251008094052_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
@@ -34,5 +34,8 @@ CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 85389997911ef5..53d44b2a11ad46 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -451,6 +451,7 @@ model User {
   updatedAttributeToUsers        AttributeToUser[]             @relation("updatedBy")
   createdTranslations            EventTypeTranslation[]        @relation("CreatedEventTypeTranslations")
   updatedTranslations            EventTypeTranslation[]        @relation("UpdatedEventTypeTranslations")
+  reportedBookings               BookingReport[]               @relation("ReportedBy")
   BookingInternalNote            BookingInternalNote[]
   creationSource                 CreationSource?
   createdOrganizationOnboardings OrganizationOnboarding[]      @relation("CreatedOrganizationOnboardings")
@@ -2366,6 +2367,7 @@ model BookingReport {
   watchlistId String? @db.Uuid
 
   booking   Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
+  reportedBy User @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: Cascade)
   watchlist Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
 
   @@index([bookerEmail])
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index ea992435034080..8a9d13a045e156 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -275,6 +275,7 @@ export const bookingCancelSchema = z.object({
   // note(Lauris): cancelSubsequentBookings will cancel all bookings after one specified by id or uid.
   cancelSubsequentBookings: z.boolean().optional(),
   cancellationReason: z.string().optional(),
+  skipCancellationReasonValidation: z.boolean().optional().default(false),
   seatReferenceUid: z.string().optional(),
   cancelledBy: z.string().email({ message: "Invalid email" }).optional(),
   internalNote: z
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 005e9424278f90..45cc9de8a16ebb 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -22,7 +22,7 @@ const log = logger.getSubLogger({ prefix: ["reportBookingHandler"] });
 
 export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions) => {
   const { user } = ctx;
-  const { bookingId, reason, description, allRemainingBookings } = input;
+  const { bookingId, reason, description } = input;
 
   const bookingRepo = new BookingRepository(prisma);
   const bookingReportRepo = new PrismaBookingReportRepository(prisma);
@@ -54,7 +54,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
 
   let reportedBookingIds: number[] = [bookingId];
 
-  if (booking.recurringEventId && allRemainingBookings) {
+  if (booking.recurringEventId) {
     const remainingBookings = await bookingRepo.getActiveRecurringBookingsFromDate({
       recurringEventId: booking.recurringEventId,
       fromDate: booking.startTime,
@@ -79,10 +79,8 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
         bookingData: {
           uid: booking.uid,
           cancelledBy: user.email,
-          cancellationReason: description ?? reason,
-          ...(booking.recurringEventId && allRemainingBookings
-            ? { cancelSubsequentBookings: true }
-            : { allRemainingBookings: undefined }),
+          skipCancellationReasonValidation: true,
+          ...(booking.recurringEventId ? { cancelSubsequentBookings: true } : {}),
           ...(seatReferenceUid ? { seatReferenceUid } : {}),
         },
         userId: user.id,
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
index 39516bc838f302..f7e0cf2fb1b838 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
@@ -6,7 +6,6 @@ export const ZReportBookingInputSchema = z.object({
   bookingId: z.number(),
   reason: z.nativeEnum(ReportReason),
   description: z.string().optional(),
-  allRemainingBookings: z.boolean().default(false),
 });
 
 export type TReportBookingInputSchema = z.infer<typeof ZReportBookingInputSchema>;

From 965d84dff95ed72039525bed499fbaccced77de0 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 01:24:37 +0530
Subject: [PATCH 15/54] fix: schema

---
 .../repository/bookingReport.interface.ts     |  7 ++---
 .../lib/server/repository/bookingReport.ts    |  6 ++---
 .../migration.sql                             |  7 +++++
 packages/prisma/schema.prisma                 | 26 ++++++++++--------
 .../bookings/reportBooking.handler.test.ts    | 27 +++----------------
 .../viewer/bookings/reportBooking.handler.ts  |  4 ++-
 6 files changed, 33 insertions(+), 44 deletions(-)
 rename packages/prisma/migrations/{20251011182311_add_booking_report => 20251011193952_add_booking_report}/migration.sql (82%)

diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index e6eb096504ec8e..3b3334d73e333f 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -7,6 +7,7 @@ export interface CreateBookingReportInput {
   reason: ReportReason;
   description?: string;
   cancelled: boolean;
+  organizationId?: number;
 }
 
 export interface BookingReportSummary {
@@ -22,9 +23,5 @@ export interface IBookingReportRepository {
 
   findReportForBooking(bookingId: number): Promise<BookingReportSummary | null>;
 
-
-  findAllReportedBookings(params: {
-    skip?: number;
-    take?: number;
-  }): Promise<BookingReportSummary[]>;
+  findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]>;
 }
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index c982f5e1588bb8..393786b86da7e0 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -18,6 +18,7 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
         reason: input.reason,
         description: input.description,
         cancelled: input.cancelled,
+        organizationId: input.organizationId,
       },
       select: { id: true },
     });
@@ -38,10 +39,7 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
     return report;
   }
 
-  async findAllReportedBookings(params: {
-    skip?: number;
-    take?: number;
-  }): Promise<BookingReportSummary[]> {
+  async findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]> {
     const reports = await this.prismaClient.bookingReport.findMany({
       skip: params.skip,
       take: params.take,
diff --git a/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql b/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
similarity index 82%
rename from packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
index adf78cf9be492e..b7303d4f8f8882 100644
--- a/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
@@ -7,6 +7,7 @@ CREATE TABLE "BookingReport" (
     "bookingId" INTEGER NOT NULL,
     "bookerEmail" TEXT NOT NULL,
     "reportedById" INTEGER NOT NULL,
+    "organizationId" INTEGER,
     "reason" "ReportReason" NOT NULL,
     "description" TEXT,
     "cancelled" BOOLEAN NOT NULL DEFAULT false,
@@ -25,6 +26,9 @@ CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
 -- CreateIndex
 CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
 
+-- CreateIndex
+CREATE INDEX "BookingReport_organizationId_idx" ON "BookingReport"("organizationId");
+
 -- CreateIndex
 CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
 
@@ -37,5 +41,8 @@ ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIG
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 53d44b2a11ad46..84bcbb9bfd7c8e 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -573,6 +573,7 @@ model Team {
   roles                  Role[] // Added for Role relation
   calAiPhoneNumbers      CalAiPhoneNumber[]
   agents                 Agent[]
+  bookingReports         BookingReport[]
 
   features TeamFeatures[]
 
@@ -2355,23 +2356,26 @@ enum ReportReason {
 }
 
 model BookingReport {
-  id           String       @id @default(uuid()) @db.Uuid
-  bookingId    Int          @unique
-  bookerEmail  String
-  reportedById Int
-  reason       ReportReason
-  description  String?
-  cancelled    Boolean      @default(false)
-  createdAt    DateTime     @default(now())
+  id             String       @id @default(uuid()) @db.Uuid
+  bookingId      Int          @unique
+  bookerEmail    String
+  reportedById   Int
+  organizationId Int?
+  reason         ReportReason
+  description    String?
+  cancelled      Boolean      @default(false)
+  createdAt      DateTime     @default(now())
 
   watchlistId String? @db.Uuid
 
-  booking   Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
-  reportedBy User @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: Cascade)
-  watchlist Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
+  booking      Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
+  reportedBy   User       @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: Cascade)
+  organization Team?      @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  watchlist    Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
 
   @@index([bookerEmail])
   @@index([reportedById])
+  @@index([organizationId])
   @@index([watchlistId])
   @@index([createdAt])
 }
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index 660f10d1ad7d59..6dc74451ff49c0 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -1,8 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
 import { BookingStatus, ReportReason } from "@calcom/prisma/enums";
 
@@ -75,8 +75,6 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            
-            allRemainingBookings: false,
           },
         })
       ).rejects.toThrow(TRPCError);
@@ -87,8 +85,6 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            
-            allRemainingBookings: false,
           },
         })
       ).rejects.toMatchObject({
@@ -107,8 +103,6 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            
-            allRemainingBookings: false,
           },
         })
       ).rejects.toMatchObject({
@@ -132,8 +126,6 @@ describe("reportBookingHandler", () => {
           input: {
             bookingId: 100,
             reason: ReportReason.SPAM,
-            
-            allRemainingBookings: false,
           },
         })
       ).rejects.toMatchObject({
@@ -143,7 +135,6 @@ describe("reportBookingHandler", () => {
     });
   });
 
-
   describe("successful report creation", () => {
     it("should successfully create a single booking report and auto-cancel upcoming booking", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
@@ -165,7 +156,6 @@ describe("reportBookingHandler", () => {
           bookingId: 100,
           reason: ReportReason.SPAM,
           description: "This is spam",
-          allRemainingBookings: false,
         },
       });
 
@@ -179,6 +169,7 @@ describe("reportBookingHandler", () => {
         reason: ReportReason.SPAM,
         description: "This is spam",
         cancelled: true,
+        organizationId: undefined,
       });
     });
 
@@ -194,7 +185,6 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.DONT_KNOW_PERSON,
-          allRemainingBookings: false,
         },
       });
 
@@ -206,6 +196,7 @@ describe("reportBookingHandler", () => {
         reason: ReportReason.DONT_KNOW_PERSON,
         description: undefined,
         cancelled: false,
+        organizationId: undefined,
       });
     });
   });
@@ -231,8 +222,6 @@ describe("reportBookingHandler", () => {
           bookingId: 100,
           reason: ReportReason.SPAM,
           description: "Spam booking",
-          
-          allRemainingBookings: false,
         },
       });
 
@@ -242,7 +231,7 @@ describe("reportBookingHandler", () => {
           uid: "test-booking-uid",
           cancelledBy: mockUser.email,
           cancellationReason: "Spam booking",
-          allRemainingBookings: undefined,
+          skipCancellationReasonValidation: true,
         },
         userId: mockUser.id,
       });
@@ -260,8 +249,6 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          
-          allRemainingBookings: false,
         },
       });
 
@@ -282,8 +269,6 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          
-          allRemainingBookings: false,
         },
       });
 
@@ -317,8 +302,6 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          
-          allRemainingBookings: true,
         },
       });
 
@@ -353,8 +336,6 @@ describe("reportBookingHandler", () => {
         input: {
           bookingId: 100,
           reason: ReportReason.SPAM,
-          
-          allRemainingBookings: false,
         },
       });
 
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 45cc9de8a16ebb..4d6c7bca679fd1 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -1,7 +1,7 @@
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import logger from "@calcom/lib/logger";
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
 import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -79,6 +79,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
         bookingData: {
           uid: booking.uid,
           cancelledBy: user.email,
+          cancellationReason: description,
           skipCancellationReasonValidation: true,
           ...(booking.recurringEventId ? { cancelSubsequentBookings: true } : {}),
           ...(seatReferenceUid ? { seatReferenceUid } : {}),
@@ -102,6 +103,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
         reason,
         description,
         cancelled: didCancel,
+        organizationId: user?.organizationId,
       });
       createdCount++;
     } catch (error) {

From b0dcc0ab2c1f6663aca31870bd7caf1f1b197383 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 01:32:09 +0530
Subject: [PATCH 16/54] fix: type

---
 packages/lib/server/repository/bookingReport.interface.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index 3b3334d73e333f..beb1125a9d36d8 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -7,7 +7,7 @@ export interface CreateBookingReportInput {
   reason: ReportReason;
   description?: string;
   cancelled: boolean;
-  organizationId?: number;
+  organizationId?: number | null;
 }
 
 export interface BookingReportSummary {

From eeb6ed67bba6fe9a5a41fc0a8e62b2687e26d95e Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 01:41:02 +0530
Subject: [PATCH 17/54] fix: type

---
 packages/prisma/zod-utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index 8a9d13a045e156..8741f38f62a44f 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -275,7 +275,7 @@ export const bookingCancelSchema = z.object({
   // note(Lauris): cancelSubsequentBookings will cancel all bookings after one specified by id or uid.
   cancelSubsequentBookings: z.boolean().optional(),
   cancellationReason: z.string().optional(),
-  skipCancellationReasonValidation: z.boolean().optional().default(false),
+  skipCancellationReasonValidation: z.boolean().optional(),
   seatReferenceUid: z.string().optional(),
   cancelledBy: z.string().email({ message: "Invalid email" }).optional(),
   internalNote: z

From 4869717468635f2b74e80e4d7b4e039ff23012ba Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 20:50:39 +0530
Subject: [PATCH 18/54] refactor: address feedback

---
 .../components/booking/BookingListItem.tsx    | 51 ++++++------
 apps/web/components/booking/bookingActions.ts | 13 +--
 .../components/dialog/ReportBookingDialog.tsx | 18 ++---
 .../repositories/BookingRepository.ts         | 10 +--
 .../repository/bookingReport.interface.ts     | 10 +--
 .../server/repository/bookingReport.test.ts   | 62 ++++-----------
 .../lib/server/repository/bookingReport.ts    | 18 +----
 .../server/service/bookingAccessService.ts    |  8 +-
 .../migration.sql                             | 13 +--
 packages/prisma/schema.prisma                 | 11 +--
 .../routers/viewer/bookings/get.handler.ts    | 18 +++--
 .../bookings/reportBooking.handler.test.ts    | 79 +++++++++----------
 .../viewer/bookings/reportBooking.handler.ts  | 26 +++---
 .../viewer/bookings/reportBooking.schema.ts   |  6 +-
 14 files changed, 147 insertions(+), 196 deletions(-)
 rename packages/prisma/migrations/{20251011193952_add_booking_report => 20251013134959_add_booking_report}/migration.sql (78%)

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index e936deb3bcf38f..72ae646473f5ce 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -185,7 +185,7 @@ function BookingListItem(booking: BookingItemProps) {
   const isRescheduled = booking.fromReschedule !== null;
   const isRecurring = booking.recurringEventId !== null;
 
-  const getReportStatus = (): "upcoming" | "past" | "cancelled" | "rejected" => {
+  const getBookingStatus = (): "upcoming" | "past" | "cancelled" | "rejected" => {
     if (isCancelled) return "cancelled";
     if (isRejected) return "rejected";
     if (isBookingInPast) return "past";
@@ -414,12 +414,10 @@ function BookingListItem(booking: BookingItemProps) {
   })) as ActionType[];
 
   const reportAction = getReportAction(actionContext);
-  const reportActionWithHandler = reportAction
-    ? {
-        ...reportAction,
-        onClick: () => setIsOpenReportDialog(true),
-      }
-    : null;
+  const reportActionWithHandler = {
+    ...reportAction,
+    onClick: () => setIsOpenReportDialog(true),
+  };
 
   return (
     <>
@@ -452,9 +450,9 @@ function BookingListItem(booking: BookingItemProps) {
       <ReportBookingDialog
         isOpenDialog={isOpenReportDialog}
         setIsOpenDialog={setIsOpenReportDialog}
-        bookingId={booking.id}
+        bookingUid={booking.uid}
         isRecurring={isRecurring}
-        status={getReportStatus()}
+        status={getBookingStatus()}
       />
       {booking.paid && booking.payment[0] && (
         <ChargeCardDialog
@@ -711,21 +709,24 @@ function BookingListItem(booking: BookingItemProps) {
                         </DropdownItem>
                       </DropdownMenuItem>
                     ))}
-                    {reportActionWithHandler && (
-                      <>
-                        <DropdownMenuSeparator />
-                        <DropdownMenuItem className="rounded-lg" key={reportActionWithHandler.id}>
-                          <DropdownItem
-                            type="button"
-                            color={reportActionWithHandler.color}
-                            StartIcon={reportActionWithHandler.icon}
-                            onClick={reportActionWithHandler.onClick}
-                            data-testid={reportActionWithHandler.id}>
-                            {reportActionWithHandler.label}
-                          </DropdownItem>
-                        </DropdownMenuItem>
-                      </>
-                    )}
+                    <>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem
+                        className="rounded-lg"
+                        key={reportActionWithHandler.id}
+                        disabled={reportActionWithHandler.disabled}>
+                        <DropdownItem
+                          type="button"
+                          color={reportActionWithHandler.color}
+                          StartIcon={reportActionWithHandler.icon}
+                          onClick={reportActionWithHandler.onClick}
+                          disabled={reportActionWithHandler.disabled}
+                          data-testid={reportActionWithHandler.id}
+                          className={reportActionWithHandler.disabled ? "text-muted" : undefined}>
+                          {reportActionWithHandler.label}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                    </>
                     <DropdownMenuSeparator />
                     <DropdownMenuItem
                       className="rounded-lg"
@@ -749,7 +750,7 @@ function BookingListItem(booking: BookingItemProps) {
               </Dropdown>
             )}
             {shouldShowRecurringCancelAction(actionContext) && <TableActions actions={[cancelEventAction]} />}
-            {shouldShowIndividualReportButton(actionContext) && reportActionWithHandler && (
+            {shouldShowIndividualReportButton(actionContext) && (
               <div className="flex items-center space-x-2">
                 <Button
                   type="button"
diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index f4958edc683a6e..96457a65da5ff2 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -165,19 +165,15 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
   return actions.filter(Boolean) as ActionType[];
 }
 
-export function getReportAction(context: BookingActionContext): ActionType | null {
+export function getReportAction(context: BookingActionContext): ActionType {
   const { booking, t } = context;
 
-  if (booking.report) {
-    return null;
-  }
-
   return {
     id: "report",
     label: t("report_booking"),
     icon: "flag",
     color: "destructive",
-    disabled: false,
+    disabled: !!booking.report,
   };
 }
 
@@ -228,8 +224,7 @@ export function shouldShowIndividualReportButton(context: BookingActionContext):
 }
 
 export function isActionDisabled(actionId: string, context: BookingActionContext): boolean {
-  const { booking, isBookingInPast, isDisabledRescheduling, isDisabledCancelling, isPending, isConfirmed } =
-    context;
+  const { booking, isBookingInPast, isDisabledRescheduling, isDisabledCancelling } = context;
 
   switch (actionId) {
     case "reschedule":
@@ -249,7 +244,7 @@ export function isActionDisabled(actionId: string, context: BookingActionContext
 }
 
 export function getActionLabel(actionId: string, context: BookingActionContext): string {
-  const { booking, isTabRecurring, isRecurring, attendeeList, cardCharged, t } = context;
+  const { isTabRecurring, isRecurring, attendeeList, cardCharged, t } = context;
 
   switch (actionId) {
     case "reject":
diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 79e81bef2b18be..0f76520e15d4c7 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -3,7 +3,7 @@ import { Controller, useForm } from "react-hook-form";
 
 import { Dialog } from "@calcom/features/components/controlled-dialog";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ReportReason } from "@calcom/prisma/enums";
+import { BookingReportReason } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 import { Alert } from "@calcom/ui/components/alert";
 import { Button } from "@calcom/ui/components/button";
@@ -17,20 +17,20 @@ type BookingReportStatus = "upcoming" | "past" | "cancelled" | "rejected";
 interface IReportBookingDialog {
   isOpenDialog: boolean;
   setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
-  bookingId: number;
+  bookingUid: number;
   isRecurring: boolean;
   status: BookingReportStatus;
 }
 
 interface FormValues {
-  reason: ReportReason;
+  reason: BookingReportReason;
   description: string;
 }
 
 export const ReportBookingDialog = (props: IReportBookingDialog) => {
   const { t } = useLocale();
   const utils = trpc.useUtils();
-  const { isOpenDialog, setIsOpenDialog, bookingId, status } = props;
+  const { isOpenDialog, setIsOpenDialog, bookingUid, status } = props;
 
   const willBeCancelled = status === "upcoming";
 
@@ -40,7 +40,7 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
     formState: { errors },
   } = useForm<FormValues>({
     defaultValues: {
-      reason: ReportReason.SPAM,
+      reason: BookingReportReason.SPAM,
       description: "",
     },
   });
@@ -58,16 +58,16 @@ export const ReportBookingDialog = (props: IReportBookingDialog) => {
 
   const onSubmit = (data: FormValues) => {
     reportBooking({
-      bookingId,
+      bookingUid,
       reason: data.reason,
       description: data.description || undefined,
     });
   };
 
   const reasonOptions = [
-    { label: t("report_reason_spam"), value: ReportReason.SPAM },
-    { label: t("report_reason_dont_know_person"), value: ReportReason.DONT_KNOW_PERSON },
-    { label: t("report_reason_other"), value: ReportReason.OTHER },
+    { label: t("report_reason_spam"), value: BookingReportReason.SPAM },
+    { label: t("report_reason_dont_know_person"), value: BookingReportReason.DONT_KNOW_PERSON },
+    { label: t("report_reason_other"), value: BookingReportReason.OTHER },
   ];
 
   return (
diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index dd46cad4680183..09f1562fbf9a4c 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -147,10 +147,10 @@ export class BookingRepository {
     });
   }
 
-  async getBookingForAccessCheck({ bookingId }: { bookingId: number }) {
+  async findByUidIncludeEventType({ bookingUid }: { bookingUid: string }) {
     return await this.prismaClient.booking.findUnique({
       where: {
-        id: bookingId,
+        uid: bookingUid,
       },
       select: {
         userId: true,
@@ -246,10 +246,10 @@ export class BookingRepository {
     });
   }
 
-  async getBookingForReporting({ bookingId }: { bookingId: number }) {
+  async findByIdIncludeReport({ bookingUid }: { bookingUid: string }) {
     return await this.prismaClient.booking.findUnique({
       where: {
-        id: bookingId,
+        uid: bookingUid,
       },
       select: {
         id: true,
@@ -294,7 +294,7 @@ export class BookingRepository {
         startTime: { gte: fromDate },
         status: { in: [BookingStatus.ACCEPTED, BookingStatus.PENDING] },
       },
-      select: { id: true },
+      select: { id: true, uid: true },
       orderBy: { startTime: "asc" },
     });
   }
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index beb1125a9d36d8..ea6708ec65e721 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -1,10 +1,10 @@
-import type { ReportReason } from "@calcom/prisma/enums";
+import type { BookingReportReason } from "@calcom/prisma/enums";
 
 export interface CreateBookingReportInput {
-  bookingId: number;
+  bookingUid: string;
   bookerEmail: string;
   reportedById: number;
-  reason: ReportReason;
+  reason: BookingReportReason;
   description?: string;
   cancelled: boolean;
   organizationId?: number | null;
@@ -13,7 +13,7 @@ export interface CreateBookingReportInput {
 export interface BookingReportSummary {
   id: string;
   reportedById: number;
-  reason: ReportReason;
+  reason: BookingReportReason;
   description: string | null;
   createdAt: Date;
 }
@@ -21,7 +21,5 @@ export interface BookingReportSummary {
 export interface IBookingReportRepository {
   createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
 
-  findReportForBooking(bookingId: number): Promise<BookingReportSummary | null>;
-
   findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]>;
 }
diff --git a/packages/lib/server/repository/bookingReport.test.ts b/packages/lib/server/repository/bookingReport.test.ts
index 450125fc30ce31..d185c8606ffc98 100644
--- a/packages/lib/server/repository/bookingReport.test.ts
+++ b/packages/lib/server/repository/bookingReport.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import type { PrismaClient } from "@calcom/prisma";
-import { ReportReason } from "@calcom/prisma/enums";
+import { BookingReportReason } from "@calcom/prisma/enums";
 
 import { PrismaBookingReportRepository } from "./bookingReport";
 import type { CreateBookingReportInput } from "./bookingReport.interface";
@@ -30,12 +30,13 @@ describe("PrismaBookingReportRepository", () => {
   describe("createReport", () => {
     it("should create a booking report with all fields", async () => {
       const input: CreateBookingReportInput = {
-        bookingId: 100,
+        bookingUid: "test-booking-uid-1",
         bookerEmail: "booker@example.com",
         reportedById: 1,
-        reason: ReportReason.SPAM,
+        reason: BookingReportReason.SPAM,
         description: "This is spam",
         cancelled: true,
+        organizationId: 10,
       };
 
       const mockCreatedReport = { id: "report-123" };
@@ -46,12 +47,13 @@ describe("PrismaBookingReportRepository", () => {
       expect(result).toEqual({ id: "report-123" });
       expect(mockPrisma.bookingReport.create).toHaveBeenCalledWith({
         data: {
-          bookingId: 100,
+          bookingUid: "test-booking-uid-1",
           bookerEmail: "booker@example.com",
           reportedById: 1,
-          reason: ReportReason.SPAM,
+          reason: BookingReportReason.SPAM,
           description: "This is spam",
           cancelled: true,
+          organizationId: 10,
         },
         select: { id: true },
       });
@@ -59,10 +61,10 @@ describe("PrismaBookingReportRepository", () => {
 
     it("should create a booking report without optional fields", async () => {
       const input: CreateBookingReportInput = {
-        bookingId: 200,
+        bookingUid: "test-booking-uid-2",
         bookerEmail: "user@example.com",
         reportedById: 2,
-        reason: ReportReason.DONT_KNOW_PERSON,
+        reason: BookingReportReason.DONT_KNOW_PERSON,
         cancelled: false,
       };
 
@@ -74,53 +76,17 @@ describe("PrismaBookingReportRepository", () => {
       expect(result).toEqual({ id: "report-456" });
       expect(mockPrisma.bookingReport.create).toHaveBeenCalledWith({
         data: {
-          bookingId: 200,
+          bookingUid: "test-booking-uid-2",
           bookerEmail: "user@example.com",
           reportedById: 2,
-          reason: ReportReason.DONT_KNOW_PERSON,
+          reason: BookingReportReason.DONT_KNOW_PERSON,
           description: undefined,
           cancelled: false,
+          organizationId: undefined,
         },
         select: { id: true },
       });
     });
-
-  });
-
-  describe("findReportForBooking", () => {
-    it("should find the report for a booking", async () => {
-      const mockReport = {
-        id: "report-123",
-        reportedById: 1,
-        reason: ReportReason.SPAM,
-        description: "Spam booking",
-        createdAt: new Date("2025-01-01T10:00:00Z"),
-      };
-
-      mockPrisma.bookingReport.findUnique.mockResolvedValue(mockReport);
-
-      const result = await repository.findReportForBooking(100);
-
-      expect(result).toEqual(mockReport);
-      expect(mockPrisma.bookingReport.findUnique).toHaveBeenCalledWith({
-        where: { bookingId: 100 },
-        select: {
-          id: true,
-          reportedById: true,
-          reason: true,
-          description: true,
-          createdAt: true,
-        },
-      });
-    });
-
-    it("should return null when no report exists", async () => {
-      mockPrisma.bookingReport.findUnique.mockResolvedValue(null);
-
-      const result = await repository.findReportForBooking(100);
-
-      expect(result).toBeNull();
-    });
   });
 
   describe("findAllReportedBookings", () => {
@@ -129,14 +95,14 @@ describe("PrismaBookingReportRepository", () => {
         {
           id: "report-1",
           reportedById: 1,
-          reason: ReportReason.SPAM,
+          reason: BookingReportReason.SPAM,
           description: "Spam",
           createdAt: new Date("2025-01-01T10:00:00Z"),
         },
         {
           id: "report-2",
           reportedById: 2,
-          reason: ReportReason.DONT_KNOW_PERSON,
+          reason: BookingReportReason.DONT_KNOW_PERSON,
           description: null,
           createdAt: new Date("2025-01-01T11:00:00Z"),
         },
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index 393786b86da7e0..ebb4ad562f9663 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -9,10 +9,10 @@ import type {
 export class PrismaBookingReportRepository implements IBookingReportRepository {
   constructor(private readonly prismaClient: PrismaClient) {}
 
-  async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
+  async createReport(input: CreateBookingReportInput): Promise<{ bookingUid: string }> {
     const report = await this.prismaClient.bookingReport.create({
       data: {
-        bookingId: input.bookingId,
+        bookingUid: input.bookingUid,
         bookerEmail: input.bookerEmail,
         reportedById: input.reportedById,
         reason: input.reason,
@@ -25,20 +25,6 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
     return report;
   }
 
-  async findReportForBooking(bookingId: number): Promise<BookingReportSummary | null> {
-    const report = await this.prismaClient.bookingReport.findUnique({
-      where: { bookingId },
-      select: {
-        id: true,
-        reportedById: true,
-        reason: true,
-        description: true,
-        createdAt: true,
-      },
-    });
-    return report;
-  }
-
   async findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]> {
     const reports = await this.prismaClient.bookingReport.findMany({
       skip: params.skip,
diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/lib/server/service/bookingAccessService.ts
index 9909b0c8a245d5..2c620259d98060 100644
--- a/packages/lib/server/service/bookingAccessService.ts
+++ b/packages/lib/server/service/bookingAccessService.ts
@@ -3,7 +3,7 @@ import type { PrismaClient } from "@calcom/prisma";
 import { BookingRepository } from "../repository/booking";
 import { UserRepository } from "../repository/user";
 
-type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["getBookingForAccessCheck"]>>>;
+type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["findByUidIncludeEventType"]>>>;
 
 export class BookingAccessService {
   constructor(private prismaClient: PrismaClient) {}
@@ -42,15 +42,15 @@ export class BookingAccessService {
    */
   async doesUserIdHaveAccessToBooking({
     userId,
-    bookingId,
+    bookingUid,
   }: {
     userId: number;
-    bookingId: number;
+    bookingUid: string;
   }): Promise<boolean> {
     const bookingRepo = new BookingRepository(this.prismaClient);
     const userRepo = new UserRepository(this.prismaClient);
 
-    const booking = await bookingRepo.getBookingForAccessCheck({ bookingId });
+    const booking = await bookingRepo.findByUidIncludeEventType({ bookingUid });
 
     if (!booking) return false;
 
diff --git a/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql b/packages/prisma/migrations/20251013134959_add_booking_report/migration.sql
similarity index 78%
rename from packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251013134959_add_booking_report/migration.sql
index b7303d4f8f8882..b96b7fcf8f240f 100644
--- a/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251013134959_add_booking_report/migration.sql
@@ -1,24 +1,25 @@
 -- CreateEnum
-CREATE TYPE "ReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
+CREATE TYPE "BookingReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
 
 -- CreateTable
 CREATE TABLE "BookingReport" (
     "id" UUID NOT NULL,
-    "bookingId" INTEGER NOT NULL,
+    "bookingUid" TEXT NOT NULL,
     "bookerEmail" TEXT NOT NULL,
     "reportedById" INTEGER NOT NULL,
     "organizationId" INTEGER,
-    "reason" "ReportReason" NOT NULL,
+    "reason" "BookingReportReason" NOT NULL,
     "description" TEXT,
     "cancelled" BOOLEAN NOT NULL DEFAULT false,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
     "watchlistId" UUID,
 
     CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
 );
 
 -- CreateIndex
-CREATE UNIQUE INDEX "BookingReport_bookingId_key" ON "BookingReport"("bookingId");
+CREATE UNIQUE INDEX "BookingReport_bookingUid_key" ON "BookingReport"("bookingUid");
 
 -- CreateIndex
 CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
@@ -36,10 +37,10 @@ CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
 CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
 
 -- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingUid_fkey" FOREIGN KEY ("bookingUid") REFERENCES "Booking"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 84bcbb9bfd7c8e..012372fac887b5 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -2349,7 +2349,7 @@ model WatchlistEventAudit {
   timestamp   DateTime        @default(now())
 }
 
-enum ReportReason {
+enum BookingReportReason {
   SPAM
   DONT_KNOW_PERSON @map("dont_know_person")
   OTHER
@@ -2357,19 +2357,20 @@ enum ReportReason {
 
 model BookingReport {
   id             String       @id @default(uuid()) @db.Uuid
-  bookingId      Int          @unique
+  bookingUid     String       @unique
+  booking        Booking      @relation(fields: [bookingUid], references: [uid], onDelete: Cascade)
   bookerEmail    String
   reportedById   Int
   organizationId Int?
-  reason         ReportReason
+  reason         BookingReportReason
   description    String?
   cancelled      Boolean      @default(false)
   createdAt      DateTime     @default(now())
+  updatedAt      DateTime     @updatedAt
 
   watchlistId String? @db.Uuid
 
-  booking      Booking    @relation(fields: [bookingId], references: [id], onDelete: Cascade)
-  reportedBy   User       @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: Cascade)
+  reportedBy   User       @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: SetNull)
   organization Team?      @relation(fields: [organizationId], references: [id], onDelete: Cascade)
   watchlist    Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
 
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 18bac35ff594b6..19d99cff918b48 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -3,7 +3,6 @@ import { type SelectQueryBuilder } from "kysely";
 import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";
 
 import dayjs from "@calcom/dayjs";
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
 import type { DB } from "@calcom/kysely";
 import kysely from "@calcom/kysely";
@@ -591,6 +590,18 @@ export async function getBookings({
               .orderBy("AssignmentReason.createdAt", "desc")
               .limit(1)
           ).as("assignmentReason"),
+          jsonObjectFrom(
+            eb
+              .selectFrom("BookingReport")
+              .select([
+                "BookingReport.id",
+                "BookingReport.reportedById",
+                "BookingReport.reason",
+                "BookingReport.description",
+                "BookingReport.createdAt",
+              ])
+              .whereRef("BookingReport.bookingUid", "=", "Booking.uid")
+          ).as("report"),
         ])
         .orderBy(orderBy.key, orderBy.order)
         .execute()
@@ -690,8 +701,6 @@ export async function getBookings({
     });
   };
 
-  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
-
   const bookings = await Promise.all(
     plainBookings.map(async (booking) => {
       // If seats are enabled, the event is not set to show attendees, and the current user is not the host, filter out attendees who are not the current user
@@ -718,12 +727,9 @@ export async function getBookings({
         }
       }
 
-      const report = await bookingReportRepo.findReportForBooking(booking.id);
-
       return {
         ...booking,
         rescheduler,
-        report,
         eventType: {
           ...booking.eventType,
           recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index 6dc74451ff49c0..6ea674b3b7b4a5 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -4,7 +4,7 @@ import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooki
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
-import { BookingStatus, ReportReason } from "@calcom/prisma/enums";
+import { BookingStatus, BookingReportReason } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
@@ -42,13 +42,12 @@ describe("reportBookingHandler", () => {
   };
 
   const mockBookingRepo = {
-    getBookingForReporting: vi.fn(),
+    findByIdIncludeReport: vi.fn(),
     getActiveRecurringBookingsFromDate: vi.fn(),
   };
 
   const mockReportRepo = {
     createReport: vi.fn(),
-    findReportForBooking: vi.fn(),
     findAllReportedBookings: vi.fn(),
   };
 
@@ -73,8 +72,8 @@ describe("reportBookingHandler", () => {
         reportBookingHandler({
           ctx: { user: mockUser },
           input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
           },
         })
       ).rejects.toThrow(TRPCError);
@@ -83,8 +82,8 @@ describe("reportBookingHandler", () => {
         reportBookingHandler({
           ctx: { user: mockUser },
           input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
           },
         })
       ).rejects.toMatchObject({
@@ -95,14 +94,14 @@ describe("reportBookingHandler", () => {
 
     it("should throw NOT_FOUND when booking doesn't exist", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue(null);
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue(null);
 
       await expect(
         reportBookingHandler({
           ctx: { user: mockUser },
           input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
           },
         })
       ).rejects.toMatchObject({
@@ -115,7 +114,7 @@ describe("reportBookingHandler", () => {
   describe("duplicate report prevention", () => {
     it("should throw BAD_REQUEST when booking already has a report", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         report: { id: "existing-report" },
       });
@@ -124,8 +123,8 @@ describe("reportBookingHandler", () => {
         reportBookingHandler({
           ctx: { user: mockUser },
           input: {
-            bookingId: 100,
-            reason: ReportReason.SPAM,
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
           },
         })
       ).rejects.toMatchObject({
@@ -138,7 +137,7 @@ describe("reportBookingHandler", () => {
   describe("successful report creation", () => {
     it("should successfully create a single booking report and auto-cancel upcoming booking", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
       });
@@ -146,15 +145,14 @@ describe("reportBookingHandler", () => {
         success: true,
         message: "Cancelled",
         onlyRemovedAttendee: false,
-        bookingId: 100,
         bookingUid: "test-booking-uid",
       });
 
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.SPAM,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
           description: "This is spam",
         },
       });
@@ -163,10 +161,10 @@ describe("reportBookingHandler", () => {
       expect(result.message).toBe("Booking reported and cancelled successfully");
       expect(result.reportedCount).toBe(1);
       expect(mockReportRepo.createReport).toHaveBeenCalledWith({
-        bookingId: 100,
+        bookingUid: "test-booking-uid",
         bookerEmail: "booker@example.com",
         reportedById: mockUser.id,
-        reason: ReportReason.SPAM,
+        reason: BookingReportReason.SPAM,
         description: "This is spam",
         cancelled: true,
         organizationId: undefined,
@@ -175,7 +173,7 @@ describe("reportBookingHandler", () => {
 
     it("should create report without description for past booking", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000), // Yesterday
       });
@@ -183,17 +181,17 @@ describe("reportBookingHandler", () => {
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.DONT_KNOW_PERSON,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.DONT_KNOW_PERSON,
         },
       });
 
       expect(result.message).toBe("Booking reported successfully");
       expect(mockReportRepo.createReport).toHaveBeenCalledWith({
-        bookingId: 100,
+        bookingUid: "test-booking-uid",
         bookerEmail: "booker@example.com",
         reportedById: mockUser.id,
-        reason: ReportReason.DONT_KNOW_PERSON,
+        reason: BookingReportReason.DONT_KNOW_PERSON,
         description: undefined,
         cancelled: false,
         organizationId: undefined,
@@ -204,7 +202,7 @@ describe("reportBookingHandler", () => {
   describe("cancellation integration", () => {
     it("should cancel booking when cancelBooking is true", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
       });
@@ -212,15 +210,14 @@ describe("reportBookingHandler", () => {
         success: true,
         message: "Cancelled",
         onlyRemovedAttendee: false,
-        bookingId: 100,
         bookingUid: "test-booking-uid",
       });
 
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.SPAM,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
           description: "Spam booking",
         },
       });
@@ -239,7 +236,7 @@ describe("reportBookingHandler", () => {
 
     it("should not cancel booking if it's in the past", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000),
       });
@@ -247,8 +244,8 @@ describe("reportBookingHandler", () => {
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.SPAM,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
         },
       });
 
@@ -258,7 +255,7 @@ describe("reportBookingHandler", () => {
 
     it("should handle cancellation failure gracefully", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),
       });
@@ -267,8 +264,8 @@ describe("reportBookingHandler", () => {
       const result = await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.SPAM,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
         },
       });
 
@@ -279,7 +276,7 @@ describe("reportBookingHandler", () => {
 
     it("should use cancelSubsequentBookings for recurring events", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         recurringEventId: "recurring-123",
         startTime: new Date(Date.now() + 86400000),
@@ -293,15 +290,14 @@ describe("reportBookingHandler", () => {
         success: true,
         message: "Cancelled",
         onlyRemovedAttendee: false,
-        bookingId: 100,
         bookingUid: "test-booking-uid",
       });
 
       await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.SPAM,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
         },
       });
 
@@ -315,7 +311,7 @@ describe("reportBookingHandler", () => {
 
     it("should pass seatReferenceUid for seated events", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.getBookingForReporting.mockResolvedValue({
+      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),
         seatsReferences: [
@@ -327,15 +323,14 @@ describe("reportBookingHandler", () => {
         success: true,
         message: "Cancelled",
         onlyRemovedAttendee: false,
-        bookingId: 100,
         bookingUid: "test-booking-uid",
       });
 
       await reportBookingHandler({
         ctx: { user: mockUser },
         input: {
-          bookingId: 100,
-          reason: ReportReason.SPAM,
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
         },
       });
 
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 4d6c7bca679fd1..271b2860bf8903 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -22,7 +22,7 @@ const log = logger.getSubLogger({ prefix: ["reportBookingHandler"] });
 
 export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions) => {
   const { user } = ctx;
-  const { bookingId, reason, description } = input;
+  const { bookingUid, reason, description } = input;
 
   const bookingRepo = new BookingRepository(prisma);
   const bookingReportRepo = new PrismaBookingReportRepository(prisma);
@@ -30,14 +30,14 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
 
   const hasAccess = await bookingAccessService.doesUserIdHaveAccessToBooking({
     userId: user.id,
-    bookingId,
+    bookingUid,
   });
 
   if (!hasAccess) {
     throw new TRPCError({ code: "FORBIDDEN", message: "You don't have access to this booking" });
   }
 
-  const booking = await bookingRepo.getBookingForReporting({ bookingId });
+  const booking = await bookingRepo.findByIdIncludeReport({ bookingUid });
 
   if (!booking) {
     throw new TRPCError({ code: "NOT_FOUND", message: "Booking not found" });
@@ -52,27 +52,29 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     throw new TRPCError({ code: "BAD_REQUEST", message: "Booking has no attendees" });
   }
 
-  let reportedBookingIds: number[] = [bookingId];
+  let reportedBookingUids: string[] = [bookingUid];
 
   if (booking.recurringEventId) {
     const remainingBookings = await bookingRepo.getActiveRecurringBookingsFromDate({
       recurringEventId: booking.recurringEventId,
       fromDate: booking.startTime,
     });
-    reportedBookingIds = remainingBookings.map((b) => b.id);
+    reportedBookingUids = remainingBookings.map((b) => b.uid);
   }
 
   let cancellationError: unknown = null;
   let cancellationAttempted = false;
   let didCancel = false;
   const isUpcoming =
-    (booking.status === BookingStatus.ACCEPTED || booking.status === BookingStatus.PENDING) &&
+    (booking.status === BookingStatus.ACCEPTED ||
+      booking.status === BookingStatus.PENDING ||
+      booking.status === BookingStatus.AWAITING_HOST) &&
     new Date(booking.startTime) > new Date();
 
   if (isUpcoming) {
     cancellationAttempted = true;
     try {
-      const userSeat = booking.seatsReferences.find((seat) => seat.attendee?.email === user.email);
+      const userSeat = booking.seatsReferences.find((seat) => seat.attendee?.email.trim().toLowerCase() === user.email.trim().toLowerCase());
       const seatReferenceUid = userSeat?.referenceUid;
 
       await handleCancelBooking({
@@ -94,10 +96,10 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   }
 
   let createdCount = 0;
-  for (const id of reportedBookingIds) {
+  for (const uid of reportedBookingUids) {
     try {
       await bookingReportRepo.createReport({
-        bookingId: id,
+        bookingUid: uid,
         bookerEmail,
         reportedById: user.id,
         reason,
@@ -107,11 +109,11 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
       });
       createdCount++;
     } catch (error) {
-      log.warn(`Failed to create report for booking ${id}:`, error);
+      log.warn(`Failed to create report for booking ${uid}:`, error);
     }
   }
 
-  const reportedBooking = { id: reportedBookingIds[0] };
+  const reportedBooking = { uid: reportedBookingUids[0] };
 
   const isRecurring = Boolean(booking.recurringEventId) && createdCount > 1;
   const baseMessage = isRecurring ? `${createdCount} recurring bookings reported` : "Booking reported";
@@ -126,7 +128,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
           : `${baseMessage} and cancelled successfully`
         : `${baseMessage} successfully`
       : "No reports created",
-    bookingId: reportedBooking.id,
+    bookingUid: reportedBooking.uid,
     reportedCount: createdCount,
   };
 };
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
index f7e0cf2fb1b838..1fa18d54959f6d 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
@@ -1,10 +1,10 @@
 import { z } from "zod";
 
-import { ReportReason } from "@calcom/prisma/enums";
+import { BookingReportReason } from "@calcom/prisma/enums";
 
 export const ZReportBookingInputSchema = z.object({
-  bookingId: z.number(),
-  reason: z.nativeEnum(ReportReason),
+  bookingUid: z.string(),
+  reason: z.nativeEnum(BookingReportReason),
   description: z.string().optional(),
 });
 

From 65a5eade07ac154a0df51b949f657bede9a1b7b1 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 21:14:22 +0530
Subject: [PATCH 19/54] refactor: move to new file

---
 .../bookings/services/BookingAccessService.ts}     | 14 +++++++++-----
 packages/lib/server/repository/bookingReport.ts    |  2 +-
 .../viewer/bookings/reportBooking.handler.test.ts  |  8 ++++----
 .../viewer/bookings/reportBooking.handler.ts       | 11 +++++++----
 4 files changed, 21 insertions(+), 14 deletions(-)
 rename packages/{lib/server/service/bookingAccessService.ts => features/bookings/services/BookingAccessService.ts} (86%)

diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/features/bookings/services/BookingAccessService.ts
similarity index 86%
rename from packages/lib/server/service/bookingAccessService.ts
rename to packages/features/bookings/services/BookingAccessService.ts
index 2c620259d98060..a1ed2357bda1d7 100644
--- a/packages/lib/server/service/bookingAccessService.ts
+++ b/packages/features/bookings/services/BookingAccessService.ts
@@ -1,7 +1,7 @@
 import type { PrismaClient } from "@calcom/prisma";
 
-import { BookingRepository } from "../repository/booking";
-import { UserRepository } from "../repository/user";
+import { BookingRepository } from "../repositories/BookingRepository";
+import { UserRepository } from "@calcom/features/users/UserRepository";
 
 type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["findByUidIncludeEventType"]>>>;
 
@@ -17,14 +17,18 @@ export class BookingAccessService {
       }
     };
 
-    booking?.eventType?.hosts?.forEach((host) => addHost(host.userId, host.user.email));
-    booking?.eventType?.users?.forEach((user) => addHost(user.id, user.email));
+    booking?.eventType?.hosts?.forEach((host: { userId: number; user: { email: string } }) =>
+      addHost(host.userId, host.user.email)
+    );
+    booking?.eventType?.users?.forEach((user: { id: number; email: string }) =>
+      addHost(user.id, user.email)
+    );
 
     if (booking?.user?.id && booking?.user?.email) {
       addHost(booking.user.id, booking.user.email);
     }
 
-    const attendeeEmails = new Set(booking.attendees?.map((attendee) => attendee.email));
+    const attendeeEmails = new Set(booking.attendees?.map((attendee: { email: string }) => attendee.email));
     const filteredHosts = Array.from(hostMap.values()).filter(
       (host) => attendeeEmails.has(host.email) || host.id === booking.user?.id
     );
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index ebb4ad562f9663..f9ef5c9c2efe37 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -9,7 +9,7 @@ import type {
 export class PrismaBookingReportRepository implements IBookingReportRepository {
   constructor(private readonly prismaClient: PrismaClient) {}
 
-  async createReport(input: CreateBookingReportInput): Promise<{ bookingUid: string }> {
+  async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
     const report = await this.prismaClient.bookingReport.create({
       data: {
         bookingUid: input.bookingUid,
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index 6ea674b3b7b4a5..fc0ff6b38b28d2 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -1,9 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { BookingAccessService } from "@calcom/features/bookings/services/BookingAccessService";
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
 import { BookingStatus, BookingReportReason } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
@@ -12,8 +12,8 @@ import { reportBookingHandler } from "./reportBooking.handler";
 
 vi.mock("@calcom/lib/server/repository/bookingReport");
 vi.mock("@calcom/features/bookings/lib/handleCancelBooking");
-vi.mock("@calcom/lib/server/repository/booking");
-vi.mock("@calcom/lib/server/service/bookingAccessService");
+vi.mock("@calcom/features/bookings/repositories/BookingRepository");
+vi.mock("@calcom/features/bookings/services/BookingAccessService");
 vi.mock("@calcom/lib/logger", () => ({
   default: {
     getSubLogger: () => ({
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 271b2860bf8903..71ca6d0efaf855 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -1,8 +1,8 @@
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { BookingAccessService } from "@calcom/features/bookings/services/BookingAccessService";
 import logger from "@calcom/lib/logger";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { BookingAccessService } from "@calcom/lib/server/service/bookingAccessService";
 import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
@@ -59,7 +59,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
       recurringEventId: booking.recurringEventId,
       fromDate: booking.startTime,
     });
-    reportedBookingUids = remainingBookings.map((b) => b.uid);
+    reportedBookingUids = remainingBookings.map((b: { uid: string }) => b.uid);
   }
 
   let cancellationError: unknown = null;
@@ -74,7 +74,10 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   if (isUpcoming) {
     cancellationAttempted = true;
     try {
-      const userSeat = booking.seatsReferences.find((seat) => seat.attendee?.email.trim().toLowerCase() === user.email.trim().toLowerCase());
+      const userSeat = booking.seatsReferences.find(
+        (seat: { attendee?: { email: string }; referenceUid?: string }) =>
+          seat.attendee?.email.trim().toLowerCase() === user.email.trim().toLowerCase()
+      );
       const seatReferenceUid = userSeat?.referenceUid;
 
       await handleCancelBooking({

From 4a2d407a4ddfcacad4942b52ca0d587b5df776df Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 21:15:25 +0530
Subject: [PATCH 20/54] refactor: move to new file

---
 .../repositories/BookingRepository.ts         |    2 +-
 packages/lib/server/repository/booking.ts     | 1161 +++++++++++++++++
 .../bookings/reportBooking.handler.test.ts    |   20 +-
 .../viewer/bookings/reportBooking.handler.ts  |    2 +-
 4 files changed, 1173 insertions(+), 12 deletions(-)
 create mode 100644 packages/lib/server/repository/booking.ts

diff --git a/packages/features/bookings/repositories/BookingRepository.ts b/packages/features/bookings/repositories/BookingRepository.ts
index 09f1562fbf9a4c..57116f8d205d16 100644
--- a/packages/features/bookings/repositories/BookingRepository.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -246,7 +246,7 @@ export class BookingRepository {
     });
   }
 
-  async findByIdIncludeReport({ bookingUid }: { bookingUid: string }) {
+  async findByUidIncludeReport({ bookingUid }: { bookingUid: string }) {
     return await this.prismaClient.booking.findUnique({
       where: {
         uid: bookingUid,
diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts
new file mode 100644
index 00000000000000..b24b065a50a9f0
--- /dev/null
+++ b/packages/lib/server/repository/booking.ts
@@ -0,0 +1,1161 @@
+import { withReporting } from "@calcom/lib/sentryWrapper";
+import type { PrismaClient } from "@calcom/prisma";
+import type { Prisma } from "@calcom/prisma/client";
+import type { Booking } from "@calcom/prisma/client";
+import { RRTimestampBasis, BookingStatus } from "@calcom/prisma/enums";
+import { bookingMinimalSelect } from "@calcom/prisma/selects/booking";
+import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
+
+import { UserRepository } from "./user";
+
+export type FormResponse = Record<
+  // Field ID
+  string,
+  {
+    value: number | string | string[];
+    label: string;
+    identifier?: string;
+  }
+>;
+
+type TeamBookingsParamsBase = {
+  user: { id: number; email: string };
+  teamId: number;
+  startDate: Date;
+  endDate: Date;
+  excludedUid?: string | null;
+  includeManagedEvents: boolean;
+  shouldReturnCount?: boolean;
+};
+
+type TeamBookingsMultipleUsersParamsBase = {
+  users: { id: number; email: string }[];
+  teamId: number;
+  startDate: Date;
+  endDate: Date;
+  excludedUid?: string | null;
+  includeManagedEvents: boolean;
+  shouldReturnCount?: boolean;
+};
+
+type TeamBookingsMultipleUsersParamsWithCount = TeamBookingsMultipleUsersParamsBase & {
+  shouldReturnCount: true;
+};
+
+type TeamBookingsMultipleUsersParamsWithoutCount = TeamBookingsMultipleUsersParamsBase;
+
+type TeamBookingsParamsWithCount = TeamBookingsParamsBase & {
+  shouldReturnCount: true;
+};
+
+type TeamBookingsParamsWithoutCount = TeamBookingsParamsBase;
+
+const buildWhereClauseForActiveBookings = ({
+  eventTypeId,
+  startDate,
+  endDate,
+  users,
+  virtualQueuesData,
+  includeNoShowInRRCalculation = false,
+  rrTimestampBasis,
+}: {
+  eventTypeId: number;
+  startDate?: Date;
+  endDate?: Date;
+  users: { id: number; email: string }[];
+  virtualQueuesData: {
+    chosenRouteId: string;
+    fieldOptionData: {
+      fieldId: string;
+      selectedOptionIds: string | number | string[];
+    };
+  } | null;
+  includeNoShowInRRCalculation: boolean;
+  rrTimestampBasis: RRTimestampBasis;
+}): Prisma.BookingWhereInput => ({
+  OR: [
+    {
+      userId: {
+        in: users.map((user) => user.id),
+      },
+      ...(!includeNoShowInRRCalculation
+        ? {
+            OR: [{ noShowHost: false }, { noShowHost: null }],
+          }
+        : {}),
+    },
+    {
+      attendees: {
+        some: {
+          email: {
+            in: users.map((user) => user.email),
+          },
+        },
+      },
+    },
+  ],
+  ...(!includeNoShowInRRCalculation ? { attendees: { some: { noShow: false } } } : {}),
+  status: BookingStatus.ACCEPTED,
+  eventTypeId,
+  ...(startDate || endDate
+    ? rrTimestampBasis === RRTimestampBasis.CREATED_AT
+      ? {
+          createdAt: {
+            ...(startDate ? { gte: startDate } : {}),
+            ...(endDate ? { lte: endDate } : {}),
+          },
+        }
+      : {
+          startTime: {
+            ...(startDate ? { gte: startDate } : {}),
+            ...(endDate ? { lte: endDate } : {}),
+          },
+        }
+    : {}),
+  ...(virtualQueuesData
+    ? {
+        routedFromRoutingFormReponse: {
+          chosenRouteId: virtualQueuesData.chosenRouteId,
+        },
+      }
+    : {}),
+});
+
+export class BookingRepository {
+  constructor(private prismaClient: PrismaClient) {}
+
+  async getBookingAttendees(bookingId: number) {
+    return await this.prismaClient.attendee.findMany({
+      where: {
+        bookingId,
+      },
+    });
+  }
+
+  async getBookingWithEventTypeTeamId({ bookingId }: { bookingId: number }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        userId: true,
+        eventType: {
+          select: {
+            teamId: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findByUidIncludeEventType({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: {
+        userId: true,
+        user: {
+          select: {
+            id: true,
+            email: true,
+          },
+        },
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+        eventType: {
+          select: {
+            teamId: true,
+            hosts: {
+              select: {
+                userId: true,
+                user: {
+                  select: {
+                    email: true,
+                  },
+                },
+              },
+            },
+            users: {
+              select: {
+                id: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+
+  /** Determines if the user is the organizer, team admin, or org admin that the booking was created under */
+  async doesUserIdHaveAccessToBooking({ userId, bookingId }: { userId: number; bookingId: number }) {
+    const booking = await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        userId: true,
+        eventType: {
+          select: {
+            teamId: true,
+          },
+        },
+      },
+    });
+
+    if (!booking) return false;
+
+    if (userId === booking.userId) return true;
+
+    // If the booking doesn't belong to the user and there's no team then return early
+    if (!booking.eventType || !booking.eventType.teamId) return false;
+
+    // TODO add checks for team and org
+    const userRepo = new UserRepository(this.prismaClient);
+    const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
+      userId,
+      teamId: booking.eventType.teamId,
+    });
+
+    return isAdminOrUser;
+  }
+
+  async findFirstBookingByReschedule({ originalBookingUid }: { originalBookingUid: string }) {
+    return await this.prismaClient.booking.findFirst({
+      where: {
+        fromReschedule: originalBookingUid,
+      },
+      select: {
+        uid: true,
+      },
+    });
+  }
+
+  async findReschedulerByUid({ uid }: { uid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid,
+      },
+      select: {
+        rescheduledBy: true,
+        uid: true,
+      },
+    });
+  }
+
+  async findByUidIncludeReport({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: {
+        id: true,
+        uid: true,
+        startTime: true,
+        status: true,
+        recurringEventId: true,
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+        seatsReferences: {
+          select: {
+            referenceUid: true,
+            attendee: {
+              select: {
+                email: true,
+              },
+            },
+          },
+        },
+        report: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+  }
+
+  async getActiveRecurringBookingsFromDate({
+    recurringEventId,
+    fromDate,
+  }: {
+    recurringEventId: string;
+    fromDate: Date;
+  }) {
+    return await this.prismaClient.booking.findMany({
+      where: {
+        recurringEventId,
+        startTime: { gte: fromDate },
+        status: { in: [BookingStatus.ACCEPTED, BookingStatus.PENDING] },
+      },
+      select: { id: true, uid: true },
+      orderBy: { startTime: "asc" },
+    });
+  }
+
+  private async _findAllExistingBookingsForEventTypeBetween({
+    eventTypeId,
+    seatedEvent = false,
+    startDate,
+    endDate,
+    userIdAndEmailMap,
+  }: {
+    startDate: Date;
+    endDate: Date;
+    eventTypeId?: number | null;
+    seatedEvent?: boolean;
+    userIdAndEmailMap: Map<number, string>;
+  }) {
+    const sharedQuery = {
+      startTime: { lte: endDate },
+      endTime: { gte: startDate },
+      status: {
+        in: [BookingStatus.ACCEPTED],
+      },
+    };
+
+    const bookingsSelect = {
+      id: true,
+      uid: true,
+      userId: true,
+      startTime: true,
+      endTime: true,
+      title: true,
+      attendees: true,
+      eventType: {
+        select: {
+          id: true,
+          onlyShowFirstAvailableSlot: true,
+          afterEventBuffer: true,
+          beforeEventBuffer: true,
+          seatsPerTimeSlot: true,
+          requiresConfirmationWillBlockSlot: true,
+          requiresConfirmation: true,
+          allowReschedulingPastBookings: true,
+          hideOrganizerEmail: true,
+        },
+      },
+      ...(seatedEvent && {
+        _count: {
+          select: {
+            seatsReferences: true,
+          },
+        },
+      }),
+    } satisfies Prisma.BookingSelect;
+
+    const currentBookingsAllUsersQueryOne = this.prismaClient.booking.findMany({
+      where: {
+        ...sharedQuery,
+        userId: {
+          in: Array.from(userIdAndEmailMap.keys()),
+        },
+      },
+      select: bookingsSelect,
+    });
+
+    const currentBookingsAllUsersQueryTwo = this.prismaClient.booking.findMany({
+      where: {
+        ...sharedQuery,
+        attendees: {
+          some: {
+            email: {
+              in: Array.from(userIdAndEmailMap.values()),
+            },
+          },
+        },
+      },
+      select: bookingsSelect,
+    });
+
+    const currentBookingsAllUsersQueryThree = eventTypeId
+      ? this.prismaClient.booking.findMany({
+          where: {
+            startTime: { lte: endDate },
+            endTime: { gte: startDate },
+            eventType: {
+              id: eventTypeId,
+              requiresConfirmation: true,
+              requiresConfirmationWillBlockSlot: true,
+            },
+            status: {
+              in: [BookingStatus.PENDING],
+            },
+          },
+          select: bookingsSelect,
+        })
+      : [];
+
+    const [resultOne, resultTwo, resultThree] = await Promise.all([
+      currentBookingsAllUsersQueryOne,
+      currentBookingsAllUsersQueryTwo,
+      currentBookingsAllUsersQueryThree,
+    ]);
+    // Prevent duplicate booking records when the organizer books his own event type.
+    //
+    // *Three is about PENDING, so will never overlap
+    // with the other two, which are about ACCEPTED. But ACCEPTED affects *One & *Two
+    // and WILL result in a duplicate booking if the organizer books himself.
+    const resultTwoWithOrganizersRemoved = resultTwo.filter((booking) => {
+      if (!booking.userId) return true;
+      const organizerEmail = userIdAndEmailMap.get(booking.userId);
+      return !booking.attendees.some((attendee) => attendee.email === organizerEmail);
+    });
+
+    return [...resultOne, ...resultTwoWithOrganizersRemoved, ...resultThree];
+  }
+
+  findAllExistingBookingsForEventTypeBetween = withReporting(
+    this._findAllExistingBookingsForEventTypeBetween.bind(this),
+    "findAllExistingBookingsForEventTypeBetween"
+  );
+
+  async getAllBookingsForRoundRobin({
+    users,
+    eventTypeId,
+    startDate,
+    endDate,
+    virtualQueuesData,
+    includeNoShowInRRCalculation,
+    rrTimestampBasis,
+  }: {
+    users: { id: number; email: string }[];
+    eventTypeId: number;
+    startDate?: Date;
+    endDate?: Date;
+    virtualQueuesData: {
+      chosenRouteId: string;
+      fieldOptionData: {
+        fieldId: string;
+        selectedOptionIds: string | number | string[];
+      };
+    } | null;
+    includeNoShowInRRCalculation: boolean;
+    rrTimestampBasis: RRTimestampBasis;
+  }) {
+    const allBookings = await this.prismaClient.booking.findMany({
+      where: buildWhereClauseForActiveBookings({
+        eventTypeId,
+        startDate,
+        endDate,
+        users,
+        virtualQueuesData,
+        includeNoShowInRRCalculation,
+        rrTimestampBasis,
+      }),
+      select: {
+        id: true,
+        attendees: true,
+        userId: true,
+        createdAt: true,
+        status: true,
+        startTime: true,
+        routedFromRoutingFormReponse: true,
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    });
+
+    let queueBookings = allBookings;
+
+    if (virtualQueuesData) {
+      queueBookings = allBookings.filter((booking) => {
+        const responses = booking.routedFromRoutingFormReponse;
+        const fieldId = virtualQueuesData.fieldOptionData.fieldId;
+        const selectedOptionIds = virtualQueuesData.fieldOptionData.selectedOptionIds;
+
+        const response = responses?.response as FormResponse;
+
+        const responseValue = response[fieldId].value;
+
+        if (Array.isArray(responseValue) && Array.isArray(selectedOptionIds)) {
+          //check if all values are the same (this only support 'all in' not 'any in')
+          return (
+            responseValue.length === selectedOptionIds.length &&
+            responseValue.every((value, index) => value === selectedOptionIds[index])
+          );
+        } else {
+          return responseValue === selectedOptionIds;
+        }
+      });
+    }
+    return queueBookings;
+  }
+
+  async findBookingByUid({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: bookingMinimalSelect,
+    });
+  }
+
+  async findBookingByUidWithEventType({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      include: {
+        eventType: true,
+      },
+    });
+  }
+
+  async findByIdIncludeUserAndAttendees(bookingId: number) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        ...bookingMinimalSelect,
+        eventType: {
+          select: {
+            title: true,
+          },
+        },
+        user: {
+          select: {
+            id: true,
+            username: true,
+          },
+        },
+        attendees: {
+          select: {
+            name: true,
+            email: true,
+            phoneNumber: true,
+          },
+          // Ascending order ensures that the first attendee in the list is the booker and others are guests
+          // See why it is important https://github.com/calcom/cal.com/pull/20935
+          // TODO: Ideally we should return `booker` property directly from the booking
+          orderBy: {
+            id: "asc",
+          },
+        },
+      },
+    });
+  }
+
+  async findBookingForMeetingPage({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: {
+        ...bookingMinimalSelect,
+        uid: true,
+        description: true,
+        isRecorded: true,
+        eventType: {
+          select: {
+            id: true,
+            hideOrganizerEmail: true,
+            calVideoSettings: {
+              select: {
+                disableRecordingForGuests: true,
+                disableRecordingForOrganizer: true,
+                enableAutomaticTranscription: true,
+                enableAutomaticRecordingForOrganizer: true,
+                disableTranscriptionForGuests: true,
+                disableTranscriptionForOrganizer: true,
+                redirectUrlOnExit: true,
+              },
+            },
+          },
+        },
+        user: {
+          select: {
+            id: true,
+            timeZone: true,
+            name: true,
+            email: true,
+            username: true,
+          },
+        },
+        references: {
+          select: {
+            id: true,
+            uid: true,
+            type: true,
+            meetingUrl: true,
+            meetingPassword: true,
+          },
+          where: {
+            type: "daily_video",
+            deleted: null,
+          },
+          orderBy: {
+            id: "asc",
+          },
+        },
+      },
+    });
+  }
+
+  async findBookingForMeetingEndedPage({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: {
+        ...bookingMinimalSelect,
+        uid: true,
+        user: {
+          select: {
+            credentials: true,
+          },
+        },
+        references: {
+          select: {
+            uid: true,
+            type: true,
+            meetingUrl: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findBookingByUidAndUserId({ bookingUid, userId }: { bookingUid: string; userId: number }) {
+    return await this.prismaClient.booking.findFirst({
+      where: {
+        uid: bookingUid,
+        OR: [
+          { userId: userId },
+          {
+            eventType: {
+              hosts: {
+                some: {
+                  userId,
+                },
+              },
+            },
+          },
+          {
+            eventType: {
+              users: {
+                some: {
+                  id: userId,
+                },
+              },
+            },
+          },
+          {
+            eventType: {
+              team: {
+                members: {
+                  some: {
+                    userId,
+                    accepted: true,
+                    role: {
+                      in: ["ADMIN", "OWNER"],
+                    },
+                  },
+                },
+              },
+            },
+          },
+          {
+            eventType: {
+              parent: {
+                team: {
+                  members: {
+                    some: {
+                      userId,
+                      accepted: true,
+                      role: {
+                        in: ["ADMIN", "OWNER"],
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      },
+    });
+  }
+
+  async updateLocationById({
+    where: { id },
+    data: { location, metadata, referencesToCreate, responses, iCalSequence },
+  }: {
+    where: { id: number };
+    data: {
+      location: string;
+      metadata: Record<string, unknown>;
+      referencesToCreate: Prisma.BookingReferenceCreateInput[];
+      responses?: Record<string, unknown>;
+      iCalSequence?: number;
+    };
+  }) {
+    await this.prismaClient.booking.update({
+      where: {
+        id,
+      },
+      data: {
+        location,
+        // FIXME: metadata is untyped
+        metadata: metadata as unknown as Prisma.InputJsonValue,
+        // FIXME: responses is untyped
+        ...(responses && { responses: responses as unknown as Prisma.InputJsonValue }),
+        ...(iCalSequence !== undefined && { iCalSequence }),
+        references: {
+          create: referencesToCreate,
+        },
+      },
+    });
+  }
+
+  async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsWithCount): Promise<number>;
+
+  async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsWithoutCount): Promise<Array<Booking>>;
+
+  async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsBase) {
+    const { user, teamId, startDate, endDate, excludedUid, shouldReturnCount, includeManagedEvents } = params;
+
+    const baseWhere: Prisma.BookingWhereInput = {
+      status: BookingStatus.ACCEPTED,
+      startTime: {
+        gte: startDate,
+      },
+      endTime: {
+        lte: endDate,
+      },
+      ...(excludedUid && {
+        uid: {
+          not: excludedUid,
+        },
+      }),
+    };
+
+    const whereCollectiveRoundRobinOwner: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      userId: user.id,
+      eventType: {
+        teamId,
+      },
+    };
+
+    const whereCollectiveRoundRobinBookingsAttendee: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      attendees: {
+        some: {
+          email: user.email,
+        },
+      },
+      eventType: {
+        teamId,
+      },
+    };
+
+    const whereManagedBookings: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      userId: user.id,
+      eventType: {
+        parent: {
+          teamId,
+        },
+      },
+    };
+
+    if (shouldReturnCount) {
+      const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.count({
+        where: whereCollectiveRoundRobinOwner,
+      });
+
+      const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.count({
+        where: whereCollectiveRoundRobinBookingsAttendee,
+      });
+
+      let managedBookings = 0;
+
+      if (includeManagedEvents) {
+        managedBookings = await this.prismaClient.booking.count({
+          where: whereManagedBookings,
+        });
+      }
+
+      const totalNrOfBooking =
+        collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee + managedBookings;
+
+      return totalNrOfBooking;
+    }
+    const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.findMany({
+      where: whereCollectiveRoundRobinOwner,
+    });
+
+    const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.findMany({
+      where: whereCollectiveRoundRobinBookingsAttendee,
+    });
+
+    let managedBookings: typeof collectiveRoundRobinBookingsAttendee = [];
+
+    if (includeManagedEvents) {
+      managedBookings = await this.prismaClient.booking.findMany({
+        where: whereManagedBookings,
+      });
+    }
+
+    return [
+      ...collectiveRoundRobinBookingsOwner,
+      ...collectiveRoundRobinBookingsAttendee,
+      ...managedBookings,
+    ];
+  }
+
+  async findOriginalRescheduledBooking(uid: string, seatsEventType?: boolean) {
+    return await this.prismaClient.booking.findFirst({
+      where: {
+        uid: uid,
+        status: {
+          in: [BookingStatus.ACCEPTED, BookingStatus.CANCELLED, BookingStatus.PENDING],
+        },
+      },
+      include: {
+        attendees: {
+          select: {
+            name: true,
+            email: true,
+            locale: true,
+            timeZone: true,
+            phoneNumber: true,
+            ...(seatsEventType && { bookingSeat: true, id: true }),
+          },
+        },
+        user: {
+          select: {
+            id: true,
+            name: true,
+            username: true,
+            email: true,
+            locale: true,
+            timeZone: true,
+            timeFormat: true,
+            destinationCalendar: true,
+            credentials: {
+              select: credentialForCalendarServiceSelect,
+            },
+          },
+        },
+        destinationCalendar: true,
+        payment: true,
+        references: true,
+        workflowReminders: true,
+      },
+    });
+  }
+
+  async getAllAcceptedTeamBookingsOfUsers(params: TeamBookingsMultipleUsersParamsWithCount): Promise<number>;
+
+  async getAllAcceptedTeamBookingsOfUsers(
+    params: TeamBookingsMultipleUsersParamsWithoutCount
+  ): Promise<Array<Booking>>;
+
+  async getAllAcceptedTeamBookingsOfUsers(params: TeamBookingsMultipleUsersParamsBase) {
+    const { users, teamId, startDate, endDate, excludedUid, shouldReturnCount, includeManagedEvents } =
+      params;
+
+    const baseWhere: Prisma.BookingWhereInput = {
+      status: BookingStatus.ACCEPTED,
+      startTime: {
+        gte: startDate,
+      },
+      endTime: {
+        lte: endDate,
+      },
+      ...(excludedUid && {
+        uid: {
+          not: excludedUid,
+        },
+      }),
+    };
+
+    const userIds = users.map((user) => user.id);
+    const userEmails = users.map((user) => user.email);
+
+    const whereCollectiveRoundRobinOwner: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      userId: {
+        in: userIds,
+      },
+      eventType: {
+        teamId,
+      },
+    };
+
+    const whereCollectiveRoundRobinBookingsAttendee: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      attendees: {
+        some: {
+          email: {
+            in: userEmails,
+          },
+        },
+      },
+      eventType: {
+        teamId,
+      },
+    };
+
+    const whereManagedBookings: Prisma.BookingWhereInput = {
+      ...baseWhere,
+      userId: {
+        in: userIds,
+      },
+      eventType: {
+        parent: {
+          teamId,
+        },
+      },
+    };
+
+    if (shouldReturnCount) {
+      const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.count({
+        where: whereCollectiveRoundRobinOwner,
+      });
+
+      const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.count({
+        where: whereCollectiveRoundRobinBookingsAttendee,
+      });
+
+      let managedBookings = 0;
+
+      if (includeManagedEvents) {
+        managedBookings = await this.prismaClient.booking.count({
+          where: whereManagedBookings,
+        });
+      }
+
+      const totalNrOfBooking =
+        collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee + managedBookings;
+
+      return totalNrOfBooking;
+    }
+
+    const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.findMany({
+      where: whereCollectiveRoundRobinOwner,
+    });
+
+    const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.findMany({
+      where: whereCollectiveRoundRobinBookingsAttendee,
+    });
+
+    let managedBookings: typeof collectiveRoundRobinBookingsAttendee = [];
+
+    if (includeManagedEvents) {
+      managedBookings = await this.prismaClient.booking.findMany({
+        where: whereManagedBookings,
+      });
+    }
+
+    return [
+      ...collectiveRoundRobinBookingsOwner,
+      ...collectiveRoundRobinBookingsAttendee,
+      ...managedBookings,
+    ];
+  }
+
+  async getValidBookingFromEventTypeForAttendee({
+    eventTypeId,
+    bookerEmail,
+    bookerPhoneNumber,
+    startTime,
+    filterForUnconfirmed,
+  }: {
+    eventTypeId: number;
+    bookerEmail?: string;
+    bookerPhoneNumber?: string;
+    startTime: Date;
+    filterForUnconfirmed?: boolean;
+  }) {
+    return await this.prismaClient.booking.findFirst({
+      where: {
+        eventTypeId,
+        attendees: {
+          some: {
+            email: bookerEmail,
+            phoneNumber: bookerPhoneNumber,
+          },
+        },
+        startTime,
+        status: filterForUnconfirmed ? BookingStatus.PENDING : BookingStatus.ACCEPTED,
+      },
+      include: {
+        attendees: true,
+        references: true,
+        user: true,
+        payment: true,
+      },
+    });
+  }
+
+  async countBookingsByEventTypeAndDateRange({
+    eventTypeId,
+    startDate,
+    endDate,
+    excludedUid,
+  }: {
+    eventTypeId: number;
+    startDate: Date;
+    endDate: Date;
+    excludedUid?: string;
+  }) {
+    return await this.prismaClient.booking.count({
+      where: {
+        status: BookingStatus.ACCEPTED,
+        eventTypeId,
+        startTime: {
+          gte: startDate,
+        },
+        endTime: {
+          lte: endDate,
+        },
+        uid: {
+          not: excludedUid,
+        },
+      },
+    });
+  }
+
+  async findAcceptedBookingByEventTypeId({
+    eventTypeId,
+    dateFrom,
+    dateTo,
+  }: {
+    eventTypeId?: number;
+    dateFrom: string;
+    dateTo: string;
+  }) {
+    return this.prismaClient.booking.findMany({
+      where: {
+        eventTypeId,
+        startTime: {
+          gte: dateFrom,
+          lte: dateTo,
+        },
+        status: BookingStatus.ACCEPTED,
+      },
+      select: {
+        uid: true,
+        startTime: true,
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+      },
+    });
+  }
+
+  async getTotalBookingDuration({
+    eventId,
+    startDate,
+    endDate,
+    rescheduleUid,
+  }: {
+    eventId: number;
+    startDate: Date;
+    endDate: Date;
+    rescheduleUid?: string;
+  }) {
+    let totalBookingTime;
+
+    if (rescheduleUid) {
+      [totalBookingTime] = await this.prismaClient.$queryRaw<[{ totalMinutes: number | null }]>`
+      SELECT SUM(EXTRACT(EPOCH FROM ("endTime" - "startTime")) / 60) as "totalMinutes"
+      FROM "Booking"
+      WHERE "status" = 'accepted'
+        AND "eventTypeId" = ${eventId}
+        AND "startTime" >= ${startDate}
+        AND "endTime" <= ${endDate}
+        AND "uid" != ${rescheduleUid};
+    `;
+    } else {
+      [totalBookingTime] = await this.prismaClient.$queryRaw<[{ totalMinutes: number | null }]>`
+      SELECT SUM(EXTRACT(EPOCH FROM ("endTime" - "startTime")) / 60) as "totalMinutes"
+      FROM "Booking"
+      WHERE "status" = 'accepted'
+        AND "eventTypeId" = ${eventId}
+        AND "startTime" >= ${startDate}
+        AND "endTime" <= ${endDate};
+    `;
+    }
+    return totalBookingTime.totalMinutes ?? 0;
+  }
+
+  async findOriginalRescheduledBookingUserId({ rescheduleUid }: { rescheduleUid: string }) {
+    return await this.prismaClient.booking.findFirst({
+      where: {
+        uid: rescheduleUid,
+        status: {
+          in: [BookingStatus.ACCEPTED, BookingStatus.CANCELLED, BookingStatus.PENDING],
+        },
+      },
+      select: {
+        userId: true,
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+      },
+    });
+  }
+
+  async getBookingForPaymentProcessing(bookingId: number) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        id: true,
+        uid: true,
+        title: true,
+        startTime: true,
+        endTime: true,
+        userPrimaryEmail: true,
+        status: true,
+        eventTypeId: true,
+        userId: true,
+        attendees: {
+          select: {
+            name: true,
+            email: true,
+            timeZone: true,
+            locale: true,
+          },
+        },
+        eventType: {
+          select: {
+            title: true,
+            hideOrganizerEmail: true,
+            teamId: true,
+            metadata: true,
+          },
+        },
+        payment: {
+          select: {
+            id: true,
+            amount: true,
+            currency: true,
+            paymentOption: true,
+            appId: true,
+            success: true,
+            data: true,
+          },
+        },
+      },
+    });
+  }
+}
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index fc0ff6b38b28d2..2239161e33aee3 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -42,7 +42,7 @@ describe("reportBookingHandler", () => {
   };
 
   const mockBookingRepo = {
-    findByIdIncludeReport: vi.fn(),
+    findByUidIncludeReport: vi.fn(),
     getActiveRecurringBookingsFromDate: vi.fn(),
   };
 
@@ -94,7 +94,7 @@ describe("reportBookingHandler", () => {
 
     it("should throw NOT_FOUND when booking doesn't exist", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue(null);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue(null);
 
       await expect(
         reportBookingHandler({
@@ -114,7 +114,7 @@ describe("reportBookingHandler", () => {
   describe("duplicate report prevention", () => {
     it("should throw BAD_REQUEST when booking already has a report", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         report: { id: "existing-report" },
       });
@@ -137,7 +137,7 @@ describe("reportBookingHandler", () => {
   describe("successful report creation", () => {
     it("should successfully create a single booking report and auto-cancel upcoming booking", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
       });
@@ -173,7 +173,7 @@ describe("reportBookingHandler", () => {
 
     it("should create report without description for past booking", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000), // Yesterday
       });
@@ -202,7 +202,7 @@ describe("reportBookingHandler", () => {
   describe("cancellation integration", () => {
     it("should cancel booking when cancelBooking is true", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000), // Tomorrow
       });
@@ -236,7 +236,7 @@ describe("reportBookingHandler", () => {
 
     it("should not cancel booking if it's in the past", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() - 86400000),
       });
@@ -255,7 +255,7 @@ describe("reportBookingHandler", () => {
 
     it("should handle cancellation failure gracefully", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),
       });
@@ -276,7 +276,7 @@ describe("reportBookingHandler", () => {
 
     it("should use cancelSubsequentBookings for recurring events", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         recurringEventId: "recurring-123",
         startTime: new Date(Date.now() + 86400000),
@@ -311,7 +311,7 @@ describe("reportBookingHandler", () => {
 
     it("should pass seatReferenceUid for seated events", async () => {
       mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
-      mockBookingRepo.findByIdIncludeReport.mockResolvedValue({
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
         ...mockBooking,
         startTime: new Date(Date.now() + 86400000),
         seatsReferences: [
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 71ca6d0efaf855..431749dc5d1bff 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -37,7 +37,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
     throw new TRPCError({ code: "FORBIDDEN", message: "You don't have access to this booking" });
   }
 
-  const booking = await bookingRepo.findByIdIncludeReport({ bookingUid });
+  const booking = await bookingRepo.findByUidIncludeReport({ bookingUid });
 
   if (!booking) {
     throw new TRPCError({ code: "NOT_FOUND", message: "Booking not found" });

From 8dcc7504d7469fc75ec141b236db6ddaf1e176ff Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 21:22:08 +0530
Subject: [PATCH 21/54] chor: remove

---
 packages/lib/server/repository/booking.ts | 1161 ---------------------
 1 file changed, 1161 deletions(-)
 delete mode 100644 packages/lib/server/repository/booking.ts

diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts
deleted file mode 100644
index b24b065a50a9f0..00000000000000
--- a/packages/lib/server/repository/booking.ts
+++ /dev/null
@@ -1,1161 +0,0 @@
-import { withReporting } from "@calcom/lib/sentryWrapper";
-import type { PrismaClient } from "@calcom/prisma";
-import type { Prisma } from "@calcom/prisma/client";
-import type { Booking } from "@calcom/prisma/client";
-import { RRTimestampBasis, BookingStatus } from "@calcom/prisma/enums";
-import { bookingMinimalSelect } from "@calcom/prisma/selects/booking";
-import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
-
-import { UserRepository } from "./user";
-
-export type FormResponse = Record<
-  // Field ID
-  string,
-  {
-    value: number | string | string[];
-    label: string;
-    identifier?: string;
-  }
->;
-
-type TeamBookingsParamsBase = {
-  user: { id: number; email: string };
-  teamId: number;
-  startDate: Date;
-  endDate: Date;
-  excludedUid?: string | null;
-  includeManagedEvents: boolean;
-  shouldReturnCount?: boolean;
-};
-
-type TeamBookingsMultipleUsersParamsBase = {
-  users: { id: number; email: string }[];
-  teamId: number;
-  startDate: Date;
-  endDate: Date;
-  excludedUid?: string | null;
-  includeManagedEvents: boolean;
-  shouldReturnCount?: boolean;
-};
-
-type TeamBookingsMultipleUsersParamsWithCount = TeamBookingsMultipleUsersParamsBase & {
-  shouldReturnCount: true;
-};
-
-type TeamBookingsMultipleUsersParamsWithoutCount = TeamBookingsMultipleUsersParamsBase;
-
-type TeamBookingsParamsWithCount = TeamBookingsParamsBase & {
-  shouldReturnCount: true;
-};
-
-type TeamBookingsParamsWithoutCount = TeamBookingsParamsBase;
-
-const buildWhereClauseForActiveBookings = ({
-  eventTypeId,
-  startDate,
-  endDate,
-  users,
-  virtualQueuesData,
-  includeNoShowInRRCalculation = false,
-  rrTimestampBasis,
-}: {
-  eventTypeId: number;
-  startDate?: Date;
-  endDate?: Date;
-  users: { id: number; email: string }[];
-  virtualQueuesData: {
-    chosenRouteId: string;
-    fieldOptionData: {
-      fieldId: string;
-      selectedOptionIds: string | number | string[];
-    };
-  } | null;
-  includeNoShowInRRCalculation: boolean;
-  rrTimestampBasis: RRTimestampBasis;
-}): Prisma.BookingWhereInput => ({
-  OR: [
-    {
-      userId: {
-        in: users.map((user) => user.id),
-      },
-      ...(!includeNoShowInRRCalculation
-        ? {
-            OR: [{ noShowHost: false }, { noShowHost: null }],
-          }
-        : {}),
-    },
-    {
-      attendees: {
-        some: {
-          email: {
-            in: users.map((user) => user.email),
-          },
-        },
-      },
-    },
-  ],
-  ...(!includeNoShowInRRCalculation ? { attendees: { some: { noShow: false } } } : {}),
-  status: BookingStatus.ACCEPTED,
-  eventTypeId,
-  ...(startDate || endDate
-    ? rrTimestampBasis === RRTimestampBasis.CREATED_AT
-      ? {
-          createdAt: {
-            ...(startDate ? { gte: startDate } : {}),
-            ...(endDate ? { lte: endDate } : {}),
-          },
-        }
-      : {
-          startTime: {
-            ...(startDate ? { gte: startDate } : {}),
-            ...(endDate ? { lte: endDate } : {}),
-          },
-        }
-    : {}),
-  ...(virtualQueuesData
-    ? {
-        routedFromRoutingFormReponse: {
-          chosenRouteId: virtualQueuesData.chosenRouteId,
-        },
-      }
-    : {}),
-});
-
-export class BookingRepository {
-  constructor(private prismaClient: PrismaClient) {}
-
-  async getBookingAttendees(bookingId: number) {
-    return await this.prismaClient.attendee.findMany({
-      where: {
-        bookingId,
-      },
-    });
-  }
-
-  async getBookingWithEventTypeTeamId({ bookingId }: { bookingId: number }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        id: bookingId,
-      },
-      select: {
-        userId: true,
-        eventType: {
-          select: {
-            teamId: true,
-          },
-        },
-      },
-    });
-  }
-
-  async findByUidIncludeEventType({ bookingUid }: { bookingUid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid: bookingUid,
-      },
-      select: {
-        userId: true,
-        user: {
-          select: {
-            id: true,
-            email: true,
-          },
-        },
-        attendees: {
-          select: {
-            email: true,
-          },
-        },
-        eventType: {
-          select: {
-            teamId: true,
-            hosts: {
-              select: {
-                userId: true,
-                user: {
-                  select: {
-                    email: true,
-                  },
-                },
-              },
-            },
-            users: {
-              select: {
-                id: true,
-                email: true,
-              },
-            },
-          },
-        },
-      },
-    });
-  }
-
-  /** Determines if the user is the organizer, team admin, or org admin that the booking was created under */
-  async doesUserIdHaveAccessToBooking({ userId, bookingId }: { userId: number; bookingId: number }) {
-    const booking = await this.prismaClient.booking.findUnique({
-      where: {
-        id: bookingId,
-      },
-      select: {
-        userId: true,
-        eventType: {
-          select: {
-            teamId: true,
-          },
-        },
-      },
-    });
-
-    if (!booking) return false;
-
-    if (userId === booking.userId) return true;
-
-    // If the booking doesn't belong to the user and there's no team then return early
-    if (!booking.eventType || !booking.eventType.teamId) return false;
-
-    // TODO add checks for team and org
-    const userRepo = new UserRepository(this.prismaClient);
-    const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
-      userId,
-      teamId: booking.eventType.teamId,
-    });
-
-    return isAdminOrUser;
-  }
-
-  async findFirstBookingByReschedule({ originalBookingUid }: { originalBookingUid: string }) {
-    return await this.prismaClient.booking.findFirst({
-      where: {
-        fromReschedule: originalBookingUid,
-      },
-      select: {
-        uid: true,
-      },
-    });
-  }
-
-  async findReschedulerByUid({ uid }: { uid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid,
-      },
-      select: {
-        rescheduledBy: true,
-        uid: true,
-      },
-    });
-  }
-
-  async findByUidIncludeReport({ bookingUid }: { bookingUid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid: bookingUid,
-      },
-      select: {
-        id: true,
-        uid: true,
-        startTime: true,
-        status: true,
-        recurringEventId: true,
-        attendees: {
-          select: {
-            email: true,
-          },
-        },
-        seatsReferences: {
-          select: {
-            referenceUid: true,
-            attendee: {
-              select: {
-                email: true,
-              },
-            },
-          },
-        },
-        report: {
-          select: {
-            id: true,
-          },
-        },
-      },
-    });
-  }
-
-  async getActiveRecurringBookingsFromDate({
-    recurringEventId,
-    fromDate,
-  }: {
-    recurringEventId: string;
-    fromDate: Date;
-  }) {
-    return await this.prismaClient.booking.findMany({
-      where: {
-        recurringEventId,
-        startTime: { gte: fromDate },
-        status: { in: [BookingStatus.ACCEPTED, BookingStatus.PENDING] },
-      },
-      select: { id: true, uid: true },
-      orderBy: { startTime: "asc" },
-    });
-  }
-
-  private async _findAllExistingBookingsForEventTypeBetween({
-    eventTypeId,
-    seatedEvent = false,
-    startDate,
-    endDate,
-    userIdAndEmailMap,
-  }: {
-    startDate: Date;
-    endDate: Date;
-    eventTypeId?: number | null;
-    seatedEvent?: boolean;
-    userIdAndEmailMap: Map<number, string>;
-  }) {
-    const sharedQuery = {
-      startTime: { lte: endDate },
-      endTime: { gte: startDate },
-      status: {
-        in: [BookingStatus.ACCEPTED],
-      },
-    };
-
-    const bookingsSelect = {
-      id: true,
-      uid: true,
-      userId: true,
-      startTime: true,
-      endTime: true,
-      title: true,
-      attendees: true,
-      eventType: {
-        select: {
-          id: true,
-          onlyShowFirstAvailableSlot: true,
-          afterEventBuffer: true,
-          beforeEventBuffer: true,
-          seatsPerTimeSlot: true,
-          requiresConfirmationWillBlockSlot: true,
-          requiresConfirmation: true,
-          allowReschedulingPastBookings: true,
-          hideOrganizerEmail: true,
-        },
-      },
-      ...(seatedEvent && {
-        _count: {
-          select: {
-            seatsReferences: true,
-          },
-        },
-      }),
-    } satisfies Prisma.BookingSelect;
-
-    const currentBookingsAllUsersQueryOne = this.prismaClient.booking.findMany({
-      where: {
-        ...sharedQuery,
-        userId: {
-          in: Array.from(userIdAndEmailMap.keys()),
-        },
-      },
-      select: bookingsSelect,
-    });
-
-    const currentBookingsAllUsersQueryTwo = this.prismaClient.booking.findMany({
-      where: {
-        ...sharedQuery,
-        attendees: {
-          some: {
-            email: {
-              in: Array.from(userIdAndEmailMap.values()),
-            },
-          },
-        },
-      },
-      select: bookingsSelect,
-    });
-
-    const currentBookingsAllUsersQueryThree = eventTypeId
-      ? this.prismaClient.booking.findMany({
-          where: {
-            startTime: { lte: endDate },
-            endTime: { gte: startDate },
-            eventType: {
-              id: eventTypeId,
-              requiresConfirmation: true,
-              requiresConfirmationWillBlockSlot: true,
-            },
-            status: {
-              in: [BookingStatus.PENDING],
-            },
-          },
-          select: bookingsSelect,
-        })
-      : [];
-
-    const [resultOne, resultTwo, resultThree] = await Promise.all([
-      currentBookingsAllUsersQueryOne,
-      currentBookingsAllUsersQueryTwo,
-      currentBookingsAllUsersQueryThree,
-    ]);
-    // Prevent duplicate booking records when the organizer books his own event type.
-    //
-    // *Three is about PENDING, so will never overlap
-    // with the other two, which are about ACCEPTED. But ACCEPTED affects *One & *Two
-    // and WILL result in a duplicate booking if the organizer books himself.
-    const resultTwoWithOrganizersRemoved = resultTwo.filter((booking) => {
-      if (!booking.userId) return true;
-      const organizerEmail = userIdAndEmailMap.get(booking.userId);
-      return !booking.attendees.some((attendee) => attendee.email === organizerEmail);
-    });
-
-    return [...resultOne, ...resultTwoWithOrganizersRemoved, ...resultThree];
-  }
-
-  findAllExistingBookingsForEventTypeBetween = withReporting(
-    this._findAllExistingBookingsForEventTypeBetween.bind(this),
-    "findAllExistingBookingsForEventTypeBetween"
-  );
-
-  async getAllBookingsForRoundRobin({
-    users,
-    eventTypeId,
-    startDate,
-    endDate,
-    virtualQueuesData,
-    includeNoShowInRRCalculation,
-    rrTimestampBasis,
-  }: {
-    users: { id: number; email: string }[];
-    eventTypeId: number;
-    startDate?: Date;
-    endDate?: Date;
-    virtualQueuesData: {
-      chosenRouteId: string;
-      fieldOptionData: {
-        fieldId: string;
-        selectedOptionIds: string | number | string[];
-      };
-    } | null;
-    includeNoShowInRRCalculation: boolean;
-    rrTimestampBasis: RRTimestampBasis;
-  }) {
-    const allBookings = await this.prismaClient.booking.findMany({
-      where: buildWhereClauseForActiveBookings({
-        eventTypeId,
-        startDate,
-        endDate,
-        users,
-        virtualQueuesData,
-        includeNoShowInRRCalculation,
-        rrTimestampBasis,
-      }),
-      select: {
-        id: true,
-        attendees: true,
-        userId: true,
-        createdAt: true,
-        status: true,
-        startTime: true,
-        routedFromRoutingFormReponse: true,
-      },
-      orderBy: {
-        createdAt: "desc",
-      },
-    });
-
-    let queueBookings = allBookings;
-
-    if (virtualQueuesData) {
-      queueBookings = allBookings.filter((booking) => {
-        const responses = booking.routedFromRoutingFormReponse;
-        const fieldId = virtualQueuesData.fieldOptionData.fieldId;
-        const selectedOptionIds = virtualQueuesData.fieldOptionData.selectedOptionIds;
-
-        const response = responses?.response as FormResponse;
-
-        const responseValue = response[fieldId].value;
-
-        if (Array.isArray(responseValue) && Array.isArray(selectedOptionIds)) {
-          //check if all values are the same (this only support 'all in' not 'any in')
-          return (
-            responseValue.length === selectedOptionIds.length &&
-            responseValue.every((value, index) => value === selectedOptionIds[index])
-          );
-        } else {
-          return responseValue === selectedOptionIds;
-        }
-      });
-    }
-    return queueBookings;
-  }
-
-  async findBookingByUid({ bookingUid }: { bookingUid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid: bookingUid,
-      },
-      select: bookingMinimalSelect,
-    });
-  }
-
-  async findBookingByUidWithEventType({ bookingUid }: { bookingUid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid: bookingUid,
-      },
-      include: {
-        eventType: true,
-      },
-    });
-  }
-
-  async findByIdIncludeUserAndAttendees(bookingId: number) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        id: bookingId,
-      },
-      select: {
-        ...bookingMinimalSelect,
-        eventType: {
-          select: {
-            title: true,
-          },
-        },
-        user: {
-          select: {
-            id: true,
-            username: true,
-          },
-        },
-        attendees: {
-          select: {
-            name: true,
-            email: true,
-            phoneNumber: true,
-          },
-          // Ascending order ensures that the first attendee in the list is the booker and others are guests
-          // See why it is important https://github.com/calcom/cal.com/pull/20935
-          // TODO: Ideally we should return `booker` property directly from the booking
-          orderBy: {
-            id: "asc",
-          },
-        },
-      },
-    });
-  }
-
-  async findBookingForMeetingPage({ bookingUid }: { bookingUid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid: bookingUid,
-      },
-      select: {
-        ...bookingMinimalSelect,
-        uid: true,
-        description: true,
-        isRecorded: true,
-        eventType: {
-          select: {
-            id: true,
-            hideOrganizerEmail: true,
-            calVideoSettings: {
-              select: {
-                disableRecordingForGuests: true,
-                disableRecordingForOrganizer: true,
-                enableAutomaticTranscription: true,
-                enableAutomaticRecordingForOrganizer: true,
-                disableTranscriptionForGuests: true,
-                disableTranscriptionForOrganizer: true,
-                redirectUrlOnExit: true,
-              },
-            },
-          },
-        },
-        user: {
-          select: {
-            id: true,
-            timeZone: true,
-            name: true,
-            email: true,
-            username: true,
-          },
-        },
-        references: {
-          select: {
-            id: true,
-            uid: true,
-            type: true,
-            meetingUrl: true,
-            meetingPassword: true,
-          },
-          where: {
-            type: "daily_video",
-            deleted: null,
-          },
-          orderBy: {
-            id: "asc",
-          },
-        },
-      },
-    });
-  }
-
-  async findBookingForMeetingEndedPage({ bookingUid }: { bookingUid: string }) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        uid: bookingUid,
-      },
-      select: {
-        ...bookingMinimalSelect,
-        uid: true,
-        user: {
-          select: {
-            credentials: true,
-          },
-        },
-        references: {
-          select: {
-            uid: true,
-            type: true,
-            meetingUrl: true,
-          },
-        },
-      },
-    });
-  }
-
-  async findBookingByUidAndUserId({ bookingUid, userId }: { bookingUid: string; userId: number }) {
-    return await this.prismaClient.booking.findFirst({
-      where: {
-        uid: bookingUid,
-        OR: [
-          { userId: userId },
-          {
-            eventType: {
-              hosts: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          },
-          {
-            eventType: {
-              users: {
-                some: {
-                  id: userId,
-                },
-              },
-            },
-          },
-          {
-            eventType: {
-              team: {
-                members: {
-                  some: {
-                    userId,
-                    accepted: true,
-                    role: {
-                      in: ["ADMIN", "OWNER"],
-                    },
-                  },
-                },
-              },
-            },
-          },
-          {
-            eventType: {
-              parent: {
-                team: {
-                  members: {
-                    some: {
-                      userId,
-                      accepted: true,
-                      role: {
-                        in: ["ADMIN", "OWNER"],
-                      },
-                    },
-                  },
-                },
-              },
-            },
-          },
-        ],
-      },
-    });
-  }
-
-  async updateLocationById({
-    where: { id },
-    data: { location, metadata, referencesToCreate, responses, iCalSequence },
-  }: {
-    where: { id: number };
-    data: {
-      location: string;
-      metadata: Record<string, unknown>;
-      referencesToCreate: Prisma.BookingReferenceCreateInput[];
-      responses?: Record<string, unknown>;
-      iCalSequence?: number;
-    };
-  }) {
-    await this.prismaClient.booking.update({
-      where: {
-        id,
-      },
-      data: {
-        location,
-        // FIXME: metadata is untyped
-        metadata: metadata as unknown as Prisma.InputJsonValue,
-        // FIXME: responses is untyped
-        ...(responses && { responses: responses as unknown as Prisma.InputJsonValue }),
-        ...(iCalSequence !== undefined && { iCalSequence }),
-        references: {
-          create: referencesToCreate,
-        },
-      },
-    });
-  }
-
-  async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsWithCount): Promise<number>;
-
-  async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsWithoutCount): Promise<Array<Booking>>;
-
-  async getAllAcceptedTeamBookingsOfUser(params: TeamBookingsParamsBase) {
-    const { user, teamId, startDate, endDate, excludedUid, shouldReturnCount, includeManagedEvents } = params;
-
-    const baseWhere: Prisma.BookingWhereInput = {
-      status: BookingStatus.ACCEPTED,
-      startTime: {
-        gte: startDate,
-      },
-      endTime: {
-        lte: endDate,
-      },
-      ...(excludedUid && {
-        uid: {
-          not: excludedUid,
-        },
-      }),
-    };
-
-    const whereCollectiveRoundRobinOwner: Prisma.BookingWhereInput = {
-      ...baseWhere,
-      userId: user.id,
-      eventType: {
-        teamId,
-      },
-    };
-
-    const whereCollectiveRoundRobinBookingsAttendee: Prisma.BookingWhereInput = {
-      ...baseWhere,
-      attendees: {
-        some: {
-          email: user.email,
-        },
-      },
-      eventType: {
-        teamId,
-      },
-    };
-
-    const whereManagedBookings: Prisma.BookingWhereInput = {
-      ...baseWhere,
-      userId: user.id,
-      eventType: {
-        parent: {
-          teamId,
-        },
-      },
-    };
-
-    if (shouldReturnCount) {
-      const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.count({
-        where: whereCollectiveRoundRobinOwner,
-      });
-
-      const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.count({
-        where: whereCollectiveRoundRobinBookingsAttendee,
-      });
-
-      let managedBookings = 0;
-
-      if (includeManagedEvents) {
-        managedBookings = await this.prismaClient.booking.count({
-          where: whereManagedBookings,
-        });
-      }
-
-      const totalNrOfBooking =
-        collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee + managedBookings;
-
-      return totalNrOfBooking;
-    }
-    const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.findMany({
-      where: whereCollectiveRoundRobinOwner,
-    });
-
-    const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.findMany({
-      where: whereCollectiveRoundRobinBookingsAttendee,
-    });
-
-    let managedBookings: typeof collectiveRoundRobinBookingsAttendee = [];
-
-    if (includeManagedEvents) {
-      managedBookings = await this.prismaClient.booking.findMany({
-        where: whereManagedBookings,
-      });
-    }
-
-    return [
-      ...collectiveRoundRobinBookingsOwner,
-      ...collectiveRoundRobinBookingsAttendee,
-      ...managedBookings,
-    ];
-  }
-
-  async findOriginalRescheduledBooking(uid: string, seatsEventType?: boolean) {
-    return await this.prismaClient.booking.findFirst({
-      where: {
-        uid: uid,
-        status: {
-          in: [BookingStatus.ACCEPTED, BookingStatus.CANCELLED, BookingStatus.PENDING],
-        },
-      },
-      include: {
-        attendees: {
-          select: {
-            name: true,
-            email: true,
-            locale: true,
-            timeZone: true,
-            phoneNumber: true,
-            ...(seatsEventType && { bookingSeat: true, id: true }),
-          },
-        },
-        user: {
-          select: {
-            id: true,
-            name: true,
-            username: true,
-            email: true,
-            locale: true,
-            timeZone: true,
-            timeFormat: true,
-            destinationCalendar: true,
-            credentials: {
-              select: credentialForCalendarServiceSelect,
-            },
-          },
-        },
-        destinationCalendar: true,
-        payment: true,
-        references: true,
-        workflowReminders: true,
-      },
-    });
-  }
-
-  async getAllAcceptedTeamBookingsOfUsers(params: TeamBookingsMultipleUsersParamsWithCount): Promise<number>;
-
-  async getAllAcceptedTeamBookingsOfUsers(
-    params: TeamBookingsMultipleUsersParamsWithoutCount
-  ): Promise<Array<Booking>>;
-
-  async getAllAcceptedTeamBookingsOfUsers(params: TeamBookingsMultipleUsersParamsBase) {
-    const { users, teamId, startDate, endDate, excludedUid, shouldReturnCount, includeManagedEvents } =
-      params;
-
-    const baseWhere: Prisma.BookingWhereInput = {
-      status: BookingStatus.ACCEPTED,
-      startTime: {
-        gte: startDate,
-      },
-      endTime: {
-        lte: endDate,
-      },
-      ...(excludedUid && {
-        uid: {
-          not: excludedUid,
-        },
-      }),
-    };
-
-    const userIds = users.map((user) => user.id);
-    const userEmails = users.map((user) => user.email);
-
-    const whereCollectiveRoundRobinOwner: Prisma.BookingWhereInput = {
-      ...baseWhere,
-      userId: {
-        in: userIds,
-      },
-      eventType: {
-        teamId,
-      },
-    };
-
-    const whereCollectiveRoundRobinBookingsAttendee: Prisma.BookingWhereInput = {
-      ...baseWhere,
-      attendees: {
-        some: {
-          email: {
-            in: userEmails,
-          },
-        },
-      },
-      eventType: {
-        teamId,
-      },
-    };
-
-    const whereManagedBookings: Prisma.BookingWhereInput = {
-      ...baseWhere,
-      userId: {
-        in: userIds,
-      },
-      eventType: {
-        parent: {
-          teamId,
-        },
-      },
-    };
-
-    if (shouldReturnCount) {
-      const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.count({
-        where: whereCollectiveRoundRobinOwner,
-      });
-
-      const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.count({
-        where: whereCollectiveRoundRobinBookingsAttendee,
-      });
-
-      let managedBookings = 0;
-
-      if (includeManagedEvents) {
-        managedBookings = await this.prismaClient.booking.count({
-          where: whereManagedBookings,
-        });
-      }
-
-      const totalNrOfBooking =
-        collectiveRoundRobinBookingsOwner + collectiveRoundRobinBookingsAttendee + managedBookings;
-
-      return totalNrOfBooking;
-    }
-
-    const collectiveRoundRobinBookingsOwner = await this.prismaClient.booking.findMany({
-      where: whereCollectiveRoundRobinOwner,
-    });
-
-    const collectiveRoundRobinBookingsAttendee = await this.prismaClient.booking.findMany({
-      where: whereCollectiveRoundRobinBookingsAttendee,
-    });
-
-    let managedBookings: typeof collectiveRoundRobinBookingsAttendee = [];
-
-    if (includeManagedEvents) {
-      managedBookings = await this.prismaClient.booking.findMany({
-        where: whereManagedBookings,
-      });
-    }
-
-    return [
-      ...collectiveRoundRobinBookingsOwner,
-      ...collectiveRoundRobinBookingsAttendee,
-      ...managedBookings,
-    ];
-  }
-
-  async getValidBookingFromEventTypeForAttendee({
-    eventTypeId,
-    bookerEmail,
-    bookerPhoneNumber,
-    startTime,
-    filterForUnconfirmed,
-  }: {
-    eventTypeId: number;
-    bookerEmail?: string;
-    bookerPhoneNumber?: string;
-    startTime: Date;
-    filterForUnconfirmed?: boolean;
-  }) {
-    return await this.prismaClient.booking.findFirst({
-      where: {
-        eventTypeId,
-        attendees: {
-          some: {
-            email: bookerEmail,
-            phoneNumber: bookerPhoneNumber,
-          },
-        },
-        startTime,
-        status: filterForUnconfirmed ? BookingStatus.PENDING : BookingStatus.ACCEPTED,
-      },
-      include: {
-        attendees: true,
-        references: true,
-        user: true,
-        payment: true,
-      },
-    });
-  }
-
-  async countBookingsByEventTypeAndDateRange({
-    eventTypeId,
-    startDate,
-    endDate,
-    excludedUid,
-  }: {
-    eventTypeId: number;
-    startDate: Date;
-    endDate: Date;
-    excludedUid?: string;
-  }) {
-    return await this.prismaClient.booking.count({
-      where: {
-        status: BookingStatus.ACCEPTED,
-        eventTypeId,
-        startTime: {
-          gte: startDate,
-        },
-        endTime: {
-          lte: endDate,
-        },
-        uid: {
-          not: excludedUid,
-        },
-      },
-    });
-  }
-
-  async findAcceptedBookingByEventTypeId({
-    eventTypeId,
-    dateFrom,
-    dateTo,
-  }: {
-    eventTypeId?: number;
-    dateFrom: string;
-    dateTo: string;
-  }) {
-    return this.prismaClient.booking.findMany({
-      where: {
-        eventTypeId,
-        startTime: {
-          gte: dateFrom,
-          lte: dateTo,
-        },
-        status: BookingStatus.ACCEPTED,
-      },
-      select: {
-        uid: true,
-        startTime: true,
-        attendees: {
-          select: {
-            email: true,
-          },
-        },
-      },
-    });
-  }
-
-  async getTotalBookingDuration({
-    eventId,
-    startDate,
-    endDate,
-    rescheduleUid,
-  }: {
-    eventId: number;
-    startDate: Date;
-    endDate: Date;
-    rescheduleUid?: string;
-  }) {
-    let totalBookingTime;
-
-    if (rescheduleUid) {
-      [totalBookingTime] = await this.prismaClient.$queryRaw<[{ totalMinutes: number | null }]>`
-      SELECT SUM(EXTRACT(EPOCH FROM ("endTime" - "startTime")) / 60) as "totalMinutes"
-      FROM "Booking"
-      WHERE "status" = 'accepted'
-        AND "eventTypeId" = ${eventId}
-        AND "startTime" >= ${startDate}
-        AND "endTime" <= ${endDate}
-        AND "uid" != ${rescheduleUid};
-    `;
-    } else {
-      [totalBookingTime] = await this.prismaClient.$queryRaw<[{ totalMinutes: number | null }]>`
-      SELECT SUM(EXTRACT(EPOCH FROM ("endTime" - "startTime")) / 60) as "totalMinutes"
-      FROM "Booking"
-      WHERE "status" = 'accepted'
-        AND "eventTypeId" = ${eventId}
-        AND "startTime" >= ${startDate}
-        AND "endTime" <= ${endDate};
-    `;
-    }
-    return totalBookingTime.totalMinutes ?? 0;
-  }
-
-  async findOriginalRescheduledBookingUserId({ rescheduleUid }: { rescheduleUid: string }) {
-    return await this.prismaClient.booking.findFirst({
-      where: {
-        uid: rescheduleUid,
-        status: {
-          in: [BookingStatus.ACCEPTED, BookingStatus.CANCELLED, BookingStatus.PENDING],
-        },
-      },
-      select: {
-        userId: true,
-        attendees: {
-          select: {
-            email: true,
-          },
-        },
-      },
-    });
-  }
-
-  async getBookingForPaymentProcessing(bookingId: number) {
-    return await this.prismaClient.booking.findUnique({
-      where: {
-        id: bookingId,
-      },
-      select: {
-        id: true,
-        uid: true,
-        title: true,
-        startTime: true,
-        endTime: true,
-        userPrimaryEmail: true,
-        status: true,
-        eventTypeId: true,
-        userId: true,
-        attendees: {
-          select: {
-            name: true,
-            email: true,
-            timeZone: true,
-            locale: true,
-          },
-        },
-        eventType: {
-          select: {
-            title: true,
-            hideOrganizerEmail: true,
-            teamId: true,
-            metadata: true,
-          },
-        },
-        payment: {
-          select: {
-            id: true,
-            amount: true,
-            currency: true,
-            paymentOption: true,
-            appId: true,
-            success: true,
-            data: true,
-          },
-        },
-      },
-    });
-  }
-}

From 2a96d1d963e25d65ad1058c3d037ce74a12f8a45 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Mon, 13 Oct 2025 17:59:50 +0200
Subject: [PATCH 22/54] fix UserRepository import

---
 packages/features/bookings/services/BookingAccessService.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/features/bookings/services/BookingAccessService.ts b/packages/features/bookings/services/BookingAccessService.ts
index a1ed2357bda1d7..779435dfb40419 100644
--- a/packages/features/bookings/services/BookingAccessService.ts
+++ b/packages/features/bookings/services/BookingAccessService.ts
@@ -1,7 +1,7 @@
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 
 import { BookingRepository } from "../repositories/BookingRepository";
-import { UserRepository } from "@calcom/features/users/UserRepository";
 
 type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["findByUidIncludeEventType"]>>>;
 
@@ -20,9 +20,7 @@ export class BookingAccessService {
     booking?.eventType?.hosts?.forEach((host: { userId: number; user: { email: string } }) =>
       addHost(host.userId, host.user.email)
     );
-    booking?.eventType?.users?.forEach((user: { id: number; email: string }) =>
-      addHost(user.id, user.email)
-    );
+    booking?.eventType?.users?.forEach((user: { id: number; email: string }) => addHost(user.id, user.email));
 
     if (booking?.user?.id && booking?.user?.email) {
       addHost(booking.user.id, booking.user.email);

From 367799df2267ccc875720461fb5ba4cc992b2f14 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Mon, 13 Oct 2025 18:31:48 +0200
Subject: [PATCH 23/54] fix type of bookingUid

---
 apps/web/components/dialog/ReportBookingDialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 0f76520e15d4c7..b926e546eaed31 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -17,7 +17,7 @@ type BookingReportStatus = "upcoming" | "past" | "cancelled" | "rejected";
 interface IReportBookingDialog {
   isOpenDialog: boolean;
   setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
-  bookingUid: number;
+  bookingUid: string;
   isRecurring: boolean;
   status: BookingReportStatus;
 }

From a1f47f5d1e21dcda8deed1ee5bcc37f142049854 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 22:19:55 +0530
Subject: [PATCH 24/54] fix: import path

---
 packages/features/bookings/services/BookingAccessService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/features/bookings/services/BookingAccessService.ts b/packages/features/bookings/services/BookingAccessService.ts
index 779435dfb40419..46140efd44f4e5 100644
--- a/packages/features/bookings/services/BookingAccessService.ts
+++ b/packages/features/bookings/services/BookingAccessService.ts
@@ -2,6 +2,7 @@ import { UserRepository } from "@calcom/features/users/repositories/UserReposito
 import type { PrismaClient } from "@calcom/prisma";
 
 import { BookingRepository } from "../repositories/BookingRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 
 type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["findByUidIncludeEventType"]>>>;
 

From 32c2dd535739ea159b9bbc332fded5fe523f8d53 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 22:21:24 +0530
Subject: [PATCH 25/54] fix: remove cancellation

---
 .../trpc/server/routers/viewer/bookings/reportBooking.handler.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 431749dc5d1bff..b36b2d8e1e7807 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -84,7 +84,6 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
         bookingData: {
           uid: booking.uid,
           cancelledBy: user.email,
-          cancellationReason: description,
           skipCancellationReasonValidation: true,
           ...(booking.recurringEventId ? { cancelSubsequentBookings: true } : {}),
           ...(seatReferenceUid ? { seatReferenceUid } : {}),

From 844bc5efa899d94966f792afd3f1c2bd4b5af85a Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 22:32:58 +0530
Subject: [PATCH 26/54] chore: duplicate

---
 packages/features/bookings/services/BookingAccessService.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/features/bookings/services/BookingAccessService.ts b/packages/features/bookings/services/BookingAccessService.ts
index 46140efd44f4e5..779435dfb40419 100644
--- a/packages/features/bookings/services/BookingAccessService.ts
+++ b/packages/features/bookings/services/BookingAccessService.ts
@@ -2,7 +2,6 @@ import { UserRepository } from "@calcom/features/users/repositories/UserReposito
 import type { PrismaClient } from "@calcom/prisma";
 
 import { BookingRepository } from "../repositories/BookingRepository";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 
 type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["findByUidIncludeEventType"]>>>;
 

From 7b57f74eedcfe5399179030c5a19d71164efd089 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 22:34:32 +0530
Subject: [PATCH 27/54] fix: tests

---
 .../server/routers/viewer/bookings/reportBooking.handler.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index 2239161e33aee3..f871e0a0428c51 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -227,7 +227,6 @@ describe("reportBookingHandler", () => {
         bookingData: {
           uid: "test-booking-uid",
           cancelledBy: mockUser.email,
-          cancellationReason: "Spam booking",
           skipCancellationReasonValidation: true,
         },
         userId: mockUser.id,

From 49fe60edc0aece6f38c4a7348b3da71124bb48ea Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 00:32:05 +0530
Subject: [PATCH 28/54] refactor: feedback

---
 .../privacy/booking-reports-table.tsx         | 429 ++++++++++++++++++
 .../booking-report-details-sheet.tsx          | 154 +++++++
 .../migration.sql                             |   2 +-
 packages/prisma/schema.prisma                 |  16 +-
 .../bookings/reportBooking.handler.test.ts    |   6 +-
 .../viewer/bookings/reportBooking.handler.ts  |   3 +-
 6 files changed, 597 insertions(+), 13 deletions(-)
 create mode 100644 apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
 rename packages/prisma/migrations/{20251013134959_add_booking_report => 20251013185902_add_booking_report}/migration.sql (98%)

diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
new file mode 100644
index 00000000000000..c2bd2501fe09ce
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -0,0 +1,429 @@
+"use client";
+
+import { keepPreviousData } from "@tanstack/react-query";
+import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
+import { useMemo, useState } from "react";
+
+import {
+  DataTableWrapper,
+  DataTableToolbar,
+  DataTableFilters,
+  ColumnFilterType,
+  useDataTable,
+  useColumnFilters,
+  convertFacetedValuesToMap,
+  DataTableSelectionBar,
+} from "@calcom/features/data-table";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuPortal,
+} from "@calcom/ui/components/dropdown";
+import { Checkbox } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+
+import { AddToWatchlistModal } from "./components/add-to-watchlist-modal";
+import { BookingReportDetailsSheet } from "./components/booking-report-details-sheet";
+import { BulkAddToWatchlist } from "./components/bulk-add-to-watchlist";
+
+type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+
+export function BookingReportsTable() {
+  const { t } = useLocale();
+  const { limit, offset, searchTerm } = useDataTable();
+  const columnFilters = useColumnFilters();
+
+  const [selectedReport, setSelectedReport] = useState<BookingReport | null>(null);
+  const [showWatchlistModal, setShowWatchlistModal] = useState(false);
+  const [showDetailsSheet, setShowDetailsSheet] = useState(false);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [rowSelection, setRowSelection] = useState({});
+
+  const filters = useMemo(() => {
+    const hasWatchlistFilter = columnFilters.find((f) => f.id === "hasWatchlist");
+
+    let hasWatchlistValue: boolean | undefined = undefined;
+
+    if (hasWatchlistFilter && hasWatchlistFilter.value.type === ColumnFilterType.MULTI_SELECT) {
+      const filterValues = hasWatchlistFilter.value.data;
+      if (Array.isArray(filterValues) && filterValues.length > 0) {
+        if (filterValues.length === 2 || filterValues.length === 0) {
+          hasWatchlistValue = undefined;
+        } else {
+          hasWatchlistValue = filterValues[0] === "true";
+        }
+      }
+    }
+
+    return {
+      hasWatchlist: hasWatchlistValue,
+    };
+  }, [columnFilters]);
+
+  const { data, isPending } = trpc.viewer.organizations.listBookingReports.useQuery(
+    {
+      limit,
+      offset,
+      searchTerm,
+      filters,
+    },
+    {
+      placeholderData: keepPreviousData,
+    }
+  );
+
+  const utils = trpc.useUtils();
+
+  const deleteReportMutation = trpc.viewer.organizations.deleteBookingReport.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.organizations.listBookingReports.invalidate();
+      showToast(t("booking_report_deleted"), "success");
+      setShowDeleteDialog(false);
+      setSelectedReport(null);
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
+  const totalRowCount = data?.meta?.totalRowCount ?? 0;
+  const flatData = useMemo<BookingReport[]>(() => data?.rows ?? [], [data]);
+
+  const columns = useMemo<ColumnDef<BookingReport>[]>(
+    () => [
+      {
+        id: "select",
+        enableHiding: false,
+        enableSorting: false,
+        enableResizing: false,
+        size: 30,
+        header: ({ table }) => (
+          <Checkbox
+            checked={table.getIsAllPageRowsSelected()}
+            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+            aria-label="Select all"
+          />
+        ),
+        cell: ({ row }) => (
+          <Checkbox
+            checked={row.getIsSelected()}
+            onCheckedChange={(value) => row.toggleSelected(!!value)}
+            aria-label="Select row"
+            className="translate-y-[2px]"
+          />
+        ),
+      },
+      {
+        id: "bookerEmail",
+        header: t("booker_email"),
+        accessorKey: "bookerEmail",
+        enableHiding: false,
+        cell: ({ row }) => <span className="text-emphasis font-medium">{row.original.bookerEmail}</span>,
+      },
+      {
+        id: "reportedBy",
+        header: t("reported_by"),
+        accessorFn: (row) => row.reporter?.email ?? "-",
+        size: 180,
+        cell: ({ row }) => <span className="text-default">{row.original.reporter?.email ?? "-"}</span>,
+      },
+      {
+        id: "reason",
+        header: t("reason"),
+        accessorKey: "reason",
+        size: 90,
+        meta: {
+          type: ColumnFilterType.MULTI_SELECT,
+        },
+        cell: ({ row }) => {
+          const reasonColors: Record<string, "red" | "orange" | "gray"> = {
+            SPAM: "red",
+            DONT_KNOW_PERSON: "orange",
+            OTHER: "gray",
+          };
+          const reason = t(row.original.reason.toLowerCase());
+          return (
+            <Badge variant={reasonColors[row.original.reason] || "gray"}>
+              {reason.charAt(0).toUpperCase() + reason.slice(1)}
+            </Badge>
+          );
+        },
+      },
+      {
+        id: "hasWatchlist",
+        header: t("in_blocklist"),
+        accessorFn: (row) => (row.watchlistId ? "true" : "false"),
+        size: 120,
+        meta: {
+          type: ColumnFilterType.MULTI_SELECT,
+        },
+        cell: ({ row }) => (
+          <Badge variant={row.original.watchlistId ? "blue" : "gray"}>
+            {row.original.watchlistId ? t("yes") : t("no")}
+          </Badge>
+        ),
+      },
+      {
+        id: "actions",
+        header: "",
+        size: 90,
+        enableHiding: false,
+        enableSorting: false,
+        enableResizing: false,
+        cell: ({ row }) => {
+          const report = row.original;
+          return (
+            <div className="flex items-center justify-end">
+              <ButtonGroup combined containerProps={{ className: "border-default hidden md:flex" }}>
+                <Tooltip content={t("view_booking_page")}>
+                  <Button
+                    target="_blank"
+                    href={`/booking/${report.booking.uid}`}
+                    color="secondary"
+                    variant="icon"
+                    StartIcon="external-link"
+                  />
+                </Tooltip>
+                <Dropdown>
+                  <DropdownMenuTrigger asChild>
+                    <Button
+                      className="radix-state-open:rounded-r-md"
+                      color="secondary"
+                      variant="icon"
+                      StartIcon="ellipsis"
+                    />
+                  </DropdownMenuTrigger>
+                  <DropdownMenuPortal>
+                    <DropdownMenuContent>
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDetailsSheet(true);
+                          }}
+                          StartIcon="eye">
+                          {t("view")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                      {!report.watchlistId && (
+                        <DropdownMenuItem>
+                          <DropdownItem
+                            type="button"
+                            onClick={() => {
+                              setSelectedReport(report);
+                              setShowWatchlistModal(true);
+                            }}
+                            StartIcon="shield-check">
+                            {t("add_to_blocklist")}
+                          </DropdownItem>
+                        </DropdownMenuItem>
+                      )}
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDeleteDialog(true);
+                          }}
+                          color="destructive"
+                          StartIcon="trash">
+                          {t("delete")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenuPortal>
+                </Dropdown>
+              </ButtonGroup>
+              <div className="flex md:hidden">
+                <Dropdown>
+                  <DropdownMenuTrigger asChild>
+                    <Button type="button" variant="icon" color="minimal" StartIcon="ellipsis" />
+                  </DropdownMenuTrigger>
+                  <DropdownMenuPortal>
+                    <DropdownMenuContent>
+                      <DropdownMenuItem className="outline-none">
+                        <DropdownItem
+                          href={`/booking/${report.booking.uid}`}
+                          target="_blank"
+                          type="button"
+                          StartIcon="external-link">
+                          {t("view_booking_page")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDetailsSheet(true);
+                          }}
+                          StartIcon="eye">
+                          {t("view")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                      {!report.watchlistId && (
+                        <DropdownMenuItem>
+                          <DropdownItem
+                            type="button"
+                            onClick={() => {
+                              setSelectedReport(report);
+                              setShowWatchlistModal(true);
+                            }}
+                            StartIcon="shield-check">
+                            {t("add_to_blocklist")}
+                          </DropdownItem>
+                        </DropdownMenuItem>
+                      )}
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          color="destructive"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDeleteDialog(true);
+                          }}
+                          StartIcon="trash">
+                          {t("delete")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenuPortal>
+                </Dropdown>
+              </div>
+            </div>
+          );
+        },
+      },
+    ],
+    [t, setSelectedReport, setShowDetailsSheet]
+  );
+
+  const table = useReactTable({
+    data: flatData,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    manualPagination: true,
+    getRowId: (row) => row.id,
+    onRowSelectionChange: setRowSelection,
+    state: {
+      rowSelection,
+    },
+    enableRowSelection: true,
+    getFacetedUniqueValues: (_, columnId) => () => {
+      switch (columnId) {
+        case "hasWatchlist":
+          return convertFacetedValuesToMap([
+            { label: t("no"), value: "false" },
+            { label: t("yes"), value: "true" },
+          ]);
+        case "reason":
+          return convertFacetedValuesToMap([
+            { label: t("spam"), value: "SPAM" },
+            { label: t("dont_know_person"), value: "DONT_KNOW_PERSON" },
+            { label: t("other"), value: "OTHER" },
+          ]);
+        default:
+          return new Map();
+      }
+    },
+  });
+
+  const numberOfSelectedRows = table.getFilteredSelectedRowModel().rows.length;
+
+  return (
+    <>
+      <DataTableWrapper
+        table={table}
+        isPending={isPending}
+        paginationMode="standard"
+        totalRowCount={totalRowCount}
+        ToolbarLeft={
+          <>
+            <DataTableToolbar.SearchBar />
+            <DataTableFilters.FilterBar table={table} />
+          </>
+        }
+        ToolbarRight={
+          <>
+            <DataTableFilters.ClearFiltersButton />
+          </>
+        }>
+        {numberOfSelectedRows > 0 && (
+          <DataTableSelectionBar.Root className="!bottom-16 justify-center md:w-max">
+            <p className="text-brand-subtle px-2 text-center text-xs leading-none sm:text-sm sm:font-medium">
+              {t("number_selected", { count: numberOfSelectedRows })}
+            </p>
+            <BulkAddToWatchlist
+              reports={table.getSelectedRowModel().flatRows.map((row) => row.original)}
+              onSuccess={() => table.toggleAllPageRowsSelected(false)}
+            />
+          </DataTableSelectionBar.Root>
+        )}
+      </DataTableWrapper>
+
+      {selectedReport && showDetailsSheet && (
+        <BookingReportDetailsSheet
+          open={showDetailsSheet}
+          onClose={() => {
+            setShowDetailsSheet(false);
+            setSelectedReport(null);
+          }}
+          report={selectedReport}
+          onAddToWatchlist={
+            !selectedReport.watchlistId
+              ? () => {
+                  setShowDetailsSheet(false);
+                  setShowWatchlistModal(true);
+                }
+              : undefined
+          }
+        />
+      )}
+
+      {selectedReport && showWatchlistModal && (
+        <AddToWatchlistModal
+          open={showWatchlistModal}
+          onClose={() => {
+            setShowWatchlistModal(false);
+            setSelectedReport(null);
+          }}
+          report={selectedReport}
+        />
+      )}
+
+      {selectedReport && showDeleteDialog && (
+        <Dialog
+          open={showDeleteDialog}
+          onOpenChange={(open) => {
+            if (!open) {
+              setShowDeleteDialog(false);
+              setSelectedReport(null);
+            }
+          }}>
+          <ConfirmationDialogContent
+            variety="danger"
+            title={t("delete_booking_report")}
+            confirmBtnText={t("delete")}
+            onConfirm={() => {
+              deleteReportMutation.mutate({ reportId: selectedReport.id });
+            }}>
+            {t("delete_booking_report_confirmation")}
+          </ConfirmationDialogContent>
+        </Dialog>
+      )}
+    </>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
new file mode 100644
index 00000000000000..36e30eb0924ce4
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
@@ -0,0 +1,154 @@
+"use client";
+
+import { format } from "date-fns";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Sheet, SheetContent, SheetHeader, SheetBody } from "@calcom/ui/components/sheet";
+
+type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+
+interface BookingReportDetailsSheetProps {
+  open: boolean;
+  onClose: () => void;
+  report: BookingReport;
+  onAddToWatchlist?: () => void;
+}
+
+export function BookingReportDetailsSheet({
+  open,
+  onClose,
+  report,
+  onAddToWatchlist,
+}: BookingReportDetailsSheetProps) {
+  const { t } = useLocale();
+
+  const reasonColors: Record<string, "red" | "orange" | "gray"> = {
+    SPAM: "red",
+    DONT_KNOW_PERSON: "orange",
+    OTHER: "gray",
+  };
+
+  return (
+    <Sheet open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
+      <SheetContent>
+        <SheetHeader>
+          <div className="flex items-center justify-between">
+            <div>
+              <h2 className="text-emphasis text-base font-semibold">{report.bookerEmail}</h2>
+              <div className="mt-2 flex items-center gap-2">
+                <Badge variant={reasonColors[report.reason] || "gray"} className="text-xs">
+                  {t(report.reason.toLowerCase())}
+                </Badge>
+                {report.watchlistId && (
+                  <Badge variant="blue" className="text-xs">
+                    {t("in_blocklist")}
+                  </Badge>
+                )}
+                {report.cancelled && (
+                  <Badge variant="green" className="text-xs">
+                    {t("cancelled")}
+                  </Badge>
+                )}
+              </div>
+            </div>
+          </div>
+        </SheetHeader>
+
+        <SheetBody className="space-y-6">
+          <div className="space-y-4">
+            <h3 className="text-emphasis text-sm font-semibold">{t("booking_details")}</h3>
+            <div className="space-y-3">
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("booker_email")}</span>
+                <span className="text-default text-sm">{report.bookerEmail}</span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("booking_date")}</span>
+                <span className="text-default text-sm">
+                  {format(new Date(report.booking.startTime), "PPP p")}
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("booking_title")}</span>
+                <span className="text-default text-sm">{report.booking.title || t("no_title")}</span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("view_booking")}</span>
+                <a
+                  href={`/booking/${report.booking.uid}`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-brand-default hover:text-brand-emphasis text-sm underline">
+                  /booking/{report.booking.uid}
+                </a>
+              </div>
+            </div>
+          </div>
+
+          <div className="space-y-4">
+            <h3 className="text-emphasis text-sm font-semibold">{t("report_details")}</h3>
+            <div className="space-y-3">
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("reported_by")}</span>
+                <span className="text-default text-sm">
+                  {report.reporter?.name || ""} ({report.reporter?.email || "Unknown"})
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("reported_at")}</span>
+                <span className="text-default text-sm">{format(new Date(report.createdAt), "PPP p")}</span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("reason")}</span>
+                <span className="text-default text-sm">{t(report.reason.toLowerCase())}</span>
+              </div>
+              {report.description && (
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("description")}</span>
+                  <span className="text-default text-sm">{report.description}</span>
+                </div>
+              )}
+            </div>
+          </div>
+
+          {report.watchlistId && report.watchlist && (
+            <div className="space-y-4">
+              <h3 className="text-emphasis text-sm font-semibold">{t("blocklist_info")}</h3>
+              <div className="space-y-3">
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("blocklist_type")}</span>
+                  <span className="text-default text-sm">{report.watchlist.type}</span>
+                </div>
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("blocklist_value")}</span>
+                  <span className="text-default text-sm">{report.watchlist.value}</span>
+                </div>
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("blocklist_action")}</span>
+                  <span className="text-default text-sm">{report.watchlist.action}</span>
+                </div>
+                {report.watchlist.description && (
+                  <div className="flex flex-col">
+                    <span className="text-subtle text-xs">{t("blocklist_description")}</span>
+                    <span className="text-default text-sm">{report.watchlist.description}</span>
+                  </div>
+                )}
+              </div>
+            </div>
+          )}
+
+          {!report.watchlistId && onAddToWatchlist && (
+            <div className="pt-4">
+              <Button onClick={onAddToWatchlist} color="primary" className="w-full justify-center">
+                {t("add_to_blocklist")}
+              </Button>
+            </div>
+          )}
+        </SheetBody>
+      </SheetContent>
+    </Sheet>
+  );
+}
diff --git a/packages/prisma/migrations/20251013134959_add_booking_report/migration.sql b/packages/prisma/migrations/20251013185902_add_booking_report/migration.sql
similarity index 98%
rename from packages/prisma/migrations/20251013134959_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251013185902_add_booking_report/migration.sql
index b96b7fcf8f240f..32635dfd1c2ede 100644
--- a/packages/prisma/migrations/20251013134959_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251013185902_add_booking_report/migration.sql
@@ -6,7 +6,7 @@ CREATE TABLE "BookingReport" (
     "id" UUID NOT NULL,
     "bookingUid" TEXT NOT NULL,
     "bookerEmail" TEXT NOT NULL,
-    "reportedById" INTEGER NOT NULL,
+    "reportedById" INTEGER,
     "organizationId" INTEGER,
     "reason" "BookingReportReason" NOT NULL,
     "description" TEXT,
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 925223f275db98..173698f5f84d5f 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -2357,21 +2357,21 @@ enum BookingReportReason {
 }
 
 model BookingReport {
-  id             String       @id @default(uuid()) @db.Uuid
-  bookingUid     String       @unique
-  booking        Booking      @relation(fields: [bookingUid], references: [uid], onDelete: Cascade)
+  id             String              @id @default(uuid()) @db.Uuid
+  bookingUid     String              @unique
+  booking        Booking             @relation(fields: [bookingUid], references: [uid], onDelete: Cascade)
   bookerEmail    String
-  reportedById   Int
+  reportedById   Int?
   organizationId Int?
   reason         BookingReportReason
   description    String?
-  cancelled      Boolean      @default(false)
-  createdAt      DateTime     @default(now())
-  updatedAt      DateTime     @updatedAt
+  cancelled      Boolean             @default(false)
+  createdAt      DateTime            @default(now())
+  updatedAt      DateTime            @updatedAt
 
   watchlistId String? @db.Uuid
 
-  reportedBy   User       @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: SetNull)
+  reportedBy   User?      @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: SetNull)
   organization Team?      @relation(fields: [organizationId], references: [id], onDelete: Cascade)
   watchlist    Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
 
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
index f871e0a0428c51..3a6f39b304f889 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -281,9 +281,9 @@ describe("reportBookingHandler", () => {
         startTime: new Date(Date.now() + 86400000),
       });
       mockBookingRepo.getActiveRecurringBookingsFromDate.mockResolvedValue([
-        { id: 100 },
-        { id: 101 },
-        { id: 102 },
+        { uid: "100" },
+        { uid: "101" },
+        { uid: "102" },
       ]);
       vi.mocked(handleCancelBooking).mockResolvedValue({
         success: true,
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index b36b2d8e1e7807..99ef5101e39534 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -74,9 +74,10 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
   if (isUpcoming) {
     cancellationAttempted = true;
     try {
+      const normalizedEmail = user.email.trim().toLowerCase();
       const userSeat = booking.seatsReferences.find(
         (seat: { attendee?: { email: string }; referenceUid?: string }) =>
-          seat.attendee?.email.trim().toLowerCase() === user.email.trim().toLowerCase()
+          seat.attendee?.email && seat.attendee.email.trim().toLowerCase() === normalizedEmail
       );
       const seatReferenceUid = userSeat?.referenceUid;
 

From 83c2fae55b138c4658219118fd647a774602374a Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 00:40:39 +0530
Subject: [PATCH 29/54] chore: remove table from here

---
 .../privacy/booking-reports-table.tsx         | 429 ------------------
 1 file changed, 429 deletions(-)
 delete mode 100644 apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx

diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
deleted file mode 100644
index c2bd2501fe09ce..00000000000000
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ /dev/null
@@ -1,429 +0,0 @@
-"use client";
-
-import { keepPreviousData } from "@tanstack/react-query";
-import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
-import { useMemo, useState } from "react";
-
-import {
-  DataTableWrapper,
-  DataTableToolbar,
-  DataTableFilters,
-  ColumnFilterType,
-  useDataTable,
-  useColumnFilters,
-  convertFacetedValuesToMap,
-  DataTableSelectionBar,
-} from "@calcom/features/data-table";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { trpc } from "@calcom/trpc";
-import type { RouterOutputs } from "@calcom/trpc/react";
-import { Badge } from "@calcom/ui/components/badge";
-import { Button } from "@calcom/ui/components/button";
-import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
-import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
-import {
-  Dropdown,
-  DropdownItem,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuPortal,
-} from "@calcom/ui/components/dropdown";
-import { Checkbox } from "@calcom/ui/components/form";
-import { showToast } from "@calcom/ui/components/toast";
-import { Tooltip } from "@calcom/ui/components/tooltip";
-
-import { AddToWatchlistModal } from "./components/add-to-watchlist-modal";
-import { BookingReportDetailsSheet } from "./components/booking-report-details-sheet";
-import { BulkAddToWatchlist } from "./components/bulk-add-to-watchlist";
-
-type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
-
-export function BookingReportsTable() {
-  const { t } = useLocale();
-  const { limit, offset, searchTerm } = useDataTable();
-  const columnFilters = useColumnFilters();
-
-  const [selectedReport, setSelectedReport] = useState<BookingReport | null>(null);
-  const [showWatchlistModal, setShowWatchlistModal] = useState(false);
-  const [showDetailsSheet, setShowDetailsSheet] = useState(false);
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-  const [rowSelection, setRowSelection] = useState({});
-
-  const filters = useMemo(() => {
-    const hasWatchlistFilter = columnFilters.find((f) => f.id === "hasWatchlist");
-
-    let hasWatchlistValue: boolean | undefined = undefined;
-
-    if (hasWatchlistFilter && hasWatchlistFilter.value.type === ColumnFilterType.MULTI_SELECT) {
-      const filterValues = hasWatchlistFilter.value.data;
-      if (Array.isArray(filterValues) && filterValues.length > 0) {
-        if (filterValues.length === 2 || filterValues.length === 0) {
-          hasWatchlistValue = undefined;
-        } else {
-          hasWatchlistValue = filterValues[0] === "true";
-        }
-      }
-    }
-
-    return {
-      hasWatchlist: hasWatchlistValue,
-    };
-  }, [columnFilters]);
-
-  const { data, isPending } = trpc.viewer.organizations.listBookingReports.useQuery(
-    {
-      limit,
-      offset,
-      searchTerm,
-      filters,
-    },
-    {
-      placeholderData: keepPreviousData,
-    }
-  );
-
-  const utils = trpc.useUtils();
-
-  const deleteReportMutation = trpc.viewer.organizations.deleteBookingReport.useMutation({
-    onSuccess: async () => {
-      await utils.viewer.organizations.listBookingReports.invalidate();
-      showToast(t("booking_report_deleted"), "success");
-      setShowDeleteDialog(false);
-      setSelectedReport(null);
-    },
-    onError: (error) => {
-      showToast(error.message, "error");
-    },
-  });
-
-  const totalRowCount = data?.meta?.totalRowCount ?? 0;
-  const flatData = useMemo<BookingReport[]>(() => data?.rows ?? [], [data]);
-
-  const columns = useMemo<ColumnDef<BookingReport>[]>(
-    () => [
-      {
-        id: "select",
-        enableHiding: false,
-        enableSorting: false,
-        enableResizing: false,
-        size: 30,
-        header: ({ table }) => (
-          <Checkbox
-            checked={table.getIsAllPageRowsSelected()}
-            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-            aria-label="Select all"
-          />
-        ),
-        cell: ({ row }) => (
-          <Checkbox
-            checked={row.getIsSelected()}
-            onCheckedChange={(value) => row.toggleSelected(!!value)}
-            aria-label="Select row"
-            className="translate-y-[2px]"
-          />
-        ),
-      },
-      {
-        id: "bookerEmail",
-        header: t("booker_email"),
-        accessorKey: "bookerEmail",
-        enableHiding: false,
-        cell: ({ row }) => <span className="text-emphasis font-medium">{row.original.bookerEmail}</span>,
-      },
-      {
-        id: "reportedBy",
-        header: t("reported_by"),
-        accessorFn: (row) => row.reporter?.email ?? "-",
-        size: 180,
-        cell: ({ row }) => <span className="text-default">{row.original.reporter?.email ?? "-"}</span>,
-      },
-      {
-        id: "reason",
-        header: t("reason"),
-        accessorKey: "reason",
-        size: 90,
-        meta: {
-          type: ColumnFilterType.MULTI_SELECT,
-        },
-        cell: ({ row }) => {
-          const reasonColors: Record<string, "red" | "orange" | "gray"> = {
-            SPAM: "red",
-            DONT_KNOW_PERSON: "orange",
-            OTHER: "gray",
-          };
-          const reason = t(row.original.reason.toLowerCase());
-          return (
-            <Badge variant={reasonColors[row.original.reason] || "gray"}>
-              {reason.charAt(0).toUpperCase() + reason.slice(1)}
-            </Badge>
-          );
-        },
-      },
-      {
-        id: "hasWatchlist",
-        header: t("in_blocklist"),
-        accessorFn: (row) => (row.watchlistId ? "true" : "false"),
-        size: 120,
-        meta: {
-          type: ColumnFilterType.MULTI_SELECT,
-        },
-        cell: ({ row }) => (
-          <Badge variant={row.original.watchlistId ? "blue" : "gray"}>
-            {row.original.watchlistId ? t("yes") : t("no")}
-          </Badge>
-        ),
-      },
-      {
-        id: "actions",
-        header: "",
-        size: 90,
-        enableHiding: false,
-        enableSorting: false,
-        enableResizing: false,
-        cell: ({ row }) => {
-          const report = row.original;
-          return (
-            <div className="flex items-center justify-end">
-              <ButtonGroup combined containerProps={{ className: "border-default hidden md:flex" }}>
-                <Tooltip content={t("view_booking_page")}>
-                  <Button
-                    target="_blank"
-                    href={`/booking/${report.booking.uid}`}
-                    color="secondary"
-                    variant="icon"
-                    StartIcon="external-link"
-                  />
-                </Tooltip>
-                <Dropdown>
-                  <DropdownMenuTrigger asChild>
-                    <Button
-                      className="radix-state-open:rounded-r-md"
-                      color="secondary"
-                      variant="icon"
-                      StartIcon="ellipsis"
-                    />
-                  </DropdownMenuTrigger>
-                  <DropdownMenuPortal>
-                    <DropdownMenuContent>
-                      <DropdownMenuItem>
-                        <DropdownItem
-                          type="button"
-                          onClick={() => {
-                            setSelectedReport(report);
-                            setShowDetailsSheet(true);
-                          }}
-                          StartIcon="eye">
-                          {t("view")}
-                        </DropdownItem>
-                      </DropdownMenuItem>
-                      {!report.watchlistId && (
-                        <DropdownMenuItem>
-                          <DropdownItem
-                            type="button"
-                            onClick={() => {
-                              setSelectedReport(report);
-                              setShowWatchlistModal(true);
-                            }}
-                            StartIcon="shield-check">
-                            {t("add_to_blocklist")}
-                          </DropdownItem>
-                        </DropdownMenuItem>
-                      )}
-                      <DropdownMenuItem>
-                        <DropdownItem
-                          type="button"
-                          onClick={() => {
-                            setSelectedReport(report);
-                            setShowDeleteDialog(true);
-                          }}
-                          color="destructive"
-                          StartIcon="trash">
-                          {t("delete")}
-                        </DropdownItem>
-                      </DropdownMenuItem>
-                    </DropdownMenuContent>
-                  </DropdownMenuPortal>
-                </Dropdown>
-              </ButtonGroup>
-              <div className="flex md:hidden">
-                <Dropdown>
-                  <DropdownMenuTrigger asChild>
-                    <Button type="button" variant="icon" color="minimal" StartIcon="ellipsis" />
-                  </DropdownMenuTrigger>
-                  <DropdownMenuPortal>
-                    <DropdownMenuContent>
-                      <DropdownMenuItem className="outline-none">
-                        <DropdownItem
-                          href={`/booking/${report.booking.uid}`}
-                          target="_blank"
-                          type="button"
-                          StartIcon="external-link">
-                          {t("view_booking_page")}
-                        </DropdownItem>
-                      </DropdownMenuItem>
-                      <DropdownMenuItem>
-                        <DropdownItem
-                          type="button"
-                          onClick={() => {
-                            setSelectedReport(report);
-                            setShowDetailsSheet(true);
-                          }}
-                          StartIcon="eye">
-                          {t("view")}
-                        </DropdownItem>
-                      </DropdownMenuItem>
-                      {!report.watchlistId && (
-                        <DropdownMenuItem>
-                          <DropdownItem
-                            type="button"
-                            onClick={() => {
-                              setSelectedReport(report);
-                              setShowWatchlistModal(true);
-                            }}
-                            StartIcon="shield-check">
-                            {t("add_to_blocklist")}
-                          </DropdownItem>
-                        </DropdownMenuItem>
-                      )}
-                      <DropdownMenuItem>
-                        <DropdownItem
-                          type="button"
-                          color="destructive"
-                          onClick={() => {
-                            setSelectedReport(report);
-                            setShowDeleteDialog(true);
-                          }}
-                          StartIcon="trash">
-                          {t("delete")}
-                        </DropdownItem>
-                      </DropdownMenuItem>
-                    </DropdownMenuContent>
-                  </DropdownMenuPortal>
-                </Dropdown>
-              </div>
-            </div>
-          );
-        },
-      },
-    ],
-    [t, setSelectedReport, setShowDetailsSheet]
-  );
-
-  const table = useReactTable({
-    data: flatData,
-    columns,
-    getCoreRowModel: getCoreRowModel(),
-    getSortedRowModel: getSortedRowModel(),
-    manualPagination: true,
-    getRowId: (row) => row.id,
-    onRowSelectionChange: setRowSelection,
-    state: {
-      rowSelection,
-    },
-    enableRowSelection: true,
-    getFacetedUniqueValues: (_, columnId) => () => {
-      switch (columnId) {
-        case "hasWatchlist":
-          return convertFacetedValuesToMap([
-            { label: t("no"), value: "false" },
-            { label: t("yes"), value: "true" },
-          ]);
-        case "reason":
-          return convertFacetedValuesToMap([
-            { label: t("spam"), value: "SPAM" },
-            { label: t("dont_know_person"), value: "DONT_KNOW_PERSON" },
-            { label: t("other"), value: "OTHER" },
-          ]);
-        default:
-          return new Map();
-      }
-    },
-  });
-
-  const numberOfSelectedRows = table.getFilteredSelectedRowModel().rows.length;
-
-  return (
-    <>
-      <DataTableWrapper
-        table={table}
-        isPending={isPending}
-        paginationMode="standard"
-        totalRowCount={totalRowCount}
-        ToolbarLeft={
-          <>
-            <DataTableToolbar.SearchBar />
-            <DataTableFilters.FilterBar table={table} />
-          </>
-        }
-        ToolbarRight={
-          <>
-            <DataTableFilters.ClearFiltersButton />
-          </>
-        }>
-        {numberOfSelectedRows > 0 && (
-          <DataTableSelectionBar.Root className="!bottom-16 justify-center md:w-max">
-            <p className="text-brand-subtle px-2 text-center text-xs leading-none sm:text-sm sm:font-medium">
-              {t("number_selected", { count: numberOfSelectedRows })}
-            </p>
-            <BulkAddToWatchlist
-              reports={table.getSelectedRowModel().flatRows.map((row) => row.original)}
-              onSuccess={() => table.toggleAllPageRowsSelected(false)}
-            />
-          </DataTableSelectionBar.Root>
-        )}
-      </DataTableWrapper>
-
-      {selectedReport && showDetailsSheet && (
-        <BookingReportDetailsSheet
-          open={showDetailsSheet}
-          onClose={() => {
-            setShowDetailsSheet(false);
-            setSelectedReport(null);
-          }}
-          report={selectedReport}
-          onAddToWatchlist={
-            !selectedReport.watchlistId
-              ? () => {
-                  setShowDetailsSheet(false);
-                  setShowWatchlistModal(true);
-                }
-              : undefined
-          }
-        />
-      )}
-
-      {selectedReport && showWatchlistModal && (
-        <AddToWatchlistModal
-          open={showWatchlistModal}
-          onClose={() => {
-            setShowWatchlistModal(false);
-            setSelectedReport(null);
-          }}
-          report={selectedReport}
-        />
-      )}
-
-      {selectedReport && showDeleteDialog && (
-        <Dialog
-          open={showDeleteDialog}
-          onOpenChange={(open) => {
-            if (!open) {
-              setShowDeleteDialog(false);
-              setSelectedReport(null);
-            }
-          }}>
-          <ConfirmationDialogContent
-            variety="danger"
-            title={t("delete_booking_report")}
-            confirmBtnText={t("delete")}
-            onConfirm={() => {
-              deleteReportMutation.mutate({ reportId: selectedReport.id });
-            }}>
-            {t("delete_booking_report_confirmation")}
-          </ConfirmationDialogContent>
-        </Dialog>
-      )}
-    </>
-  );
-}

From 8bd8d1f67532bada0cbf70673c707dd68aaf3ccf Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 00:59:24 +0530
Subject: [PATCH 30/54] fix: types

---
 packages/lib/server/repository/bookingReport.interface.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index ea6708ec65e721..9d74cf9174b8a6 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -12,7 +12,7 @@ export interface CreateBookingReportInput {
 
 export interface BookingReportSummary {
   id: string;
-  reportedById: number;
+  reportedById: number | null;
   reason: BookingReportReason;
   description: string | null;
   createdAt: Date;

From 25ae786c6cc13444123207e5a2427d7b34e2a5b5 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 01:14:42 +0530
Subject: [PATCH 31/54] fix: types

---
 .../booking-report-details-sheet.tsx          | 154 ------------------
 1 file changed, 154 deletions(-)
 delete mode 100644 apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx

diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
deleted file mode 100644
index 36e30eb0924ce4..00000000000000
--- a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-"use client";
-
-import { format } from "date-fns";
-
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { RouterOutputs } from "@calcom/trpc/react";
-import { Badge } from "@calcom/ui/components/badge";
-import { Button } from "@calcom/ui/components/button";
-import { Sheet, SheetContent, SheetHeader, SheetBody } from "@calcom/ui/components/sheet";
-
-type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
-
-interface BookingReportDetailsSheetProps {
-  open: boolean;
-  onClose: () => void;
-  report: BookingReport;
-  onAddToWatchlist?: () => void;
-}
-
-export function BookingReportDetailsSheet({
-  open,
-  onClose,
-  report,
-  onAddToWatchlist,
-}: BookingReportDetailsSheetProps) {
-  const { t } = useLocale();
-
-  const reasonColors: Record<string, "red" | "orange" | "gray"> = {
-    SPAM: "red",
-    DONT_KNOW_PERSON: "orange",
-    OTHER: "gray",
-  };
-
-  return (
-    <Sheet open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
-      <SheetContent>
-        <SheetHeader>
-          <div className="flex items-center justify-between">
-            <div>
-              <h2 className="text-emphasis text-base font-semibold">{report.bookerEmail}</h2>
-              <div className="mt-2 flex items-center gap-2">
-                <Badge variant={reasonColors[report.reason] || "gray"} className="text-xs">
-                  {t(report.reason.toLowerCase())}
-                </Badge>
-                {report.watchlistId && (
-                  <Badge variant="blue" className="text-xs">
-                    {t("in_blocklist")}
-                  </Badge>
-                )}
-                {report.cancelled && (
-                  <Badge variant="green" className="text-xs">
-                    {t("cancelled")}
-                  </Badge>
-                )}
-              </div>
-            </div>
-          </div>
-        </SheetHeader>
-
-        <SheetBody className="space-y-6">
-          <div className="space-y-4">
-            <h3 className="text-emphasis text-sm font-semibold">{t("booking_details")}</h3>
-            <div className="space-y-3">
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("booker_email")}</span>
-                <span className="text-default text-sm">{report.bookerEmail}</span>
-              </div>
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("booking_date")}</span>
-                <span className="text-default text-sm">
-                  {format(new Date(report.booking.startTime), "PPP p")}
-                </span>
-              </div>
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("booking_title")}</span>
-                <span className="text-default text-sm">{report.booking.title || t("no_title")}</span>
-              </div>
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("view_booking")}</span>
-                <a
-                  href={`/booking/${report.booking.uid}`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="text-brand-default hover:text-brand-emphasis text-sm underline">
-                  /booking/{report.booking.uid}
-                </a>
-              </div>
-            </div>
-          </div>
-
-          <div className="space-y-4">
-            <h3 className="text-emphasis text-sm font-semibold">{t("report_details")}</h3>
-            <div className="space-y-3">
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("reported_by")}</span>
-                <span className="text-default text-sm">
-                  {report.reporter?.name || ""} ({report.reporter?.email || "Unknown"})
-                </span>
-              </div>
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("reported_at")}</span>
-                <span className="text-default text-sm">{format(new Date(report.createdAt), "PPP p")}</span>
-              </div>
-              <div className="flex flex-col">
-                <span className="text-subtle text-xs">{t("reason")}</span>
-                <span className="text-default text-sm">{t(report.reason.toLowerCase())}</span>
-              </div>
-              {report.description && (
-                <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("description")}</span>
-                  <span className="text-default text-sm">{report.description}</span>
-                </div>
-              )}
-            </div>
-          </div>
-
-          {report.watchlistId && report.watchlist && (
-            <div className="space-y-4">
-              <h3 className="text-emphasis text-sm font-semibold">{t("blocklist_info")}</h3>
-              <div className="space-y-3">
-                <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("blocklist_type")}</span>
-                  <span className="text-default text-sm">{report.watchlist.type}</span>
-                </div>
-                <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("blocklist_value")}</span>
-                  <span className="text-default text-sm">{report.watchlist.value}</span>
-                </div>
-                <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("blocklist_action")}</span>
-                  <span className="text-default text-sm">{report.watchlist.action}</span>
-                </div>
-                {report.watchlist.description && (
-                  <div className="flex flex-col">
-                    <span className="text-subtle text-xs">{t("blocklist_description")}</span>
-                    <span className="text-default text-sm">{report.watchlist.description}</span>
-                  </div>
-                )}
-              </div>
-            </div>
-          )}
-
-          {!report.watchlistId && onAddToWatchlist && (
-            <div className="pt-4">
-              <Button onClick={onAddToWatchlist} color="primary" className="w-full justify-center">
-                {t("add_to_blocklist")}
-              </Button>
-            </div>
-          )}
-        </SheetBody>
-      </SheetContent>
-    </Sheet>
-  );
-}

From 73f3bd4231efa8e358f2216fca5e8fe343302a35 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 7 Oct 2025 17:26:58 +0530
Subject: [PATCH 32/54] feat: report booking

---
 apps/web/public/static/locales/en/common.json |   2 +
 .../booking-report.repository.interface.ts    |  39 ++++++
 .../bookings/lib/booking-report.repository.ts | 115 ++++++++++++++++++
 .../bookings/lib/booking-report.utils.ts      |   7 ++
 .../migration.sql                             |  44 +++++++
 .../routers/viewer/bookings/get.handler.ts    |  11 ++
 6 files changed, 218 insertions(+)
 create mode 100644 packages/features/bookings/lib/booking-report.repository.interface.ts
 create mode 100644 packages/features/bookings/lib/booking-report.repository.ts
 create mode 100644 packages/features/bookings/lib/booking-report.utils.ts
 create mode 100644 packages/prisma/migrations/20251007112732_add_booking_report/migration.sql

diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index f0d94ac052f35a..9a07f3ba7f54ea 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -771,6 +771,8 @@
   "report_booking_will_cancel_description": "Reporting this booking will automatically cancel it",
   "add_to_report": "Add to report",
   "reported": "Reported",
+  "reported_by_you": "Reported by you",
+  "reported_count": "Reported ({{count}})",
   "continue": "Continue",
   "confirm": "Confirm",
   "confirm_all": "Confirm all",
diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
new file mode 100644
index 00000000000000..4c789dd27e32d6
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -0,0 +1,39 @@
+import type { ReportReason } from "@calcom/prisma/enums";
+
+export interface CreateBookingReportInput {
+  bookingId: number;
+  bookerEmail: string;
+  reportedById: number;
+  reason: ReportReason;
+  description?: string;
+  cancelled: boolean;
+}
+
+export interface BookingReportSummary {
+  id: string;
+  reportedById: number;
+  reason: ReportReason;
+  createdAt: Date;
+}
+
+export interface IBookingReportRepository {
+  /**
+   * Creates a new booking report
+   */
+  createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
+
+  /**
+   * Finds a report by a specific user for a specific booking
+   */
+  findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null>;
+
+  /**
+   * Finds all reports for a specific booking
+   */
+  findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]>;
+
+  /**
+   * Checks if a user has reported any booking in a recurring series
+   */
+  hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean>;
+}
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
new file mode 100644
index 00000000000000..4bbecfe82c626f
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -0,0 +1,115 @@
+import { captureException } from "@sentry/nextjs";
+
+import type { PrismaClient } from "@calcom/prisma";
+import type { ReportReason } from "@calcom/prisma/enums";
+
+import type {
+  BookingReportSummary,
+  CreateBookingReportInput,
+  IBookingReportRepository,
+} from "./booking-report.repository.interface";
+
+export class BookingReportRepository implements IBookingReportRepository {
+  constructor(private readonly prismaClient: PrismaClient) {}
+
+  /**
+   * Creates a new booking report
+   */
+  async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
+    try {
+      const report = await this.prismaClient.bookingReport.create({
+        data: {
+          bookingId: input.bookingId,
+          bookerEmail: input.bookerEmail,
+          reportedById: input.reportedById,
+          reason: input.reason,
+          description: input.description,
+          cancelled: input.cancelled,
+        },
+        select: {
+          id: true,
+        },
+      });
+      return report;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
+  /**
+   * Finds a report by a specific user for a specific booking
+   * Uses the composite unique constraint (bookingId, reportedById)
+   */
+  async findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null> {
+    try {
+      const report = await this.prismaClient.bookingReport.findUnique({
+        where: {
+          bookingId_reportedById: {
+            bookingId,
+            reportedById: userId,
+          },
+        },
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          createdAt: true,
+        },
+      });
+      return report;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
+  /**
+   * Finds all reports for a specific booking
+   */
+  async findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]> {
+    try {
+      const reports = await this.prismaClient.bookingReport.findMany({
+        where: {
+          bookingId,
+        },
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          createdAt: true,
+        },
+        orderBy: {
+          createdAt: "asc",
+        },
+      });
+      return reports;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
+  /**
+   * Checks if a user has reported any booking in a recurring series
+   */
+  async hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean> {
+    try {
+      const report = await this.prismaClient.bookingReport.findFirst({
+        where: {
+          reportedById: userId,
+          booking: {
+            recurringEventId,
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+      return !!report;
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+}
diff --git a/packages/features/bookings/lib/booking-report.utils.ts b/packages/features/bookings/lib/booking-report.utils.ts
new file mode 100644
index 00000000000000..fb799d71e43cd6
--- /dev/null
+++ b/packages/features/bookings/lib/booking-report.utils.ts
@@ -0,0 +1,7 @@
+/**
+ * Extracts the booker email from booking attendees
+ * Convention: first attendee is the booker
+ */
+export function extractBookerEmail(attendees: Array<{ email: string }>): string | null {
+  return attendees[0]?.email || null;
+}
diff --git a/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql b/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
new file mode 100644
index 00000000000000..dc1369a0ceb59a
--- /dev/null
+++ b/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
@@ -0,0 +1,44 @@
+-- CreateEnum
+CREATE TYPE "ReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
+
+-- CreateTable
+CREATE TABLE "BookingReport" (
+    "id" UUID NOT NULL,
+    "bookingId" INTEGER NOT NULL,
+    "bookerEmail" TEXT NOT NULL,
+    "reportedById" INTEGER NOT NULL,
+    "reason" "ReportReason" NOT NULL,
+    "description" TEXT,
+    "cancelled" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "watchlistId" UUID,
+
+    CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "BookingReport_bookingId_idx" ON "BookingReport"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "BookingReport_bookingId_reportedById_key" ON "BookingReport"("bookingId", "reportedById");
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 19d99cff918b48..0b16cad79bb4ff 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -3,6 +3,7 @@ import { type SelectQueryBuilder } from "kysely";
 import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";
 
 import dayjs from "@calcom/dayjs";
+import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
 import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
 import type { DB } from "@calcom/kysely";
 import kysely from "@calcom/kysely";
@@ -727,9 +728,19 @@ export async function getBookings({
         }
       }
 
+      // Fetch reports if exist
+      const bookingReportRepo = new BookingReportRepository(ctx.prisma);
+      const reports = await bookingReportRepo.findAllReportsForBooking(booking.id);
+
+      // Check if current user reported
+      const reportedByCurrentUser = reports.some((r) => r.reportedById === ctx.user.id);
+
       return {
         ...booking,
         rescheduler,
+        reports,
+        reportedByCurrentUser,
+        reportCount: reports.length,
         eventType: {
           ...booking.eventType,
           recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),

From 1d977469b56cc1d3624e89421dabbbfa3f8a36a7 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 01:38:30 +0530
Subject: [PATCH 33/54] refactor: improvements

---
 .../bookings/lib/booking-report.repository.interface.ts       | 1 +
 packages/features/bookings/lib/booking-report.repository.ts   | 2 ++
 packages/trpc/server/routers/viewer/bookings/get.handler.ts   | 4 +---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
index 4c789dd27e32d6..bbc39c883d5a86 100644
--- a/packages/features/bookings/lib/booking-report.repository.interface.ts
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -13,6 +13,7 @@ export interface BookingReportSummary {
   id: string;
   reportedById: number;
   reason: ReportReason;
+  description: string | null;
   createdAt: Date;
 }
 
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
index 4bbecfe82c626f..7e6a4158c01379 100644
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -54,6 +54,7 @@ export class BookingReportRepository implements IBookingReportRepository {
           id: true,
           reportedById: true,
           reason: true,
+          description: true,
           createdAt: true,
         },
       });
@@ -77,6 +78,7 @@ export class BookingReportRepository implements IBookingReportRepository {
           id: true,
           reportedById: true,
           reason: true,
+          description: true,
           createdAt: true,
         },
         orderBy: {
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 0b16cad79bb4ff..0e38498b635a41 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -728,12 +728,10 @@ export async function getBookings({
         }
       }
 
-      // Fetch reports if exist
-      const bookingReportRepo = new BookingReportRepository(ctx.prisma);
       const reports = await bookingReportRepo.findAllReportsForBooking(booking.id);
 
       // Check if current user reported
-      const reportedByCurrentUser = reports.some((r) => r.reportedById === ctx.user.id);
+      const reportedByCurrentUser = reports.some((r) => r.reportedById === user.id);
 
       return {
         ...booking,

From 82230d33e4cdc3dcd0efb597b00bb6098d0ffacf Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 03:03:01 +0530
Subject: [PATCH 34/54] refactor: feedback

---
 apps/web/components/dialog/ReportBookingDialog.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index b926e546eaed31..936a37be3f3c1e 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -1,4 +1,5 @@
 import type { Dispatch, SetStateAction } from "react";
+import { useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
 
 import { Dialog } from "@calcom/features/components/controlled-dialog";

From e2f5fba28161f88e34214b983083535bb4014c64 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 14:04:07 +0530
Subject: [PATCH 35/54] refactor: feedback

---
 .../components/dialog/ReportBookingDialog.tsx |   1 -
 apps/web/public/static/locales/en/common.json |   2 -
 .../booking-report.repository.interface.ts    |  22 +--
 .../bookings/lib/booking-report.repository.ts | 144 ++++++------------
 .../bookings/lib/booking-report.utils.ts      |   7 -
 .../migration.sql                             |   5 +-
 .../routers/viewer/bookings/get.handler.ts    |   9 +-
 7 files changed, 52 insertions(+), 138 deletions(-)
 delete mode 100644 packages/features/bookings/lib/booking-report.utils.ts
 rename packages/prisma/migrations/{20251007112732_add_booking_report => 20251008074026_add_booking_report}/migration.sql (87%)

diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
index 936a37be3f3c1e..b926e546eaed31 100644
--- a/apps/web/components/dialog/ReportBookingDialog.tsx
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -1,5 +1,4 @@
 import type { Dispatch, SetStateAction } from "react";
-import { useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
 
 import { Dialog } from "@calcom/features/components/controlled-dialog";
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 9a07f3ba7f54ea..f0d94ac052f35a 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -771,8 +771,6 @@
   "report_booking_will_cancel_description": "Reporting this booking will automatically cancel it",
   "add_to_report": "Add to report",
   "reported": "Reported",
-  "reported_by_you": "Reported by you",
-  "reported_count": "Reported ({{count}})",
   "continue": "Continue",
   "confirm": "Confirm",
   "confirm_all": "Confirm all",
diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
index bbc39c883d5a86..ac79ad190c57e7 100644
--- a/packages/features/bookings/lib/booking-report.repository.interface.ts
+++ b/packages/features/bookings/lib/booking-report.repository.interface.ts
@@ -2,7 +2,7 @@ import type { ReportReason } from "@calcom/prisma/enums";
 
 export interface CreateBookingReportInput {
   bookingId: number;
-  bookerEmail: string;
+  bookerEmail: string | null;
   reportedById: number;
   reason: ReportReason;
   description?: string;
@@ -18,23 +18,13 @@ export interface BookingReportSummary {
 }
 
 export interface IBookingReportRepository {
-  /**
-   * Creates a new booking report
-   */
   createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
 
-  /**
-   * Finds a report by a specific user for a specific booking
-   */
-  findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null>;
+  findReportForBooking(bookingId: number): Promise<BookingReportSummary | null>;
 
-  /**
-   * Finds all reports for a specific booking
-   */
-  findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]>;
 
-  /**
-   * Checks if a user has reported any booking in a recurring series
-   */
-  hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean>;
+  findAllReportedBookings(params: {
+    skip?: number;
+    take?: number;
+  }): Promise<BookingReportSummary[]>;
 }
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
index 7e6a4158c01379..6c2ac28d242b22 100644
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ b/packages/features/bookings/lib/booking-report.repository.ts
@@ -1,117 +1,59 @@
-import { captureException } from "@sentry/nextjs";
-
 import type { PrismaClient } from "@calcom/prisma";
-import type { ReportReason } from "@calcom/prisma/enums";
 
 import type {
-  BookingReportSummary,
-  CreateBookingReportInput,
   IBookingReportRepository,
+  CreateBookingReportInput,
+  BookingReportSummary,
 } from "./booking-report.repository.interface";
 
 export class BookingReportRepository implements IBookingReportRepository {
   constructor(private readonly prismaClient: PrismaClient) {}
 
-  /**
-   * Creates a new booking report
-   */
   async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
-    try {
-      const report = await this.prismaClient.bookingReport.create({
-        data: {
-          bookingId: input.bookingId,
-          bookerEmail: input.bookerEmail,
-          reportedById: input.reportedById,
-          reason: input.reason,
-          description: input.description,
-          cancelled: input.cancelled,
-        },
-        select: {
-          id: true,
-        },
-      });
-      return report;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
-  }
-
-  /**
-   * Finds a report by a specific user for a specific booking
-   * Uses the composite unique constraint (bookingId, reportedById)
-   */
-  async findUserReport(bookingId: number, userId: number): Promise<BookingReportSummary | null> {
-    try {
-      const report = await this.prismaClient.bookingReport.findUnique({
-        where: {
-          bookingId_reportedById: {
-            bookingId,
-            reportedById: userId,
-          },
-        },
-        select: {
-          id: true,
-          reportedById: true,
-          reason: true,
-          description: true,
-          createdAt: true,
-        },
-      });
-      return report;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
+    const report = await this.prismaClient.bookingReport.create({
+      data: {
+        bookingId: input.bookingId,
+        bookerEmail: input.bookerEmail ?? "",
+        reportedById: input.reportedById,
+        reason: input.reason,
+        description: input.description,
+        cancelled: input.cancelled,
+      },
+      select: { id: true },
+    });
+    return report;
   }
 
-  /**
-   * Finds all reports for a specific booking
-   */
-  async findAllReportsForBooking(bookingId: number): Promise<BookingReportSummary[]> {
-    try {
-      const reports = await this.prismaClient.bookingReport.findMany({
-        where: {
-          bookingId,
-        },
-        select: {
-          id: true,
-          reportedById: true,
-          reason: true,
-          description: true,
-          createdAt: true,
-        },
-        orderBy: {
-          createdAt: "asc",
-        },
-      });
-      return reports;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
+  async findReportForBooking(bookingId: number): Promise<BookingReportSummary | null> {
+    const report = await this.prismaClient.bookingReport.findUnique({
+      where: { bookingId },
+      select: {
+        id: true,
+        reportedById: true,
+        reason: true,
+        description: true,
+        createdAt: true,
+      },
+    });
+    return report;
   }
 
-  /**
-   * Checks if a user has reported any booking in a recurring series
-   */
-  async hasUserReportedSeries(recurringEventId: string, userId: number): Promise<boolean> {
-    try {
-      const report = await this.prismaClient.bookingReport.findFirst({
-        where: {
-          reportedById: userId,
-          booking: {
-            recurringEventId,
-          },
-        },
-        select: {
-          id: true,
-        },
-      });
-      return !!report;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
+  async findAllReportedBookings(params: {
+    skip?: number;
+    take?: number;
+  }): Promise<BookingReportSummary[]> {
+    const reports = await this.prismaClient.bookingReport.findMany({
+      skip: params.skip,
+      take: params.take,
+      select: {
+        id: true,
+        reportedById: true,
+        reason: true,
+        description: true,
+        createdAt: true,
+      },
+      orderBy: { createdAt: "desc" },
+    });
+    return reports;
   }
 }
diff --git a/packages/features/bookings/lib/booking-report.utils.ts b/packages/features/bookings/lib/booking-report.utils.ts
deleted file mode 100644
index fb799d71e43cd6..00000000000000
--- a/packages/features/bookings/lib/booking-report.utils.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Extracts the booker email from booking attendees
- * Convention: first attendee is the booker
- */
-export function extractBookerEmail(attendees: Array<{ email: string }>): string | null {
-  return attendees[0]?.email || null;
-}
diff --git a/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql b/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
similarity index 87%
rename from packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
index dc1369a0ceb59a..adf78cf9be492e 100644
--- a/packages/prisma/migrations/20251007112732_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
@@ -17,7 +17,7 @@ CREATE TABLE "BookingReport" (
 );
 
 -- CreateIndex
-CREATE INDEX "BookingReport_bookingId_idx" ON "BookingReport"("bookingId");
+CREATE UNIQUE INDEX "BookingReport_bookingId_key" ON "BookingReport"("bookingId");
 
 -- CreateIndex
 CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
@@ -31,9 +31,6 @@ CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
 -- CreateIndex
 CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
 
--- CreateIndex
-CREATE UNIQUE INDEX "BookingReport_bookingId_reportedById_key" ON "BookingReport"("bookingId", "reportedById");
-
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 0e38498b635a41..89912eaee30252 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -728,17 +728,12 @@ export async function getBookings({
         }
       }
 
-      const reports = await bookingReportRepo.findAllReportsForBooking(booking.id);
-
-      // Check if current user reported
-      const reportedByCurrentUser = reports.some((r) => r.reportedById === user.id);
+      const report = await bookingReportRepo.findReportForBooking(booking.id);
 
       return {
         ...booking,
         rescheduler,
-        reports,
-        reportedByCurrentUser,
-        reportCount: reports.length,
+        report,
         eventType: {
           ...booking.eventType,
           recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),

From 7f9252e08afc19c7fe983b84418609c9cf12b6b1 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 01:00:28 +0530
Subject: [PATCH 36/54] refactor: create service

---
 .../server/service/bookingAccessService.ts    | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 packages/lib/server/service/bookingAccessService.ts

diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/lib/server/service/bookingAccessService.ts
new file mode 100644
index 00000000000000..e4c633f9a4ae0e
--- /dev/null
+++ b/packages/lib/server/service/bookingAccessService.ts
@@ -0,0 +1,68 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+import { BookingRepository } from "../repository/booking";
+import { UserRepository } from "../repository/user";
+
+export class BookingAccessService {
+  constructor(private prismaClient: PrismaClient) {}
+
+  /**
+   * Determines if a user has access to a booking based on:
+   * 1. Being the booking organizer
+   * 2. Being a team/org admin where the event type belongs
+   * 3. Being an org admin where the booking organizer belongs (for personal bookings)
+   * 4. Being a team admin of any team the booking organizer belongs to (for personal bookings)
+   */
+  async doesUserIdHaveAccessToBooking({
+    userId,
+    bookingId,
+  }: {
+    userId: number;
+    bookingId: number;
+  }): Promise<boolean> {
+    const bookingRepo = new BookingRepository(this.prismaClient);
+    const userRepo = new UserRepository(this.prismaClient);
+
+    const booking = await bookingRepo.getBookingWithEventTypeTeamId({ bookingId });
+
+    if (!booking) return false;
+
+    // User is the organizer
+    if (userId === booking.userId) return true;
+
+    // If booking has a teamId, check if user is admin of that team/org
+    if (booking.eventType?.teamId) {
+      const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: booking.eventType.teamId,
+      });
+      return isAdminOrUser;
+    }
+
+    if (!booking.userId) return false;
+
+    const bookingOwner = await userRepo.getUserOrganizationAndTeams({ userId: booking.userId });
+
+    if (!bookingOwner) return false;
+
+    // Check if user is admin of booking organizer's organization
+    if (bookingOwner.organizationId) {
+      const isOrgAdmin = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: bookingOwner.organizationId,
+      });
+      if (isOrgAdmin) return true;
+    }
+
+    // Check if user is admin of any team the booking organizer belongs to
+    for (const membership of bookingOwner.teams) {
+      const isTeamAdmin = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: membership.teamId,
+      });
+      if (isTeamAdmin) return true;
+    }
+
+    return false;
+  }
+}

From bdb56534be77dfbbff01a69e42c846793ed39373 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Fri, 10 Oct 2025 02:23:29 +0530
Subject: [PATCH 37/54] feat: org admin table

---
 .../SettingsLayoutAppDirClient.tsx            |  11 +-
 .../(org-admin-only)/privacy/loading.tsx      |   5 +
 .../(org-admin-only)/privacy/page.tsx         |   4 +-
 .../privacy/booking-reports-table.tsx         | 197 ++++++++++++++++++
 .../components/add-to-watchlist-modal.tsx     | 140 +++++++++++++
 apps/web/public/static/locales/en/common.json |  22 ++
 .../data-table/hooks/useDebouncedWidth.ts     |   4 +-
 .../organizations/pages/settings/privacy.tsx  |  36 +++-
 .../repository/bookingReport.interface.ts     |  57 ++++-
 .../lib/server/repository/bookingReport.ts    | 124 +++++++++--
 .../server/repository/watchlist.interface.ts  |  32 +++
 .../server/repository/watchlist.repository.ts |  65 ++++++
 .../migration.sql                             |   2 +
 .../routers/viewer/organizations/_router.tsx  |  12 ++
 .../organizations/addToWatchlist.handler.ts   |  84 ++++++++
 .../organizations/addToWatchlist.schema.ts    |  13 ++
 .../listBookingReports.handler.ts             |  40 ++++
 .../listBookingReports.schema.ts              |  24 +++
 18 files changed, 846 insertions(+), 26 deletions(-)
 create mode 100644 apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
 create mode 100644 packages/lib/server/repository/watchlist.interface.ts
 create mode 100644 packages/lib/server/repository/watchlist.repository.ts
 create mode 100644 packages/prisma/migrations/20251009201049_add_reported_by/migration.sql
 create mode 100644 packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts

diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
index 39b11ab8c19c3a..43190417291565 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
@@ -98,7 +98,7 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
             ]
           : []),
         {
-          name: "privacy",
+          name: "privacy_and_security",
           href: "/settings/organizations/privacy",
         },
 
@@ -170,7 +170,14 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
 // The following keys are assigned to admin only
 const adminRequiredKeys = ["admin"];
 const organizationRequiredKeys = ["organization"];
-const organizationAdminKeys = ["privacy", "OAuth Clients", "SSO", "directory_sync", "delegation_credential"];
+const organizationAdminKeys = [
+  "privacy",
+  "privacy_and_security",
+  "OAuth Clients",
+  "SSO",
+  "directory_sync",
+  "delegation_credential",
+];
 
 export interface SettingsPermissions {
   canViewRoles?: boolean;
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx
new file mode 100644
index 00000000000000..f8ab779db0f2da
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx
@@ -0,0 +1,5 @@
+import { DataTableSkeleton } from "@calcom/features/data-table";
+
+export default function Loading() {
+  return <DataTableSkeleton />;
+}
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
index 8200641230a743..71776120648786 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
@@ -11,7 +11,7 @@ import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
-    (t) => t("privacy"),
+    (t) => t("privacy_and_security"),
     (t) => t("privacy_organization_description"),
     undefined,
     undefined,
@@ -47,7 +47,7 @@ const Page = async () => {
   }
 
   return (
-    <SettingsHeader title={t("privacy")} description={t("privacy_organization_description")}>
+    <SettingsHeader title={t("privacy_and_security")} description={t("privacy_organization_description")}>
       <PrivacyView permissions={{ canRead, canEdit }} />
     </SettingsHeader>
   );
diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
new file mode 100644
index 00000000000000..999efcca36840a
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -0,0 +1,197 @@
+"use client";
+
+import { keepPreviousData } from "@tanstack/react-query";
+import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
+import { useMemo, useState } from "react";
+import { format } from "date-fns";
+
+import {
+  DataTableWrapper,
+  DataTableToolbar,
+  ColumnFilterType,
+  useDataTable,
+} from "@calcom/features/data-table";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+
+import { AddToWatchlistModal } from "./components/add-to-watchlist-modal";
+
+type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+
+export function BookingReportsTable() {
+  const { t } = useLocale();
+  const { limit, offset, searchTerm } = useDataTable();
+
+  const [selectedReport, setSelectedReport] = useState<BookingReport | null>(null);
+  const [showWatchlistModal, setShowWatchlistModal] = useState(false);
+
+  const { data, isPending } = trpc.viewer.organizations.listBookingReports.useQuery(
+    {
+      limit,
+      offset,
+      searchTerm,
+      filters: {},
+    },
+    {
+      placeholderData: keepPreviousData,
+    }
+  );
+
+  const totalRowCount = data?.meta?.totalRowCount ?? 0;
+  const flatData = useMemo<BookingReport[]>(() => data?.rows ?? [], [data]);
+
+  const columns = useMemo<ColumnDef<BookingReport>[]>(
+    () => [
+      {
+        id: "bookerEmail",
+        header: t("booker_email"),
+        accessorKey: "bookerEmail",
+        size: 200,
+        cell: ({ row }) => <span className="font-medium">{row.original.bookerEmail}</span>,
+      },
+      {
+        id: "reporter",
+        header: t("reported_by"),
+        accessorFn: (row) => row.reporter.name || row.reporter.email,
+        size: 150,
+        cell: ({ row }) => (
+          <span className="text-default">{row.original.reporter.name || row.original.reporter.email}</span>
+        ),
+      },
+      {
+        id: "reason",
+        header: t("reason"),
+        accessorKey: "reason",
+        size: 120,
+        meta: {
+          filter: {
+            type: ColumnFilterType.MULTI_SELECT,
+          },
+        },
+        cell: ({ row }) => {
+          const reasonColors: Record<string, "red" | "orange" | "gray"> = {
+            SPAM: "red",
+            DONT_KNOW_PERSON: "orange",
+            OTHER: "gray",
+          };
+          return (
+            <Badge variant={reasonColors[row.original.reason] || "gray"}>
+              {t(row.original.reason.toLowerCase())}
+            </Badge>
+          );
+        },
+      },
+      {
+        id: "description",
+        header: t("description"),
+        accessorKey: "description",
+        size: 250,
+        cell: ({ row }) => {
+          const desc = row.original.description;
+          if (!desc) return <span className="text-subtle">—</span>;
+          return (
+            <span className="text-default truncate" title={desc}>
+              {desc}
+            </span>
+          );
+        },
+      },
+      {
+        id: "bookingDate",
+        header: t("booking_date"),
+        accessorFn: (row) => row.booking.startTime,
+        size: 180,
+        cell: ({ row }) => (
+          <span className="text-default">{format(new Date(row.original.booking.startTime), "PPP")}</span>
+        ),
+      },
+      {
+        id: "reportedAt",
+        header: t("reported_at"),
+        accessorKey: "createdAt",
+        size: 200,
+        cell: ({ row }) => (
+          <span className="text-default">{format(new Date(row.original.createdAt), "PPp")}</span>
+        ),
+      },
+      {
+        id: "cancelled",
+        header: t("cancelled"),
+        accessorKey: "cancelled",
+        size: 120,
+        meta: {
+          filter: {
+            type: ColumnFilterType.SINGLE_SELECT,
+          },
+        },
+        cell: ({ row }) => (
+          <Badge variant={row.original.cancelled ? "green" : "gray"}>
+            {row.original.cancelled ? t("yes") : t("no")}
+          </Badge>
+        ),
+      },
+      {
+        id: "actions",
+        header: "",
+        size: 150,
+        enableResizing: false,
+        cell: ({ row }) => {
+          if (row.original.watchlistId) {
+            return null;
+          }
+          return (
+            <Button
+              size="sm"
+              variant="outline"
+              onClick={() => {
+                setSelectedReport(row.original);
+                setShowWatchlistModal(true);
+              }}>
+              {t("add_to_watchlist")}
+            </Button>
+          );
+        },
+      },
+    ],
+    [t]
+  );
+
+  const table = useReactTable({
+    data: flatData,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    manualPagination: true,
+    getRowId: (row) => row.id,
+  });
+
+  return (
+    <>
+      <DataTableWrapper
+        table={table}
+        isPending={isPending}
+        paginationMode="standard"
+        totalRowCount={totalRowCount}
+        ToolbarLeft={
+          <>
+            <DataTableToolbar.SearchBar />
+          </>
+        }
+      />
+
+      {selectedReport && (
+        <AddToWatchlistModal
+          open={showWatchlistModal}
+          onClose={() => {
+            setShowWatchlistModal(false);
+            setSelectedReport(null);
+          }}
+          report={selectedReport}
+        />
+      )}
+    </>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
new file mode 100644
index 00000000000000..19556d9f374848
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
@@ -0,0 +1,140 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useState, useMemo } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+import { trpc } from "@calcom/trpc";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogHeader, DialogFooter } from "@calcom/ui/components/dialog";
+import { Form, Label, TextField, Select, TextAreaField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+
+type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+
+interface AddToWatchlistModalProps {
+  open: boolean;
+  onClose: () => void;
+  report: BookingReport;
+}
+
+const formSchema = z.object({
+  type: z.nativeEnum(WatchlistType),
+  value: z.string().min(1, "Value is required"),
+  action: z.nativeEnum(WatchlistAction),
+  description: z.string().optional(),
+});
+
+type FormValues = z.infer<typeof formSchema>;
+
+export function AddToWatchlistModal({ open, onClose, report }: AddToWatchlistModalProps) {
+  const { t } = useLocale();
+  const utils = trpc.useUtils();
+
+  const form = useForm<FormValues>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+      type: WatchlistType.EMAIL,
+      value: report.bookerEmail,
+      action: WatchlistAction.REPORT,
+      description: "",
+    },
+  });
+
+  const watchlistType = form.watch("type");
+
+  useMemo(() => {
+    if (watchlistType === WatchlistType.EMAIL) {
+      form.setValue("value", report.bookerEmail);
+    } else if (watchlistType === WatchlistType.DOMAIN) {
+      const domain = report.bookerEmail.split("@")[1];
+      form.setValue("value", domain || "");
+    }
+  }, [watchlistType, report.bookerEmail, form]);
+
+  const addToWatchlistMutation = trpc.viewer.organizations.addToWatchlist.useMutation({
+    onSuccess: () => {
+      showToast(t("successfully_added_to_watchlist"), "success");
+      utils.viewer.organizations.listBookingReports.invalidate();
+      onClose();
+      form.reset();
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
+  const onSubmit = (data: FormValues) => {
+    addToWatchlistMutation.mutate({
+      reportId: report.id,
+      type: data.type,
+      value: data.value,
+      action: data.action,
+      description: data.description,
+    });
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
+      <DialogContent enableOverflow>
+        <DialogHeader title={t("add_to_watchlist")} subtitle={t("add_booker_to_organization_watchlist")} />
+
+        <Form form={form} handleSubmit={onSubmit}>
+          <div className="space-y-4">
+            <div>
+              <Label>{t("watchlist_type")}</Label>
+              <Select
+                options={[
+                  { label: t("email"), value: WatchlistType.EMAIL },
+                  { label: t("domain"), value: WatchlistType.DOMAIN },
+                ]}
+                {...form.register("type")}
+              />
+            </div>
+
+            <TextField {...form.register("value")} placeholder={t("enter_value")} />
+
+            <div>
+              <Label>{t("action")}</Label>
+              <Select
+                options={[
+                  {
+                    label: t("report_action"),
+                    value: WatchlistAction.REPORT,
+                    description: t("auto_report_future_bookings"),
+                  },
+                  {
+                    label: t("block_action"),
+                    value: WatchlistAction.BLOCK,
+                    description: t("block_from_making_bookings"),
+                  },
+                  {
+                    label: t("alert_action"),
+                    value: WatchlistAction.ALERT,
+                    description: t("alert_admins_on_booking_attempts"),
+                  },
+                ]}
+                {...form.register("action")}
+              />
+            </div>
+
+            <TextAreaField {...form.register("description")} placeholder={t("add_optional_notes")} rows={3} />
+          </div>
+
+          <DialogFooter>
+            <Button type="button" color="minimal" onClick={onClose}>
+              {t("cancel")}
+            </Button>
+            <Button type="submit" loading={addToWatchlistMutation.isPending}>
+              {t("add_to_watchlist")}
+            </Button>
+          </DialogFooter>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index f0d94ac052f35a..8a426aeba6cc34 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -2853,6 +2853,28 @@
   "organization_price_per_user_month": "$37 per user per month",
   "privacy_organization_description": "Manage privacy settings for your organization",
   "privacy": "Privacy",
+  "privacy_and_security": "Privacy & Security",
+  "privacy_settings": "Privacy Settings",
+  "booking_reports": "Booking Reports",
+  "booking_reports_description": "View and manage reports from organization members about suspicious or unwanted bookings",
+  "booker_email": "Booker Email",
+  "reported_by": "Reported By",
+  "reported_at": "Reported At",
+  "booking_date": "Booking Date",
+  "add_to_watchlist": "Add to Watchlist",
+  "not_in_watchlist": "Not in Watchlist",
+  "successfully_added_to_watchlist": "Successfully added to watchlist",
+  "add_booker_to_organization_watchlist": "Add booker to your organization's watchlist",
+  "watchlist_type": "Watchlist Type",
+  "enter_value": "Enter value",
+  "report_action": "Report",
+  "block_action": "Block",
+  "alert_action": "Alert",
+  "auto_report_future_bookings": "Auto-report future bookings from this source",
+  "block_from_making_bookings": "Block from making bookings",
+  "alert_admins_on_booking_attempts": "Alert admins on booking attempts",
+  "description_optional": "Description (Optional)",
+  "add_optional_notes": "Add optional notes about this entry",
   "team_will_be_under_org": "New teams will be under your organization",
   "add_group_name": "Add group name",
   "group_name": "Group Name",
diff --git a/packages/features/data-table/hooks/useDebouncedWidth.ts b/packages/features/data-table/hooks/useDebouncedWidth.ts
index 11019e03c31d99..60db166b9e1ff8 100644
--- a/packages/features/data-table/hooks/useDebouncedWidth.ts
+++ b/packages/features/data-table/hooks/useDebouncedWidth.ts
@@ -1,4 +1,6 @@
-// eslint-disable-next-line no-restricted-imports
+"use client";
+
+
 import debounce from "lodash/debounce";
 import { useState, useEffect } from "react";
 
diff --git a/packages/features/ee/organizations/pages/settings/privacy.tsx b/packages/features/ee/organizations/pages/settings/privacy.tsx
index 191fe1e85531ba..cde7c0986a4bc1 100644
--- a/packages/features/ee/organizations/pages/settings/privacy.tsx
+++ b/packages/features/ee/organizations/pages/settings/privacy.tsx
@@ -1,10 +1,16 @@
 "use client";
 
+import { DataTableProvider } from "@calcom/features/data-table";
+import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import MakeTeamPrivateSwitch from "@calcom/features/ee/teams/components/MakeTeamPrivateSwitch";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 
+import { BookingReportsTable } from "~/settings/organizations/privacy/booking-reports-table";
+
 const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit: boolean } }) => {
+  const { t } = useLocale();
   const { data: currentOrg } = trpc.viewer.organizations.listCurrent.useQuery();
   const isInviteOpen = !currentOrg?.user.accepted;
 
@@ -14,13 +20,29 @@ const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit
 
   return (
     <LicenseRequired>
-      <div>
-        <MakeTeamPrivateSwitch
-          isOrg={true}
-          teamId={currentOrg.id}
-          isPrivate={currentOrg.isPrivate}
-          disabled={isDisabled}
-        />
+      <div className="space-y-8">
+        <div>
+          <h2 className="text-emphasis mb-2 text-base font-semibold leading-6">{t("privacy_settings")}</h2>
+          <MakeTeamPrivateSwitch
+            isOrg={true}
+            teamId={currentOrg.id}
+            isPrivate={currentOrg.isPrivate}
+            disabled={isDisabled}
+          />
+        </div>
+
+        {/* Booking Reports Section */}
+        {permissions.canEdit && (
+          <div>
+            <h2 className="text-emphasis mb-2 text-base font-semibold leading-6">
+              {t("booking_reports")}
+            </h2>
+            <p className="text-default mb-4 text-sm">{t("booking_reports_description")}</p>
+            <DataTableProvider useSegments={useSegments} defaultPageSize={25}>
+              <BookingReportsTable />
+            </DataTableProvider>
+          </div>
+        )}
       </div>
     </LicenseRequired>
   );
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index 9d74cf9174b8a6..7a2986eabfeddb 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -1,4 +1,4 @@
-import type { BookingReportReason } from "@calcom/prisma/enums";
+import type { BookingReportReason, WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
 
 export interface CreateBookingReportInput {
   bookingUid: string;
@@ -18,8 +18,61 @@ export interface BookingReportSummary {
   createdAt: Date;
 }
 
+export interface BookingReportWithDetails {
+  id: string;
+  bookingId: number;
+  bookerEmail: string;
+  reportedById: number;
+  reason: ReportReason;
+  description: string | null;
+  cancelled: boolean;
+  createdAt: Date;
+  watchlistId: string | null;
+
+  reporter: {
+    id: number;
+    name: string | null;
+    email: string;
+  };
+  booking: {
+    id: number;
+    startTime: Date;
+    endTime: Date;
+    title: string | null;
+    uid: string;
+  };
+  watchlist: {
+    id: string;
+    type: WatchlistType;
+    value: string;
+    action: WatchlistAction;
+    description: string | null;
+  } | null;
+}
+
+export interface ListBookingReportsFilters {
+  reason?: ReportReason[];
+  cancelled?: boolean;
+  hasWatchlist?: boolean;
+  dateRange?: {
+    from?: Date;
+    to?: Date;
+  };
+}
+
 export interface IBookingReportRepository {
   createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
 
-  findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]>;
+  findAllReportedBookings(params: {
+    organizationId: number;
+    skip?: number;
+    take?: number;
+    searchTerm?: string;
+    filters?: ListBookingReportsFilters;
+  }): Promise<{
+    rows: BookingReportWithDetails[];
+    meta: { totalRowCount: number };
+  }>;
+
+  linkWatchlistToReport(params: { reportId: string; watchlistId: string }): Promise<void>;
 }
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index f9ef5c9c2efe37..64fd703e42015e 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -4,6 +4,8 @@ import type {
   IBookingReportRepository,
   CreateBookingReportInput,
   BookingReportSummary,
+  BookingReportWithDetails,
+  ListBookingReportsFilters,
 } from "./bookingReport.interface";
 
 export class PrismaBookingReportRepository implements IBookingReportRepository {
@@ -25,19 +27,117 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
     return report;
   }
 
-  async findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]> {
-    const reports = await this.prismaClient.bookingReport.findMany({
-      skip: params.skip,
-      take: params.take,
-      select: {
-        id: true,
-        reportedById: true,
-        reason: true,
-        description: true,
-        createdAt: true,
+  async findAllReportedBookings(params: {
+    organizationId: number;
+    skip?: number;
+    take?: number;
+    searchTerm?: string;
+    filters?: ListBookingReportsFilters;
+  }): Promise<{
+    rows: BookingReportWithDetails[];
+    meta: { totalRowCount: number };
+  }> {
+    const where: any = {
+      reportedBy: {
+        organizationId: params.organizationId,
       },
-      orderBy: { createdAt: "desc" },
+    };
+
+    if (params.searchTerm) {
+      where.OR = [
+        { bookerEmail: { contains: params.searchTerm, mode: "insensitive" } },
+        { description: { contains: params.searchTerm, mode: "insensitive" } },
+        {
+          reportedBy: {
+            OR: [
+              { name: { contains: params.searchTerm, mode: "insensitive" } },
+              { email: { contains: params.searchTerm, mode: "insensitive" } },
+            ],
+          },
+        },
+      ];
+    }
+
+    if (params.filters) {
+      if (params.filters.reason && params.filters.reason.length > 0) {
+        where.reason = { in: params.filters.reason };
+      }
+      if (params.filters.cancelled !== undefined) {
+        where.cancelled = params.filters.cancelled;
+      }
+      if (params.filters.hasWatchlist !== undefined) {
+        where.watchlistId = params.filters.hasWatchlist ? { not: null } : null;
+      }
+      if (params.filters.dateRange) {
+        where.createdAt = {};
+        if (params.filters.dateRange.from) {
+          where.createdAt.gte = params.filters.dateRange.from;
+        }
+        if (params.filters.dateRange.to) {
+          where.createdAt.lte = params.filters.dateRange.to;
+        }
+      }
+    }
+
+    const [totalCount, reports] = await Promise.all([
+      this.prismaClient.bookingReport.count({ where }),
+      this.prismaClient.bookingReport.findMany({
+        where,
+        skip: params.skip,
+        take: params.take,
+        select: {
+          id: true,
+          bookingId: true,
+          bookerEmail: true,
+          reportedById: true,
+          reason: true,
+          description: true,
+          cancelled: true,
+          createdAt: true,
+          watchlistId: true,
+          reportedBy: {
+            select: {
+              id: true,
+              name: true,
+              email: true,
+            },
+          },
+          booking: {
+            select: {
+              id: true,
+              startTime: true,
+              endTime: true,
+              title: true,
+              uid: true,
+            },
+          },
+          watchlist: {
+            select: {
+              id: true,
+              type: true,
+              value: true,
+              action: true,
+              description: true,
+            },
+          },
+        },
+        orderBy: { createdAt: "desc" },
+      }),
+    ]);
+
+    return {
+      rows: reports.map((report) => ({
+        ...report,
+        reporter: report.reportedBy,
+      })),
+      meta: { totalRowCount: totalCount },
+    };
+  }
+
+  async linkWatchlistToReport(params: { reportId: string; watchlistId: string }): Promise<void> {
+    await this.prismaClient.bookingReport.update({
+      where: { id: params.reportId },
+      data: { watchlistId: params.watchlistId },
     });
-    return reports;
   }
 }
diff --git a/packages/lib/server/repository/watchlist.interface.ts b/packages/lib/server/repository/watchlist.interface.ts
new file mode 100644
index 00000000000000..0bd1612ff81256
--- /dev/null
+++ b/packages/lib/server/repository/watchlist.interface.ts
@@ -0,0 +1,32 @@
+import type { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
+
+export interface WatchlistEntry {
+  id: string;
+  type: WatchlistType;
+  value: string;
+  action: WatchlistAction;
+  description: string | null;
+  organizationId: number | null;
+  isGlobal: boolean;
+  source: WatchlistSource;
+}
+
+export interface CreateWatchlistInput {
+  type: WatchlistType;
+  value: string;
+  organizationId: number;
+  action: WatchlistAction;
+  description?: string;
+  userId: number;
+}
+
+export interface CheckWatchlistInput {
+  type: WatchlistType;
+  value: string;
+  organizationId: number;
+}
+
+export interface IWatchlistRepository {
+  createEntry(params: CreateWatchlistInput): Promise<{ id: string }>;
+  checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null>;
+}
diff --git a/packages/lib/server/repository/watchlist.repository.ts b/packages/lib/server/repository/watchlist.repository.ts
new file mode 100644
index 00000000000000..21ce000d34fede
--- /dev/null
+++ b/packages/lib/server/repository/watchlist.repository.ts
@@ -0,0 +1,65 @@
+import type { PrismaClient } from "@calcom/prisma";
+import { WatchlistSource } from "@calcom/prisma/enums";
+
+import type {
+  IWatchlistRepository,
+  CreateWatchlistInput,
+  CheckWatchlistInput,
+  WatchlistEntry,
+} from "./watchlist.interface";
+
+export class WatchlistRepository implements IWatchlistRepository {
+  constructor(private readonly prismaClient: PrismaClient) {}
+
+  async createEntry(params: CreateWatchlistInput): Promise<{ id: string }> {
+    const existing = await this.checkExists({
+      type: params.type,
+      value: params.value,
+      organizationId: params.organizationId,
+    });
+
+    if (existing) {
+      throw new Error("Watchlist entry already exists for this organization");
+    }
+
+    const watchlist = await this.prismaClient.watchlist.create({
+      data: {
+        type: params.type,
+        value: params.value,
+        organizationId: params.organizationId,
+        action: params.action,
+        description: params.description,
+        source: WatchlistSource.MANUAL,
+        isGlobal: false,
+      },
+      select: { id: true },
+    });
+
+    await this.prismaClient.watchlistAudit.create({
+      data: {
+        watchlistId: watchlist.id,
+        type: params.type,
+        value: params.value,
+        description: params.description,
+        action: params.action,
+        changedByUserId: params.userId,
+      },
+    });
+
+    return watchlist;
+  }
+
+  async checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null> {
+    const entry = await this.prismaClient.watchlist.findUnique({
+      where: {
+        type_value_organizationId: {
+          type: params.type,
+          value: params.value,
+          organizationId: params.organizationId,
+        },
+      },
+    });
+
+    return entry;
+  }
+}
diff --git a/packages/prisma/migrations/20251009201049_add_reported_by/migration.sql b/packages/prisma/migrations/20251009201049_add_reported_by/migration.sql
new file mode 100644
index 00000000000000..4de19c74dbcaa5
--- /dev/null
+++ b/packages/prisma/migrations/20251009201049_add_reported_by/migration.sql
@@ -0,0 +1,2 @@
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/trpc/server/routers/viewer/organizations/_router.tsx b/packages/trpc/server/routers/viewer/organizations/_router.tsx
index 87f29de4ffeb76..16437842687676 100644
--- a/packages/trpc/server/routers/viewer/organizations/_router.tsx
+++ b/packages/trpc/server/routers/viewer/organizations/_router.tsx
@@ -9,6 +9,7 @@ import { router } from "../../../trpc";
 import { eventOwnerProcedure } from "../eventTypes/util";
 import { ZAddMembersToEventTypes } from "./addMembersToEventTypes.schema";
 import { ZAddMembersToTeams } from "./addMembersToTeams.schema";
+import { ZAddToWatchlistInputSchema } from "./addToWatchlist.schema";
 import { ZAdminDeleteInput } from "./adminDelete.schema";
 import { ZAdminGet } from "./adminGet.schema";
 import { ZAdminUpdate } from "./adminUpdate.schema";
@@ -23,6 +24,7 @@ import { ZGetMembersInput } from "./getMembers.schema";
 import { ZGetOtherTeamInputSchema } from "./getOtherTeam.handler";
 import { ZGetUserInput } from "./getUser.schema";
 import { ZIntentToCreateOrgInputSchema } from "./intentToCreateOrg.schema";
+import { ZListBookingReportsInputSchema } from "./listBookingReports.schema";
 import { ZListMembersInputSchema } from "./listMembers.schema";
 import { ZListOtherTeamMembersSchema } from "./listOtherTeamMembers.handler";
 import { ZRemoveHostsFromEventTypes } from "./removeHostsFromEventTypes.schema";
@@ -163,4 +165,14 @@ export const viewerOrganizationsRouter = router({
     const { default: handler } = await import("./createSelfHosted.handler");
     return handler(opts);
   }),
+  listBookingReports: authedOrgAdminProcedure
+    .input(ZListBookingReportsInputSchema)
+    .query(async (opts) => {
+      const { default: handler } = await import("./listBookingReports.handler");
+      return handler(opts);
+    }),
+  addToWatchlist: authedOrgAdminProcedure.input(ZAddToWatchlistInputSchema).mutation(async (opts) => {
+    const { default: handler } = await import("./addToWatchlist.handler");
+    return handler(opts);
+  }),
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
new file mode 100644
index 00000000000000..88d2dced37c85c
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
@@ -0,0 +1,84 @@
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../../trpc";
+import type { TAddToWatchlistInputSchema } from "./addToWatchlist.schema";
+
+type AddToWatchlistOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TAddToWatchlistInputSchema;
+};
+
+export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage watchlist",
+    });
+  }
+
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+  const watchlistRepo = new WatchlistRepository(prisma);
+
+  const reports = await bookingReportRepo.findAllReportedBookings({
+    organizationId,
+    skip: 0,
+    take: 1,
+    filters: undefined,
+  });
+
+  const report = reports.rows.find((r) => r.id === input.reportId);
+  if (!report) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: "Booking report not found or does not belong to your organization",
+    });
+  }
+
+  if (report.watchlistId) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "This booker is already in the watchlist",
+    });
+  }
+
+  try {
+    const watchlist = await watchlistRepo.createEntry({
+      type: input.type,
+      value: input.value,
+      organizationId,
+      action: input.action,
+      description: input.description,
+      userId: user.id,
+    });
+
+    await bookingReportRepo.linkWatchlistToReport({
+      reportId: input.reportId,
+      watchlistId: watchlist.id,
+    });
+
+    return {
+      success: true,
+      message: "Successfully added to watchlist",
+      watchlistId: watchlist.id,
+    };
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("already exists")) {
+      throw new TRPCError({
+        code: "BAD_REQUEST",
+        message: "This entry already exists in the watchlist for your organization",
+      });
+    }
+    throw error;
+  }
+};
+
+export default addToWatchlistHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
new file mode 100644
index 00000000000000..a329c9c2e2a91d
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+
+export const ZAddToWatchlistInputSchema = z.object({
+  reportId: z.string().uuid(),
+  type: z.nativeEnum(WatchlistType),
+  value: z.string().min(1),
+  action: z.nativeEnum(WatchlistAction),
+  description: z.string().optional(),
+});
+
+export type TAddToWatchlistInputSchema = z.infer<typeof ZAddToWatchlistInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
new file mode 100644
index 00000000000000..53dfe9144660a1
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
@@ -0,0 +1,40 @@
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { prisma } from "@calcom/prisma";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../../trpc";
+import type { TListBookingReportsInputSchema } from "./listBookingReports.schema";
+
+type ListBookingReportsOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TListBookingReportsInputSchema;
+};
+
+export const listBookingReportsHandler = async ({ ctx, input }: ListBookingReportsOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to view booking reports",
+    });
+  }
+
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+
+  const result = await bookingReportRepo.findAllReportedBookings({
+    organizationId,
+    skip: input.offset,
+    take: input.limit,
+    searchTerm: input.searchTerm,
+    filters: input.filters,
+  });
+
+  return result;
+};
+
+export default listBookingReportsHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
new file mode 100644
index 00000000000000..e2a3e348f1ed3a
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+import { ReportReason } from "@calcom/prisma/enums";
+
+export const ZListBookingReportsInputSchema = z.object({
+  limit: z.number().min(1).max(100).optional(),
+  offset: z.number().min(0).optional(),
+  searchTerm: z.string().optional(),
+  filters: z
+    .object({
+      reason: z.array(z.nativeEnum(ReportReason)).optional(),
+      cancelled: z.boolean().optional(),
+      hasWatchlist: z.boolean().optional(),
+      dateRange: z
+        .object({
+          from: z.coerce.date().optional(),
+          to: z.coerce.date().optional(),
+        })
+        .optional(),
+    })
+    .optional(),
+});
+
+export type TListBookingReportsInputSchema = z.infer<typeof ZListBookingReportsInputSchema>;

From 4756f8b5dfc8d5f25f64119c3091a0740bfa4e5d Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 00:51:16 +0530
Subject: [PATCH 38/54] fix: feedback

---
 .../server/service/bookingAccessService.ts    | 38 ++++++++++++++---
 .../migration.sql                             | 41 +++++++++++++++++++
 2 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 packages/prisma/migrations/20251011182311_add_booking_report/migration.sql

diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/lib/server/service/bookingAccessService.ts
index e4c633f9a4ae0e..9909b0c8a245d5 100644
--- a/packages/lib/server/service/bookingAccessService.ts
+++ b/packages/lib/server/service/bookingAccessService.ts
@@ -3,15 +3,42 @@ import type { PrismaClient } from "@calcom/prisma";
 import { BookingRepository } from "../repository/booking";
 import { UserRepository } from "../repository/user";
 
+type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["getBookingForAccessCheck"]>>>;
+
 export class BookingAccessService {
   constructor(private prismaClient: PrismaClient) {}
 
+  private isUserAHost(userId: number, booking: BookingForAccessCheck): boolean {
+    const hostMap = new Map<number, { id: number; email: string }>();
+
+    const addHost = (id: number, email: string) => {
+      if (!hostMap.has(id)) {
+        hostMap.set(id, { id, email });
+      }
+    };
+
+    booking?.eventType?.hosts?.forEach((host) => addHost(host.userId, host.user.email));
+    booking?.eventType?.users?.forEach((user) => addHost(user.id, user.email));
+
+    if (booking?.user?.id && booking?.user?.email) {
+      addHost(booking.user.id, booking.user.email);
+    }
+
+    const attendeeEmails = new Set(booking.attendees?.map((attendee) => attendee.email));
+    const filteredHosts = Array.from(hostMap.values()).filter(
+      (host) => attendeeEmails.has(host.email) || host.id === booking.user?.id
+    );
+
+    return filteredHosts.some((host) => host.id === userId);
+  }
+
   /**
    * Determines if a user has access to a booking based on:
    * 1. Being the booking organizer
-   * 2. Being a team/org admin where the event type belongs
-   * 3. Being an org admin where the booking organizer belongs (for personal bookings)
-   * 4. Being a team admin of any team the booking organizer belongs to (for personal bookings)
+   * 2. Being one of the hosts in a multi-host booking
+   * 3. Being a team/org admin where the event type belongs
+   * 4. Being an org admin where the booking organizer belongs (for personal bookings)
+   * 5. Being a team admin of any team the booking organizer belongs to (for personal bookings)
    */
   async doesUserIdHaveAccessToBooking({
     userId,
@@ -23,13 +50,14 @@ export class BookingAccessService {
     const bookingRepo = new BookingRepository(this.prismaClient);
     const userRepo = new UserRepository(this.prismaClient);
 
-    const booking = await bookingRepo.getBookingWithEventTypeTeamId({ bookingId });
+    const booking = await bookingRepo.getBookingForAccessCheck({ bookingId });
 
     if (!booking) return false;
 
-    // User is the organizer
     if (userId === booking.userId) return true;
 
+    if (this.isUserAHost(userId, booking)) return true;
+
     // If booking has a teamId, check if user is admin of that team/org
     if (booking.eventType?.teamId) {
       const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
diff --git a/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql b/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
new file mode 100644
index 00000000000000..adf78cf9be492e
--- /dev/null
+++ b/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
@@ -0,0 +1,41 @@
+-- CreateEnum
+CREATE TYPE "ReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
+
+-- CreateTable
+CREATE TABLE "BookingReport" (
+    "id" UUID NOT NULL,
+    "bookingId" INTEGER NOT NULL,
+    "bookerEmail" TEXT NOT NULL,
+    "reportedById" INTEGER NOT NULL,
+    "reason" "ReportReason" NOT NULL,
+    "description" TEXT,
+    "cancelled" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "watchlistId" UUID,
+
+    CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "BookingReport_bookingId_key" ON "BookingReport"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;

From d84fd4db400177e68d6cab1df4cb2d91751831c1 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 01:24:37 +0530
Subject: [PATCH 39/54] fix: schema

---
 packages/lib/server/repository/bookingReport.interface.ts  | 4 ++--
 .../migration.sql                                          | 7 +++++++
 .../routers/viewer/bookings/reportBooking.handler.ts       | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)
 rename packages/prisma/migrations/{20251011182311_add_booking_report => 20251011193952_add_booking_report}/migration.sql (82%)

diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index 7a2986eabfeddb..9bb38ca6cc439f 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -23,7 +23,7 @@ export interface BookingReportWithDetails {
   bookingId: number;
   bookerEmail: string;
   reportedById: number;
-  reason: ReportReason;
+  reason: BookingReportReason;
   description: string | null;
   cancelled: boolean;
   createdAt: Date;
@@ -51,7 +51,7 @@ export interface BookingReportWithDetails {
 }
 
 export interface ListBookingReportsFilters {
-  reason?: ReportReason[];
+  reason?: BookingReportReason[];
   cancelled?: boolean;
   hasWatchlist?: boolean;
   dateRange?: {
diff --git a/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql b/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
similarity index 82%
rename from packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
rename to packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
index adf78cf9be492e..b7303d4f8f8882 100644
--- a/packages/prisma/migrations/20251011182311_add_booking_report/migration.sql
+++ b/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
@@ -7,6 +7,7 @@ CREATE TABLE "BookingReport" (
     "bookingId" INTEGER NOT NULL,
     "bookerEmail" TEXT NOT NULL,
     "reportedById" INTEGER NOT NULL,
+    "organizationId" INTEGER,
     "reason" "ReportReason" NOT NULL,
     "description" TEXT,
     "cancelled" BOOLEAN NOT NULL DEFAULT false,
@@ -25,6 +26,9 @@ CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
 -- CreateIndex
 CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
 
+-- CreateIndex
+CREATE INDEX "BookingReport_organizationId_idx" ON "BookingReport"("organizationId");
+
 -- CreateIndex
 CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
 
@@ -37,5 +41,8 @@ ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIG
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
index 99ef5101e39534..0182aa5d7d6b8f 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -85,6 +85,7 @@ export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions)
         bookingData: {
           uid: booking.uid,
           cancelledBy: user.email,
+          cancellationReason: description,
           skipCancellationReasonValidation: true,
           ...(booking.recurringEventId ? { cancelSubsequentBookings: true } : {}),
           ...(seatReferenceUid ? { seatReferenceUid } : {}),

From 45240013edc1d14bd9b71e51440c3b3469eb43d8 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 17:20:02 +0530
Subject: [PATCH 40/54] feat: finish

---
 .../(org-admin-only)/privacy/page.tsx         |   3 +-
 .../privacy/booking-reports-table.tsx         | 347 ++++++++++++++----
 .../components/add-to-watchlist-modal.tsx     | 123 +++++--
 .../booking-report-details-sheet.tsx          | 154 ++++++++
 .../components/bulk-add-to-watchlist.tsx      |  49 +++
 apps/web/public/static/locales/en/common.json |  29 ++
 .../organizations/pages/settings/privacy.tsx  |  28 +-
 .../repository/bookingReport.interface.ts     |   7 +
 .../lib/server/repository/bookingReport.ts    |  70 +++-
 .../migration.sql                             |   2 -
 .../routers/viewer/organizations/_router.tsx  |  18 +-
 .../organizations/addToWatchlist.handler.ts   |  73 ++--
 .../organizations/addToWatchlist.schema.ts    |   3 +-
 .../deleteBookingReport.handler.ts            |  36 ++
 .../deleteBookingReport.schema.ts             |   7 +
 15 files changed, 786 insertions(+), 163 deletions(-)
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
 delete mode 100644 packages/prisma/migrations/20251009201049_add_reported_by/migration.sql
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts

diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
index 71776120648786..58ad14b3e28e23 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
@@ -19,9 +19,8 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const t = await getTranslate();
-
   const session = await validateUserHasOrg();
+  const t = await getTranslate();
 
   if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {
     return redirect("/settings/profile");
diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index 999efcca36840a..241b6809fa1b06 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -3,73 +3,148 @@
 import { keepPreviousData } from "@tanstack/react-query";
 import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
 import { useMemo, useState } from "react";
-import { format } from "date-fns";
 
 import {
   DataTableWrapper,
   DataTableToolbar,
+  DataTableFilters,
   ColumnFilterType,
   useDataTable,
+  useColumnFilters,
+  convertFacetedValuesToMap,
+  DataTableSelectionBar,
 } from "@calcom/features/data-table";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Badge } from "@calcom/ui/components/badge";
 import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuPortal,
+} from "@calcom/ui/components/dropdown";
+import { Checkbox } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
 
 import { AddToWatchlistModal } from "./components/add-to-watchlist-modal";
+import { BookingReportDetailsSheet } from "./components/booking-report-details-sheet";
+import { BulkAddToWatchlist } from "./components/bulk-add-to-watchlist";
 
 type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
 
 export function BookingReportsTable() {
   const { t } = useLocale();
   const { limit, offset, searchTerm } = useDataTable();
+  const columnFilters = useColumnFilters();
 
   const [selectedReport, setSelectedReport] = useState<BookingReport | null>(null);
   const [showWatchlistModal, setShowWatchlistModal] = useState(false);
+  const [showDetailsSheet, setShowDetailsSheet] = useState(false);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [rowSelection, setRowSelection] = useState({});
+
+  const filters = useMemo(() => {
+    const hasWatchlistFilter = columnFilters.find((f) => f.id === "hasWatchlist");
+
+    let hasWatchlistValue: boolean | undefined = false;
+
+    if (hasWatchlistFilter && hasWatchlistFilter.value.type === ColumnFilterType.MULTI_SELECT) {
+      const filterValues = hasWatchlistFilter.value.data;
+      if (Array.isArray(filterValues) && filterValues.length > 0) {
+        if (filterValues.length === 2 || filterValues.length === 0) {
+          hasWatchlistValue = undefined;
+        } else {
+          hasWatchlistValue = filterValues[0] === "true";
+        }
+      }
+    }
+
+    return {
+      hasWatchlist: hasWatchlistValue,
+    };
+  }, [columnFilters]);
 
   const { data, isPending } = trpc.viewer.organizations.listBookingReports.useQuery(
     {
       limit,
       offset,
       searchTerm,
-      filters: {},
+      filters,
     },
     {
       placeholderData: keepPreviousData,
     }
   );
 
+  const utils = trpc.useUtils();
+
+  const deleteReportMutation = trpc.viewer.organizations.deleteBookingReport.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.organizations.listBookingReports.invalidate();
+      showToast(t("booking_report_deleted"), "success");
+      setShowDeleteDialog(false);
+      setSelectedReport(null);
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
   const totalRowCount = data?.meta?.totalRowCount ?? 0;
   const flatData = useMemo<BookingReport[]>(() => data?.rows ?? [], [data]);
 
   const columns = useMemo<ColumnDef<BookingReport>[]>(
     () => [
+      {
+        id: "select",
+        enableHiding: false,
+        enableSorting: false,
+        enableResizing: false,
+        size: 30,
+        header: ({ table }) => (
+          <Checkbox
+            checked={table.getIsAllPageRowsSelected()}
+            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+            aria-label="Select all"
+          />
+        ),
+        cell: ({ row }) => (
+          <Checkbox
+            checked={row.getIsSelected()}
+            onCheckedChange={(value) => row.toggleSelected(!!value)}
+            aria-label="Select row"
+            className="translate-y-[2px]"
+          />
+        ),
+      },
       {
         id: "bookerEmail",
         header: t("booker_email"),
         accessorKey: "bookerEmail",
-        size: 200,
-        cell: ({ row }) => <span className="font-medium">{row.original.bookerEmail}</span>,
+        enableHiding: false,
+        cell: ({ row }) => <span className="text-emphasis font-medium">{row.original.bookerEmail}</span>,
       },
       {
-        id: "reporter",
+        id: "reportedBy",
         header: t("reported_by"),
-        accessorFn: (row) => row.reporter.name || row.reporter.email,
-        size: 150,
-        cell: ({ row }) => (
-          <span className="text-default">{row.original.reporter.name || row.original.reporter.email}</span>
-        ),
+        accessorFn: (row) => row.reporter.email,
+        size: 180,
+        cell: ({ row }) => <span className="text-default">{row.original.reporter.email}</span>,
       },
       {
         id: "reason",
         header: t("reason"),
         accessorKey: "reason",
-        size: 120,
+        size: 90,
         meta: {
-          filter: {
-            type: ColumnFilterType.MULTI_SELECT,
-          },
+          type: ColumnFilterType.MULTI_SELECT,
         },
         cell: ({ row }) => {
           const reasonColors: Record<string, "red" | "orange" | "gray"> = {
@@ -85,78 +160,127 @@ export function BookingReportsTable() {
         },
       },
       {
-        id: "description",
-        header: t("description"),
-        accessorKey: "description",
-        size: 250,
-        cell: ({ row }) => {
-          const desc = row.original.description;
-          if (!desc) return <span className="text-subtle">—</span>;
-          return (
-            <span className="text-default truncate" title={desc}>
-              {desc}
-            </span>
-          );
-        },
-      },
-      {
-        id: "bookingDate",
-        header: t("booking_date"),
-        accessorFn: (row) => row.booking.startTime,
-        size: 180,
-        cell: ({ row }) => (
-          <span className="text-default">{format(new Date(row.original.booking.startTime), "PPP")}</span>
-        ),
-      },
-      {
-        id: "reportedAt",
-        header: t("reported_at"),
-        accessorKey: "createdAt",
-        size: 200,
-        cell: ({ row }) => (
-          <span className="text-default">{format(new Date(row.original.createdAt), "PPp")}</span>
-        ),
-      },
-      {
-        id: "cancelled",
-        header: t("cancelled"),
-        accessorKey: "cancelled",
+        id: "hasWatchlist",
+        header: t("in_watchlist"),
+        accessorFn: (row) => (row.watchlistId ? "true" : "false"),
         size: 120,
         meta: {
-          filter: {
-            type: ColumnFilterType.SINGLE_SELECT,
-          },
+          type: ColumnFilterType.MULTI_SELECT,
         },
         cell: ({ row }) => (
-          <Badge variant={row.original.cancelled ? "green" : "gray"}>
-            {row.original.cancelled ? t("yes") : t("no")}
+          <Badge variant={row.original.watchlistId ? "blue" : "gray"}>
+            {row.original.watchlistId ? t("yes") : t("no")}
           </Badge>
         ),
       },
       {
         id: "actions",
         header: "",
-        size: 150,
+        size: 90,
+        enableHiding: false,
+        enableSorting: false,
         enableResizing: false,
         cell: ({ row }) => {
-          if (row.original.watchlistId) {
-            return null;
-          }
+          const report = row.original;
           return (
-            <Button
-              size="sm"
-              variant="outline"
-              onClick={() => {
-                setSelectedReport(row.original);
-                setShowWatchlistModal(true);
-              }}>
-              {t("add_to_watchlist")}
-            </Button>
+            <div className="flex items-center justify-end">
+              <ButtonGroup combined containerProps={{ className: "border-default hidden md:flex" }}>
+                <Tooltip content={t("view_booking_page")}>
+                  <Button
+                    target="_blank"
+                    href={`/booking/${report.booking.uid}`}
+                    color="secondary"
+                    variant="icon"
+                    StartIcon="external-link"
+                  />
+                </Tooltip>
+                <Dropdown>
+                  <DropdownMenuTrigger asChild>
+                    <Button
+                      className="radix-state-open:rounded-r-md"
+                      color="secondary"
+                      variant="icon"
+                      StartIcon="ellipsis"
+                    />
+                  </DropdownMenuTrigger>
+                  <DropdownMenuPortal>
+                    <DropdownMenuContent>
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDetailsSheet(true);
+                          }}
+                          StartIcon="eye">
+                          {t("view")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDeleteDialog(true);
+                          }}
+                          color="destructive"
+                          StartIcon="trash">
+                          {t("delete")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenuPortal>
+                </Dropdown>
+              </ButtonGroup>
+              <div className="flex md:hidden">
+                <Dropdown>
+                  <DropdownMenuTrigger asChild>
+                    <Button type="button" variant="icon" color="minimal" StartIcon="ellipsis" />
+                  </DropdownMenuTrigger>
+                  <DropdownMenuPortal>
+                    <DropdownMenuContent>
+                      <DropdownMenuItem className="outline-none">
+                        <DropdownItem
+                          href={`/booking/${report.booking.uid}`}
+                          target="_blank"
+                          type="button"
+                          StartIcon="external-link">
+                          {t("view_booking_page")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDetailsSheet(true);
+                          }}
+                          StartIcon="eye">
+                          {t("view")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                      <DropdownMenuItem>
+                        <DropdownItem
+                          type="button"
+                          color="destructive"
+                          onClick={() => {
+                            setSelectedReport(report);
+                            setShowDeleteDialog(true);
+                          }}
+                          StartIcon="trash">
+                          {t("delete")}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenuPortal>
+                </Dropdown>
+              </div>
+            </div>
           );
         },
       },
     ],
-    [t]
+    [t, setSelectedReport, setShowDetailsSheet]
   );
 
   const table = useReactTable({
@@ -166,8 +290,32 @@ export function BookingReportsTable() {
     getSortedRowModel: getSortedRowModel(),
     manualPagination: true,
     getRowId: (row) => row.id,
+    onRowSelectionChange: setRowSelection,
+    state: {
+      rowSelection,
+    },
+    enableRowSelection: true,
+    getFacetedUniqueValues: (_, columnId) => () => {
+      switch (columnId) {
+        case "hasWatchlist":
+          return convertFacetedValuesToMap([
+            { label: t("no"), value: "false" },
+            { label: t("yes"), value: "true" },
+          ]);
+        case "reason":
+          return convertFacetedValuesToMap([
+            { label: t("spam"), value: "SPAM" },
+            { label: t("dont_know_person"), value: "DONT_KNOW_PERSON" },
+            { label: t("other"), value: "OTHER" },
+          ]);
+        default:
+          return new Map();
+      }
+    },
   });
 
+  const numberOfSelectedRows = table.getFilteredSelectedRowModel().rows.length;
+
   return (
     <>
       <DataTableWrapper
@@ -178,11 +326,47 @@ export function BookingReportsTable() {
         ToolbarLeft={
           <>
             <DataTableToolbar.SearchBar />
+            <DataTableFilters.FilterBar table={table} />
           </>
         }
-      />
+        ToolbarRight={
+          <>
+            <DataTableFilters.ClearFiltersButton />
+          </>
+        }>
+        {numberOfSelectedRows > 0 && (
+          <DataTableSelectionBar.Root className="!bottom-16 justify-center md:w-max">
+            <p className="text-brand-subtle px-2 text-center text-xs leading-none sm:text-sm sm:font-medium">
+              {t("number_selected", { count: numberOfSelectedRows })}
+            </p>
+            <BulkAddToWatchlist
+              reports={table.getSelectedRowModel().flatRows.map((row) => row.original)}
+              onSuccess={() => table.toggleAllPageRowsSelected(false)}
+            />
+          </DataTableSelectionBar.Root>
+        )}
+      </DataTableWrapper>
 
-      {selectedReport && (
+      {selectedReport && showDetailsSheet && (
+        <BookingReportDetailsSheet
+          open={showDetailsSheet}
+          onClose={() => {
+            setShowDetailsSheet(false);
+            setSelectedReport(null);
+          }}
+          report={selectedReport}
+          onAddToWatchlist={
+            !selectedReport.watchlistId
+              ? () => {
+                  setShowDetailsSheet(false);
+                  setShowWatchlistModal(true);
+                }
+              : undefined
+          }
+        />
+      )}
+
+      {selectedReport && showWatchlistModal && (
         <AddToWatchlistModal
           open={showWatchlistModal}
           onClose={() => {
@@ -192,6 +376,27 @@ export function BookingReportsTable() {
           report={selectedReport}
         />
       )}
+
+      {selectedReport && showDeleteDialog && (
+        <Dialog
+          open={showDeleteDialog}
+          onOpenChange={(open) => {
+            if (!open) {
+              setShowDeleteDialog(false);
+              setSelectedReport(null);
+            }
+          }}>
+          <ConfirmationDialogContent
+            variety="danger"
+            title={t("delete_booking_report")}
+            confirmBtnText={t("delete")}
+            onConfirm={() => {
+              deleteReportMutation.mutate({ reportId: selectedReport.id });
+            }}>
+            {t("delete_booking_report_confirmation")}
+          </ConfirmationDialogContent>
+        </Dialog>
+      )}
     </>
   );
 }
diff --git a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
index 19556d9f374848..bd63c5ee973473 100644
--- a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useState, useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 
@@ -11,7 +10,7 @@ import { trpc } from "@calcom/trpc";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
 import { Dialog, DialogContent, DialogHeader, DialogFooter } from "@calcom/ui/components/dialog";
-import { Form, Label, TextField, Select, TextAreaField } from "@calcom/ui/components/form";
+import { Form, Label, Select, TextAreaField } from "@calcom/ui/components/form";
 import { showToast } from "@calcom/ui/components/toast";
 
 type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
@@ -19,19 +18,19 @@ type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReport
 interface AddToWatchlistModalProps {
   open: boolean;
   onClose: () => void;
-  report: BookingReport;
+  report?: BookingReport;
+  reports?: BookingReport[];
 }
 
 const formSchema = z.object({
   type: z.nativeEnum(WatchlistType),
-  value: z.string().min(1, "Value is required"),
   action: z.nativeEnum(WatchlistAction),
   description: z.string().optional(),
 });
 
 type FormValues = z.infer<typeof formSchema>;
 
-export function AddToWatchlistModal({ open, onClose, report }: AddToWatchlistModalProps) {
+export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWatchlistModalProps) {
   const { t } = useLocale();
   const utils = trpc.useUtils();
 
@@ -39,22 +38,20 @@ export function AddToWatchlistModal({ open, onClose, report }: AddToWatchlistMod
     resolver: zodResolver(formSchema),
     defaultValues: {
       type: WatchlistType.EMAIL,
-      value: report.bookerEmail,
       action: WatchlistAction.REPORT,
       description: "",
     },
   });
 
-  const watchlistType = form.watch("type");
+  const isBulk = !!reports && reports.length > 0;
+  const firstReport = isBulk ? reports[0] : report;
+
+  if (!firstReport) {
+    return null;
+  }
 
-  useMemo(() => {
-    if (watchlistType === WatchlistType.EMAIL) {
-      form.setValue("value", report.bookerEmail);
-    } else if (watchlistType === WatchlistType.DOMAIN) {
-      const domain = report.bookerEmail.split("@")[1];
-      form.setValue("value", domain || "");
-    }
-  }, [watchlistType, report.bookerEmail, form]);
+  const watchlistType = form.watch("type");
+  const actionType = form.watch("action");
 
   const addToWatchlistMutation = trpc.viewer.organizations.addToWatchlist.useMutation({
     onSuccess: () => {
@@ -69,10 +66,11 @@ export function AddToWatchlistModal({ open, onClose, report }: AddToWatchlistMod
   });
 
   const onSubmit = (data: FormValues) => {
+    const reportIds = isBulk ? reports.map((r) => r.id) : [firstReport.id];
+
     addToWatchlistMutation.mutate({
-      reportId: report.id,
+      reportIds,
       type: data.type,
-      value: data.value,
       action: data.action,
       description: data.description,
     });
@@ -81,48 +79,107 @@ export function AddToWatchlistModal({ open, onClose, report }: AddToWatchlistMod
   return (
     <Dialog open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
       <DialogContent enableOverflow>
-        <DialogHeader title={t("add_to_watchlist")} subtitle={t("add_booker_to_organization_watchlist")} />
+        <DialogHeader
+          title={t("add_to_watchlist")}
+          subtitle={
+            isBulk
+              ? t("add_multiple_to_watchlist_subtitle", { count: reports.length })
+              : t("add_to_watchlist_subtitle", { email: firstReport.bookerEmail })
+          }
+        />
 
         <Form form={form} handleSubmit={onSubmit}>
           <div className="space-y-4">
             <div>
-              <Label>{t("watchlist_type")}</Label>
+              <Label>{t("what_to_add")}</Label>
               <Select
                 options={[
-                  { label: t("email"), value: WatchlistType.EMAIL },
-                  { label: t("domain"), value: WatchlistType.DOMAIN },
+                  {
+                    label: t("this_email_address"),
+                    value: WatchlistType.EMAIL,
+                    description: firstReport.bookerEmail,
+                  },
+                  {
+                    label: t("entire_domain"),
+                    value: WatchlistType.DOMAIN,
+                    description: `${t("all_emails_from")} @${firstReport.bookerEmail.split("@")[1]}`,
+                  },
                 ]}
-                {...form.register("type")}
+                value={
+                  watchlistType === WatchlistType.EMAIL
+                    ? {
+                        label: t("this_email_address"),
+                        value: WatchlistType.EMAIL,
+                        description: firstReport.bookerEmail,
+                      }
+                    : {
+                        label: t("entire_domain"),
+                        value: WatchlistType.DOMAIN,
+                        description: `${t("all_emails_from")} @${firstReport.bookerEmail.split("@")[1]}`,
+                      }
+                }
+                onChange={(option) => {
+                  if (option && "value" in option) {
+                    form.setValue("type", option.value as WatchlistType);
+                  }
+                }}
               />
             </div>
 
-            <TextField {...form.register("value")} placeholder={t("enter_value")} />
-
             <div>
-              <Label>{t("action")}</Label>
+              <Label>{t("what_should_happen")}</Label>
               <Select
                 options={[
                   {
-                    label: t("report_action"),
+                    label: t("flag_future_bookings"),
                     value: WatchlistAction.REPORT,
-                    description: t("auto_report_future_bookings"),
+                    description: t("flag_future_bookings_description"),
                   },
                   {
-                    label: t("block_action"),
+                    label: t("block_all_bookings"),
                     value: WatchlistAction.BLOCK,
-                    description: t("block_from_making_bookings"),
+                    description: t("block_all_bookings_description"),
                   },
                   {
-                    label: t("alert_action"),
+                    label: t("notify_admins"),
                     value: WatchlistAction.ALERT,
-                    description: t("alert_admins_on_booking_attempts"),
+                    description: t("notify_admins_description"),
                   },
                 ]}
-                {...form.register("action")}
+                value={
+                  actionType === WatchlistAction.REPORT
+                    ? {
+                        label: t("flag_future_bookings"),
+                        value: WatchlistAction.REPORT,
+                        description: t("flag_future_bookings_description"),
+                      }
+                    : actionType === WatchlistAction.BLOCK
+                    ? {
+                        label: t("block_all_bookings"),
+                        value: WatchlistAction.BLOCK,
+                        description: t("block_all_bookings_description"),
+                      }
+                    : {
+                        label: t("notify_admins"),
+                        value: WatchlistAction.ALERT,
+                        description: t("notify_admins_description"),
+                      }
+                }
+                onChange={(option) => {
+                  if (option && "value" in option) {
+                    form.setValue("action", option.value as WatchlistAction);
+                  }
+                }}
               />
             </div>
 
-            <TextAreaField {...form.register("description")} placeholder={t("add_optional_notes")} rows={3} />
+            <div>
+              <TextAreaField
+                {...form.register("description")}
+                placeholder={t("add_internal_note_placeholder")}
+                rows={3}
+              />
+            </div>
           </div>
 
           <DialogFooter>
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
new file mode 100644
index 00000000000000..800ecde3f7b22e
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
@@ -0,0 +1,154 @@
+"use client";
+
+import { format } from "date-fns";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Sheet, SheetContent, SheetHeader, SheetBody } from "@calcom/ui/components/sheet";
+
+type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+
+interface BookingReportDetailsSheetProps {
+  open: boolean;
+  onClose: () => void;
+  report: BookingReport;
+  onAddToWatchlist?: () => void;
+}
+
+export function BookingReportDetailsSheet({
+  open,
+  onClose,
+  report,
+  onAddToWatchlist,
+}: BookingReportDetailsSheetProps) {
+  const { t } = useLocale();
+
+  const reasonColors: Record<string, "red" | "orange" | "gray"> = {
+    SPAM: "red",
+    DONT_KNOW_PERSON: "orange",
+    OTHER: "gray",
+  };
+
+  return (
+    <Sheet open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
+      <SheetContent>
+        <SheetHeader>
+          <div className="flex items-center justify-between">
+            <div>
+              <h2 className="text-emphasis text-base font-semibold">{report.bookerEmail}</h2>
+              <div className="mt-2 flex items-center gap-2">
+                <Badge variant={reasonColors[report.reason] || "gray"} className="text-xs">
+                  {t(report.reason.toLowerCase())}
+                </Badge>
+                {report.watchlistId && (
+                  <Badge variant="blue" className="text-xs">
+                    {t("in_watchlist")}
+                  </Badge>
+                )}
+                {report.cancelled && (
+                  <Badge variant="green" className="text-xs">
+                    {t("cancelled")}
+                  </Badge>
+                )}
+              </div>
+            </div>
+          </div>
+        </SheetHeader>
+
+        <SheetBody className="space-y-6">
+          <div className="space-y-4">
+            <h3 className="text-emphasis text-sm font-semibold">{t("booking_details")}</h3>
+            <div className="space-y-3">
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("booker_email")}</span>
+                <span className="text-default text-sm">{report.bookerEmail}</span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("booking_date")}</span>
+                <span className="text-default text-sm">
+                  {format(new Date(report.booking.startTime), "PPP p")}
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("booking_title")}</span>
+                <span className="text-default text-sm">{report.booking.title || t("no_title")}</span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("view_booking")}</span>
+                <a
+                  href={`/booking/${report.booking.uid}`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-brand-default hover:text-brand-emphasis text-sm underline">
+                  /booking/{report.booking.uid}
+                </a>
+              </div>
+            </div>
+          </div>
+
+          <div className="space-y-4">
+            <h3 className="text-emphasis text-sm font-semibold">{t("report_details")}</h3>
+            <div className="space-y-3">
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("reported_by")}</span>
+                <span className="text-default text-sm">
+                  {report.reporter.name || ""} ({report.reporter.email})
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("reported_at")}</span>
+                <span className="text-default text-sm">{format(new Date(report.createdAt), "PPP p")}</span>
+              </div>
+              <div className="flex flex-col">
+                <span className="text-subtle text-xs">{t("reason")}</span>
+                <span className="text-default text-sm">{t(report.reason.toLowerCase())}</span>
+              </div>
+              {report.description && (
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("description")}</span>
+                  <span className="text-default text-sm">{report.description}</span>
+                </div>
+              )}
+            </div>
+          </div>
+
+          {report.watchlistId && report.watchlist && (
+            <div className="space-y-4">
+              <h3 className="text-emphasis text-sm font-semibold">{t("watchlist_info")}</h3>
+              <div className="space-y-3">
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("watchlist_type")}</span>
+                  <span className="text-default text-sm">{report.watchlist.type}</span>
+                </div>
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("watchlist_value")}</span>
+                  <span className="text-default text-sm">{report.watchlist.value}</span>
+                </div>
+                <div className="flex flex-col">
+                  <span className="text-subtle text-xs">{t("watchlist_action")}</span>
+                  <span className="text-default text-sm">{report.watchlist.action}</span>
+                </div>
+                {report.watchlist.description && (
+                  <div className="flex flex-col">
+                    <span className="text-subtle text-xs">{t("watchlist_description")}</span>
+                    <span className="text-default text-sm">{report.watchlist.description}</span>
+                  </div>
+                )}
+              </div>
+            </div>
+          )}
+
+          {!report.watchlistId && onAddToWatchlist && (
+            <div className="pt-4">
+              <Button onClick={onAddToWatchlist} color="primary" className="w-full justify-center">
+                {t("add_to_watchlist")}
+              </Button>
+            </div>
+          )}
+        </SheetBody>
+      </SheetContent>
+    </Sheet>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx b/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
new file mode 100644
index 00000000000000..aa5b82cc52f402
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
@@ -0,0 +1,49 @@
+"use client";
+
+import { useState } from "react";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
+
+import { AddToWatchlistModal } from "./add-to-watchlist-modal";
+
+type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+
+interface BulkAddToWatchlistProps {
+  reports: BookingReport[];
+  onSuccess: () => void;
+}
+
+export function BulkAddToWatchlist({ reports, onSuccess }: BulkAddToWatchlistProps) {
+  const { t } = useLocale();
+  const [showModal, setShowModal] = useState(false);
+
+  const reportsToAdd = reports.filter((report) => !report.watchlistId);
+
+  const handleModalClose = () => {
+    setShowModal(false);
+    onSuccess();
+  };
+
+  if (reportsToAdd.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      <Button
+        color="secondary"
+        StartIcon="shield-check"
+        onClick={() => {
+          setShowModal(true);
+        }}>
+        {t("add_to_watchlist")}
+      </Button>
+
+      {showModal && (
+        <AddToWatchlistModal open={showModal} onClose={handleModalClose} reports={reportsToAdd} />
+      )}
+    </>
+  );
+}
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 8a426aeba6cc34..bc53d61a427748 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -793,6 +793,7 @@
   "remove_attribute": "Remove attribute",
   "remove_attribute_confirmation_message": "Are you sure you want to remove the attribute '{{name}}'? All users currently assigned to it will be unassigned.",
   "delete": "Delete",
+  "view": "View",
   "update": "Update",
   "save": "Save",
   "pending": "Pending",
@@ -2854,6 +2855,7 @@
   "privacy_organization_description": "Manage privacy settings for your organization",
   "privacy": "Privacy",
   "privacy_and_security": "Privacy & Security",
+  "manage_privacy_security_organization": "Manage privacy settings and security for your organization",
   "privacy_settings": "Privacy Settings",
   "booking_reports": "Booking Reports",
   "booking_reports_description": "View and manage reports from organization members about suspicious or unwanted bookings",
@@ -2862,10 +2864,37 @@
   "reported_at": "Reported At",
   "booking_date": "Booking Date",
   "add_to_watchlist": "Add to Watchlist",
+  "in_watchlist": "In Watchlist",
   "not_in_watchlist": "Not in Watchlist",
+  "view_booking_page": "View booking page",
   "successfully_added_to_watchlist": "Successfully added to watchlist",
   "add_booker_to_organization_watchlist": "Add booker to your organization's watchlist",
+  "add_to_watchlist_subtitle": "Monitor or restrict {{email}} on future bookings",
+  "add_multiple_to_watchlist_subtitle": "Add {{count}} booker(s) to watchlist with the same settings",
+  "what_to_add": "What to add to watchlist?",
+  "this_email_address": "This email address",
+  "entire_domain": "Entire domain",
+  "all_emails_from": "All emails from",
+  "what_should_happen": "What should happen with future bookings?",
+  "flag_future_bookings": "Flag for review",
+  "flag_future_bookings_description": "Future bookings will be reported for your review",
+  "block_all_bookings": "Block completely",
+  "block_all_bookings_description": "Prevent any bookings from being made",
+  "notify_admins": "Notify admins",
+  "notify_admins_description": "Send alerts when booking attempts are made",
+  "add_internal_note_placeholder": "Add a note to help your team understand why this was added to the watchlist",
+  "report_details": "Report Details",
+  "watchlist_info": "Watchlist Information",
+  "no_title": "No Title",
+  "booking_title": "Booking Title",
+  "watchlist_value": "Watchlist Value",
+  "watchlist_action": "Watchlist Action",
+  "watchlist_description": "Watchlist Description",
+  "add_to_list": "Add to Watchlist",
   "watchlist_type": "Watchlist Type",
+  "delete_booking_report": "Delete Booking Report",
+  "delete_booking_report_confirmation": "Are you sure you want to delete this booking report? This action cannot be undone.",
+  "booking_report_deleted": "Booking report deleted successfully",
   "enter_value": "Enter value",
   "report_action": "Report",
   "block_action": "Block",
diff --git a/packages/features/ee/organizations/pages/settings/privacy.tsx b/packages/features/ee/organizations/pages/settings/privacy.tsx
index cde7c0986a4bc1..81d85deba3dde8 100644
--- a/packages/features/ee/organizations/pages/settings/privacy.tsx
+++ b/packages/features/ee/organizations/pages/settings/privacy.tsx
@@ -4,13 +4,11 @@ import { DataTableProvider } from "@calcom/features/data-table";
 import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import MakeTeamPrivateSwitch from "@calcom/features/ee/teams/components/MakeTeamPrivateSwitch";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 
 import { BookingReportsTable } from "~/settings/organizations/privacy/booking-reports-table";
 
 const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit: boolean } }) => {
-  const { t } = useLocale();
   const { data: currentOrg } = trpc.viewer.organizations.listCurrent.useQuery();
   const isInviteOpen = !currentOrg?.user.accepted;
 
@@ -20,24 +18,16 @@ const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit
 
   return (
     <LicenseRequired>
-      <div className="space-y-8">
-        <div>
-          <h2 className="text-emphasis mb-2 text-base font-semibold leading-6">{t("privacy_settings")}</h2>
-          <MakeTeamPrivateSwitch
-            isOrg={true}
-            teamId={currentOrg.id}
-            isPrivate={currentOrg.isPrivate}
-            disabled={isDisabled}
-          />
-        </div>
-
-        {/* Booking Reports Section */}
+      <div>
+        <MakeTeamPrivateSwitch
+          isOrg={true}
+          teamId={currentOrg.id}
+          isPrivate={currentOrg.isPrivate}
+          disabled={isDisabled}
+        />
+
         {permissions.canEdit && (
-          <div>
-            <h2 className="text-emphasis mb-2 text-base font-semibold leading-6">
-              {t("booking_reports")}
-            </h2>
-            <p className="text-default mb-4 text-sm">{t("booking_reports_description")}</p>
+          <div className="mt-8">
             <DataTableProvider useSegments={useSegments} defaultPageSize={25}>
               <BookingReportsTable />
             </DataTableProvider>
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index 9bb38ca6cc439f..0fa6babe29ca2a 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -74,5 +74,12 @@ export interface IBookingReportRepository {
     meta: { totalRowCount: number };
   }>;
 
+  findReportsByIds(params: {
+    reportIds: string[];
+    organizationId: number;
+  }): Promise<BookingReportWithDetails[]>;
+
   linkWatchlistToReport(params: { reportId: string; watchlistId: string }): Promise<void>;
+
+  deleteReport(params: { reportId: string; organizationId: number }): Promise<void>;
 }
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index 64fd703e42015e..55f8831d99cf9f 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -1,4 +1,4 @@
-import type { PrismaClient } from "@calcom/prisma";
+import type { Prisma, PrismaClient } from "@calcom/prisma";
 
 import type {
   IBookingReportRepository,
@@ -37,10 +37,8 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
     rows: BookingReportWithDetails[];
     meta: { totalRowCount: number };
   }> {
-    const where: any = {
-      reportedBy: {
-        organizationId: params.organizationId,
-      },
+    const where: Prisma.BookingReportWhereInput = {
+      organizationId: params.organizationId,
     };
 
     if (params.searchTerm) {
@@ -140,4 +138,66 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
       data: { watchlistId: params.watchlistId },
     });
   }
+
+  async findReportsByIds(params: {
+    reportIds: string[];
+    organizationId: number;
+  }): Promise<BookingReportWithDetails[]> {
+    const reports = await this.prismaClient.bookingReport.findMany({
+      where: {
+        id: { in: params.reportIds },
+        organizationId: params.organizationId,
+      },
+      select: {
+        id: true,
+        bookingId: true,
+        bookerEmail: true,
+        reportedById: true,
+        reason: true,
+        description: true,
+        cancelled: true,
+        createdAt: true,
+        watchlistId: true,
+        reportedBy: {
+          select: {
+            id: true,
+            name: true,
+            email: true,
+          },
+        },
+        booking: {
+          select: {
+            id: true,
+            startTime: true,
+            endTime: true,
+            title: true,
+            uid: true,
+          },
+        },
+        watchlist: {
+          select: {
+            id: true,
+            type: true,
+            value: true,
+            action: true,
+            description: true,
+          },
+        },
+      },
+    });
+
+    return reports.map((report) => ({
+      ...report,
+      reporter: report.reportedBy,
+    }));
+  }
+
+  async deleteReport(params: { reportId: string; organizationId: number }): Promise<void> {
+    await this.prismaClient.bookingReport.delete({
+      where: {
+        id: params.reportId,
+        organizationId: params.organizationId,
+      },
+    });
+  }
 }
diff --git a/packages/prisma/migrations/20251009201049_add_reported_by/migration.sql b/packages/prisma/migrations/20251009201049_add_reported_by/migration.sql
deleted file mode 100644
index 4de19c74dbcaa5..00000000000000
--- a/packages/prisma/migrations/20251009201049_add_reported_by/migration.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/trpc/server/routers/viewer/organizations/_router.tsx b/packages/trpc/server/routers/viewer/organizations/_router.tsx
index 16437842687676..7e0bc7a83dd175 100644
--- a/packages/trpc/server/routers/viewer/organizations/_router.tsx
+++ b/packages/trpc/server/routers/viewer/organizations/_router.tsx
@@ -19,6 +19,7 @@ import { ZCreateInputSchema } from "./create.schema";
 import { ZCreateSelfHostedInputSchema } from "./createSelfHosted.schema";
 import { ZCreateTeamsSchema } from "./createTeams.schema";
 import { ZCreateWithPaymentIntentInputSchema } from "./createWithPaymentIntent.schema";
+import { ZDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
 import { ZDeleteTeamInputSchema } from "./deleteTeam.schema";
 import { ZGetMembersInput } from "./getMembers.schema";
 import { ZGetOtherTeamInputSchema } from "./getOtherTeam.handler";
@@ -165,14 +166,19 @@ export const viewerOrganizationsRouter = router({
     const { default: handler } = await import("./createSelfHosted.handler");
     return handler(opts);
   }),
-  listBookingReports: authedOrgAdminProcedure
-    .input(ZListBookingReportsInputSchema)
-    .query(async (opts) => {
-      const { default: handler } = await import("./listBookingReports.handler");
-      return handler(opts);
-    }),
+  listBookingReports: authedOrgAdminProcedure.input(ZListBookingReportsInputSchema).query(async (opts) => {
+    const { default: handler } = await import("./listBookingReports.handler");
+    return handler(opts);
+  }),
   addToWatchlist: authedOrgAdminProcedure.input(ZAddToWatchlistInputSchema).mutation(async (opts) => {
     const { default: handler } = await import("./addToWatchlist.handler");
     return handler(opts);
   }),
+
+  deleteBookingReport: authedOrgAdminProcedure
+    .input(ZDeleteBookingReportInputSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./deleteBookingReport.handler");
+      return handler(opts);
+    }),
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
index 88d2dced37c85c..8cb31000632d82 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
@@ -28,47 +28,74 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
   const bookingReportRepo = new PrismaBookingReportRepository(prisma);
   const watchlistRepo = new WatchlistRepository(prisma);
 
-  const reports = await bookingReportRepo.findAllReportedBookings({
+  const validReports = await bookingReportRepo.findReportsByIds({
+    reportIds: input.reportIds,
     organizationId,
-    skip: 0,
-    take: 1,
-    filters: undefined,
   });
 
-  const report = reports.rows.find((r) => r.id === input.reportId);
-  if (!report) {
+  if (validReports.length !== input.reportIds.length) {
+    const foundIds = validReports.map((r) => r.id);
+    const missingIds = input.reportIds.filter((id) => !foundIds.includes(id));
     throw new TRPCError({
       code: "NOT_FOUND",
-      message: "Booking report not found or does not belong to your organization",
+      message: `Booking report(s) not found or do not belong to your organization: ${missingIds.join(", ")}`,
     });
   }
 
-  if (report.watchlistId) {
+  const reportsToAdd = validReports.filter((report) => !report.watchlistId);
+
+  if (reportsToAdd.length === 0) {
     throw new TRPCError({
       code: "BAD_REQUEST",
-      message: "This booker is already in the watchlist",
+      message: "All selected bookers are already in the watchlist",
     });
   }
 
   try {
-    const watchlist = await watchlistRepo.createEntry({
-      type: input.type,
-      value: input.value,
-      organizationId,
-      action: input.action,
-      description: input.description,
-      userId: user.id,
-    });
+    const results = await Promise.all(
+      reportsToAdd.map(async (report) => {
+        const value =
+          input.type === "EMAIL"
+            ? report.bookerEmail
+            : report.bookerEmail.split("@")[1] || report.bookerEmail;
 
-    await bookingReportRepo.linkWatchlistToReport({
-      reportId: input.reportId,
-      watchlistId: watchlist.id,
-    });
+        const existingWatchlist = await watchlistRepo.checkExists({
+          type: input.type,
+          value,
+          organizationId,
+        });
+
+        let watchlistId: string;
+
+        if (existingWatchlist) {
+          watchlistId = existingWatchlist.id;
+        } else {
+          const newWatchlist = await watchlistRepo.createEntry({
+            type: input.type,
+            value,
+            organizationId,
+            action: input.action,
+            description: input.description,
+            userId: user.id,
+          });
+          watchlistId = newWatchlist.id;
+        }
+
+        await bookingReportRepo.linkWatchlistToReport({
+          reportId: report.id,
+          watchlistId,
+        });
+
+        return { reportId: report.id, watchlistId, value };
+      })
+    );
 
     return {
       success: true,
-      message: "Successfully added to watchlist",
-      watchlistId: watchlist.id,
+      message: `Successfully added ${reportsToAdd.length} report(s) to watchlist`,
+      addedCount: reportsToAdd.length,
+      skippedCount: validReports.length - reportsToAdd.length,
+      results: results.map((r) => ({ reportId: r.reportId, watchlistId: r.watchlistId })),
     };
   } catch (error) {
     if (error instanceof Error && error.message.includes("already exists")) {
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
index a329c9c2e2a91d..da470b7f3f6533 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
@@ -3,9 +3,8 @@ import { z } from "zod";
 import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
 
 export const ZAddToWatchlistInputSchema = z.object({
-  reportId: z.string().uuid(),
+  reportIds: z.array(z.string().uuid()).min(1),
   type: z.nativeEnum(WatchlistType),
-  value: z.string().min(1),
   action: z.nativeEnum(WatchlistAction),
   description: z.string().optional(),
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts
new file mode 100644
index 00000000000000..a8d3a90d5457fb
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts
@@ -0,0 +1,36 @@
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { prisma } from "@calcom/prisma";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
+
+type DeleteBookingReportOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TDeleteBookingReportInputSchema;
+};
+
+export const deleteBookingReportHandler = async ({ ctx, input }: DeleteBookingReportOptions) => {
+  const { user } = ctx;
+
+  if (!user.organizationId) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "User must be part of an organization",
+    });
+  }
+
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+
+  await bookingReportRepo.deleteReport({
+    reportId: input.reportId,
+    organizationId: user.organizationId,
+  });
+
+  return { success: true };
+};
+
+export default deleteBookingReportHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts
new file mode 100644
index 00000000000000..2ed43063e7e038
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const ZDeleteBookingReportInputSchema = z.object({
+  reportId: z.string().uuid(),
+});
+
+export type TDeleteBookingReportInputSchema = z.infer<typeof ZDeleteBookingReportInputSchema>;

From abb827ab9020b8a84e438c05c90be3667d07f956 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Sun, 12 Oct 2025 20:54:19 +0530
Subject: [PATCH 41/54] tests: add unit tests

---
 .../addToWatchlist.handler.test.ts            | 303 ++++++++++++++++++
 .../deleteBookingReport.handler.test.ts       |  93 ++++++
 .../listBookingReports.handler.test.ts        | 213 ++++++++++++
 .../listBookingReports.handler.ts             |   2 +-
 4 files changed, 610 insertions(+), 1 deletion(-)
 create mode 100644 packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts

diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
new file mode 100644
index 00000000000000..a7cb4e21c00ce2
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
@@ -0,0 +1,303 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { WatchlistType, WatchlistAction, ReportReason } from "@calcom/prisma/enums";
+
+import { addToWatchlistHandler } from "./addToWatchlist.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("addToWatchlistHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+  };
+
+  const mockReports = [
+    {
+      id: "report-1",
+      bookingId: 1,
+      bookerEmail: "spammer@example.com",
+      reportedById: 1,
+      reason: ReportReason.SPAM,
+      description: null,
+      cancelled: false,
+      createdAt: new Date(),
+      watchlistId: null,
+      reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+      booking: {
+        id: 1,
+        startTime: new Date(),
+        endTime: new Date(),
+        title: "Test Booking",
+        uid: "booking-uid-1",
+      },
+      watchlist: null,
+    },
+    {
+      id: "report-2",
+      bookingId: 2,
+      bookerEmail: "user@spammer.com",
+      reportedById: 1,
+      reason: ReportReason.SPAM,
+      description: null,
+      cancelled: false,
+      createdAt: new Date(),
+      watchlistId: null,
+      reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+      booking: {
+        id: 2,
+        startTime: new Date(),
+        endTime: new Date(),
+        title: "Test Booking 2",
+        uid: "booking-uid-2",
+      },
+      watchlist: null,
+    },
+  ];
+
+  const mockReportRepo = {
+    findReportsByIds: vi.fn(),
+    linkWatchlistToReport: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    checkExists: vi.fn(),
+    createEntry: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined } },
+          input: {
+            reportIds: ["report-1"],
+            type: WatchlistType.EMAIL,
+            action: WatchlistAction.REPORT,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to manage watchlist",
+      });
+    });
+
+    it("should throw NOT_FOUND when report IDs don't exist or belong to different organization", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([]);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1", "report-2"],
+            type: WatchlistType.EMAIL,
+            action: WatchlistAction.REPORT,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: expect.stringContaining("Booking report(s) not found"),
+      });
+    });
+
+    it("should throw NOT_FOUND with specific missing IDs", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1", "report-2", "report-3"],
+            type: WatchlistType.EMAIL,
+            action: WatchlistAction.REPORT,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: expect.stringContaining("report-2, report-3"),
+      });
+    });
+  });
+
+  describe("duplicate prevention", () => {
+    it("should throw BAD_REQUEST when all reports are already in watchlist", async () => {
+      const reportsInWatchlist = mockReports.map((r) => ({ ...r, watchlistId: "watchlist-123" }));
+      mockReportRepo.findReportsByIds.mockResolvedValue(reportsInWatchlist);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1", "report-2"],
+            type: WatchlistType.EMAIL,
+            action: WatchlistAction.REPORT,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "All selected bookers are already in the watchlist",
+      });
+    });
+  });
+
+  describe("successful addition", () => {
+    it("should create new watchlist entry for EMAIL type and link report", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-new" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1"],
+          type: WatchlistType.EMAIL,
+          action: WatchlistAction.REPORT,
+          description: "Spam user",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.addedCount).toBe(1);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spammer@example.com",
+        organizationId: 100,
+        action: WatchlistAction.REPORT,
+        description: "Spam user",
+        userId: 1,
+      });
+      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
+        reportId: "report-1",
+        watchlistId: "watchlist-new",
+      });
+    });
+
+    it("should create new watchlist entry for DOMAIN type and link report", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-domain" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1"],
+          type: WatchlistType.DOMAIN,
+          action: WatchlistAction.BLOCK,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.DOMAIN,
+        value: "example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should reuse existing watchlist entry when value already exists", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      mockWatchlistRepo.checkExists.mockResolvedValue({ id: "existing-watchlist" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1"],
+          type: WatchlistType.EMAIL,
+          action: WatchlistAction.REPORT,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
+        reportId: "report-1",
+        watchlistId: "existing-watchlist",
+      });
+    });
+
+    it("should process multiple reports in batch", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue(mockReports);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry
+        .mockResolvedValueOnce({ id: "watchlist-1" })
+        .mockResolvedValueOnce({ id: "watchlist-2" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1", "report-2"],
+          type: WatchlistType.EMAIL,
+          action: WatchlistAction.BLOCK,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.addedCount).toBe(2);
+      expect(result.results).toHaveLength(2);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledTimes(2);
+      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledTimes(2);
+    });
+
+    it("should return correct counts when processing multiple reports", async () => {
+      const mixedReports = [mockReports[0], { ...mockReports[1], watchlistId: "already-added" }];
+      mockReportRepo.findReportsByIds.mockResolvedValue(mixedReports);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "new-watchlist" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1", "report-2"],
+          type: WatchlistType.EMAIL,
+          action: WatchlistAction.REPORT,
+        },
+      });
+
+      expect(result.addedCount).toBe(1);
+      expect(result.skippedCount).toBe(1);
+      expect(result.message).toBe("Successfully added 1 report(s) to watchlist");
+    });
+  });
+
+  describe("error handling", () => {
+    it("should handle already exists errors gracefully", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockRejectedValue(
+        new Error("Watchlist entry already exists for this value")
+      );
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1"],
+            type: WatchlistType.EMAIL,
+            action: WatchlistAction.REPORT,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "This entry already exists in the watchlist for your organization",
+      });
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts
new file mode 100644
index 00000000000000..8b21d6958e6ee9
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts
@@ -0,0 +1,93 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+
+import { deleteBookingReportHandler } from "./deleteBookingReport.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+
+describe("deleteBookingReportHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+  };
+
+  const mockReportRepo = {
+    deleteReport: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw UNAUTHORIZED when user is not part of an organization", async () => {
+      await expect(
+        deleteBookingReportHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined } },
+          input: {
+            reportId: "report-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "User must be part of an organization",
+      });
+
+      expect(mockReportRepo.deleteReport).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("successful deletion", () => {
+    it("should successfully delete report when user has organizationId", async () => {
+      mockReportRepo.deleteReport.mockResolvedValue(undefined);
+
+      const result = await deleteBookingReportHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportId: "report-123",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
+        reportId: "report-123",
+        organizationId: 100,
+      });
+    });
+
+    it("should call repository deleteReport with correct parameters", async () => {
+      mockReportRepo.deleteReport.mockResolvedValue(undefined);
+
+      await deleteBookingReportHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportId: "different-report-456",
+        },
+      });
+
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
+        reportId: "different-report-456",
+        organizationId: 100,
+      });
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe("error handling", () => {
+    it("should propagate repository errors when report not found", async () => {
+      mockReportRepo.deleteReport.mockRejectedValue(new Error("Report not found"));
+
+      await expect(
+        deleteBookingReportHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportId: "non-existent-report",
+          },
+        })
+      ).rejects.toThrow("Report not found");
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
new file mode 100644
index 00000000000000..d77da690bfa0de
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
@@ -0,0 +1,213 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { ReportReason } from "@calcom/prisma/enums";
+
+import { listBookingReportsHandler } from "./listBookingReports.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+
+describe("listBookingReportsHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+  };
+
+  const mockReportData = {
+    rows: [
+      {
+        id: "report-1",
+        bookingId: 1,
+        bookerEmail: "user1@example.com",
+        reportedById: 1,
+        reason: ReportReason.SPAM,
+        description: null,
+        cancelled: false,
+        createdAt: new Date("2025-01-01"),
+        watchlistId: null,
+        reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+        booking: {
+          id: 1,
+          startTime: new Date(),
+          endTime: new Date(),
+          title: "Test Booking",
+          uid: "uid-1",
+        },
+        watchlist: null,
+      },
+      {
+        id: "report-2",
+        bookingId: 2,
+        bookerEmail: "user2@example.com",
+        reportedById: 1,
+        reason: ReportReason.DONT_KNOW_PERSON,
+        description: "Unknown person",
+        cancelled: true,
+        createdAt: new Date("2025-01-02"),
+        watchlistId: "watchlist-123",
+        reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+        booking: {
+          id: 2,
+          startTime: new Date(),
+          endTime: new Date(),
+          title: "Test Booking 2",
+          uid: "uid-2",
+        },
+        watchlist: {
+          id: "watchlist-123",
+          type: "EMAIL" as const,
+          value: "user2@example.com",
+          action: "REPORT" as const,
+          description: null,
+        },
+      },
+    ],
+    meta: { totalRowCount: 2 },
+  };
+
+  const mockReportRepo = {
+    findAllReportedBookings: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        listBookingReportsHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined } },
+          input: {
+            limit: 10,
+            offset: 0,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to view booking reports",
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("successful listing", () => {
+    it("should return paginated booking reports with correct parameters", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
+
+      const result = await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+        },
+      });
+
+      expect(result).toEqual(mockReportData);
+      expect(result.rows).toHaveLength(2);
+      expect(result.meta.totalRowCount).toBe(2);
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        organizationId: 100,
+        skip: 0,
+        take: 10,
+        searchTerm: undefined,
+        filters: undefined,
+      });
+    });
+
+    it("should pass search term to repository", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
+
+      await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+          searchTerm: "spam@example.com",
+        },
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        organizationId: 100,
+        skip: 0,
+        take: 10,
+        searchTerm: "spam@example.com",
+        filters: undefined,
+      });
+    });
+
+    it("should pass filters to repository", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
+
+      const filters = {
+        reason: [ReportReason.SPAM, ReportReason.DONT_KNOW_PERSON],
+        cancelled: true,
+        hasWatchlist: false,
+      };
+
+      await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 20,
+          offset: 10,
+          filters,
+        },
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        organizationId: 100,
+        skip: 10,
+        take: 20,
+        searchTerm: undefined,
+        filters,
+      });
+    });
+
+    it("should return rows and meta from repository", async () => {
+      const customData = {
+        rows: [mockReportData.rows[0]],
+        meta: { totalRowCount: 1 },
+      };
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(customData);
+
+      const result = await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+        },
+      });
+
+      expect(result.rows).toHaveLength(1);
+      expect(result.meta.totalRowCount).toBe(1);
+    });
+  });
+
+  describe("pagination", () => {
+    it("should correctly pass limit and offset to repository", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue({
+        rows: [],
+        meta: { totalRowCount: 0 },
+      });
+
+      await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 50,
+          offset: 100,
+        },
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        organizationId: 100,
+        skip: 100,
+        take: 50,
+        searchTerm: undefined,
+        filters: undefined,
+      });
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
index 53dfe9144660a1..7ccbd605b7946a 100644
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
@@ -16,7 +16,7 @@ type ListBookingReportsOptions = {
 export const listBookingReportsHandler = async ({ ctx, input }: ListBookingReportsOptions) => {
   const { user } = ctx;
 
-  const organizationId = user.profile?.organizationId || user.organizationId;
+  const organizationId = user.organizationId;
   if (!organizationId) {
     throw new TRPCError({
       code: "FORBIDDEN",

From 46f2ea37932627cdbe22d76bd9e022066e25b560 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 13 Oct 2025 19:04:15 +0530
Subject: [PATCH 42/54] refactor: improvements

---
 .../privacy/booking-reports-table.tsx         | 33 +++++++++-
 .../components/add-to-watchlist-modal.tsx     | 63 ++-----------------
 .../booking-report-details-sheet.tsx          | 14 ++---
 .../components/bulk-add-to-watchlist.tsx      |  2 +-
 apps/web/public/static/locales/en/common.json | 28 ++++-----
 .../lib/server/repository/bookingReport.ts    |  2 +-
 .../organizations/addToWatchlist.handler.ts   |  5 +-
 .../organizations/addToWatchlist.schema.ts    |  3 +-
 8 files changed, 62 insertions(+), 88 deletions(-)

diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index 241b6809fa1b06..0b98a0bbe57748 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -53,7 +53,7 @@ export function BookingReportsTable() {
   const filters = useMemo(() => {
     const hasWatchlistFilter = columnFilters.find((f) => f.id === "hasWatchlist");
 
-    let hasWatchlistValue: boolean | undefined = false;
+    let hasWatchlistValue: boolean | undefined = undefined;
 
     if (hasWatchlistFilter && hasWatchlistFilter.value.type === ColumnFilterType.MULTI_SELECT) {
       const filterValues = hasWatchlistFilter.value.data;
@@ -152,16 +152,17 @@ export function BookingReportsTable() {
             DONT_KNOW_PERSON: "orange",
             OTHER: "gray",
           };
+          const reason = t(row.original.reason.toLowerCase());
           return (
             <Badge variant={reasonColors[row.original.reason] || "gray"}>
-              {t(row.original.reason.toLowerCase())}
+              {reason.charAt(0).toUpperCase() + reason.slice(1)}
             </Badge>
           );
         },
       },
       {
         id: "hasWatchlist",
-        header: t("in_watchlist"),
+        header: t("in_blocklist"),
         accessorFn: (row) => (row.watchlistId ? "true" : "false"),
         size: 120,
         meta: {
@@ -216,6 +217,19 @@ export function BookingReportsTable() {
                           {t("view")}
                         </DropdownItem>
                       </DropdownMenuItem>
+                      {!report.watchlistId && (
+                        <DropdownMenuItem>
+                          <DropdownItem
+                            type="button"
+                            onClick={() => {
+                              setSelectedReport(report);
+                              setShowWatchlistModal(true);
+                            }}
+                            StartIcon="shield-check">
+                            {t("add_to_blocklist")}
+                          </DropdownItem>
+                        </DropdownMenuItem>
+                      )}
                       <DropdownMenuItem>
                         <DropdownItem
                           type="button"
@@ -259,6 +273,19 @@ export function BookingReportsTable() {
                           {t("view")}
                         </DropdownItem>
                       </DropdownMenuItem>
+                      {!report.watchlistId && (
+                        <DropdownMenuItem>
+                          <DropdownItem
+                            type="button"
+                            onClick={() => {
+                              setSelectedReport(report);
+                              setShowWatchlistModal(true);
+                            }}
+                            StartIcon="shield-check">
+                            {t("add_to_blocklist")}
+                          </DropdownItem>
+                        </DropdownMenuItem>
+                      )}
                       <DropdownMenuItem>
                         <DropdownItem
                           type="button"
diff --git a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
index bd63c5ee973473..a62028f2a6c8f0 100644
--- a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
@@ -5,7 +5,7 @@ import { useForm } from "react-hook-form";
 import { z } from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+import { WatchlistType } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
@@ -24,7 +24,6 @@ interface AddToWatchlistModalProps {
 
 const formSchema = z.object({
   type: z.nativeEnum(WatchlistType),
-  action: z.nativeEnum(WatchlistAction),
   description: z.string().optional(),
 });
 
@@ -38,7 +37,6 @@ export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWat
     resolver: zodResolver(formSchema),
     defaultValues: {
       type: WatchlistType.EMAIL,
-      action: WatchlistAction.REPORT,
       description: "",
     },
   });
@@ -51,11 +49,10 @@ export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWat
   }
 
   const watchlistType = form.watch("type");
-  const actionType = form.watch("action");
 
   const addToWatchlistMutation = trpc.viewer.organizations.addToWatchlist.useMutation({
     onSuccess: () => {
-      showToast(t("successfully_added_to_watchlist"), "success");
+      showToast(t("successfully_added_to_blocklist"), "success");
       utils.viewer.organizations.listBookingReports.invalidate();
       onClose();
       form.reset();
@@ -71,7 +68,6 @@ export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWat
     addToWatchlistMutation.mutate({
       reportIds,
       type: data.type,
-      action: data.action,
       description: data.description,
     });
   };
@@ -80,11 +76,11 @@ export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWat
     <Dialog open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
       <DialogContent enableOverflow>
         <DialogHeader
-          title={t("add_to_watchlist")}
+          title={t("add_to_blocklist")}
           subtitle={
             isBulk
-              ? t("add_multiple_to_watchlist_subtitle", { count: reports.length })
-              : t("add_to_watchlist_subtitle", { email: firstReport.bookerEmail })
+              ? t("add_multiple_to_blocklist_subtitle", { count: reports.length })
+              : t("add_to_blocklist_subtitle", { email: firstReport.bookerEmail })
           }
         />
 
@@ -126,53 +122,6 @@ export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWat
               />
             </div>
 
-            <div>
-              <Label>{t("what_should_happen")}</Label>
-              <Select
-                options={[
-                  {
-                    label: t("flag_future_bookings"),
-                    value: WatchlistAction.REPORT,
-                    description: t("flag_future_bookings_description"),
-                  },
-                  {
-                    label: t("block_all_bookings"),
-                    value: WatchlistAction.BLOCK,
-                    description: t("block_all_bookings_description"),
-                  },
-                  {
-                    label: t("notify_admins"),
-                    value: WatchlistAction.ALERT,
-                    description: t("notify_admins_description"),
-                  },
-                ]}
-                value={
-                  actionType === WatchlistAction.REPORT
-                    ? {
-                        label: t("flag_future_bookings"),
-                        value: WatchlistAction.REPORT,
-                        description: t("flag_future_bookings_description"),
-                      }
-                    : actionType === WatchlistAction.BLOCK
-                    ? {
-                        label: t("block_all_bookings"),
-                        value: WatchlistAction.BLOCK,
-                        description: t("block_all_bookings_description"),
-                      }
-                    : {
-                        label: t("notify_admins"),
-                        value: WatchlistAction.ALERT,
-                        description: t("notify_admins_description"),
-                      }
-                }
-                onChange={(option) => {
-                  if (option && "value" in option) {
-                    form.setValue("action", option.value as WatchlistAction);
-                  }
-                }}
-              />
-            </div>
-
             <div>
               <TextAreaField
                 {...form.register("description")}
@@ -187,7 +136,7 @@ export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWat
               {t("cancel")}
             </Button>
             <Button type="submit" loading={addToWatchlistMutation.isPending}>
-              {t("add_to_watchlist")}
+              {t("add_to_blocklist")}
             </Button>
           </DialogFooter>
         </Form>
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
index 800ecde3f7b22e..b50b51f75da4d7 100644
--- a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
@@ -44,7 +44,7 @@ export function BookingReportDetailsSheet({
                 </Badge>
                 {report.watchlistId && (
                   <Badge variant="blue" className="text-xs">
-                    {t("in_watchlist")}
+                    {t("in_blocklist")}
                   </Badge>
                 )}
                 {report.cancelled && (
@@ -116,23 +116,23 @@ export function BookingReportDetailsSheet({
 
           {report.watchlistId && report.watchlist && (
             <div className="space-y-4">
-              <h3 className="text-emphasis text-sm font-semibold">{t("watchlist_info")}</h3>
+              <h3 className="text-emphasis text-sm font-semibold">{t("blocklist_info")}</h3>
               <div className="space-y-3">
                 <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("watchlist_type")}</span>
+                  <span className="text-subtle text-xs">{t("blocklist_type")}</span>
                   <span className="text-default text-sm">{report.watchlist.type}</span>
                 </div>
                 <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("watchlist_value")}</span>
+                  <span className="text-subtle text-xs">{t("blocklist_value")}</span>
                   <span className="text-default text-sm">{report.watchlist.value}</span>
                 </div>
                 <div className="flex flex-col">
-                  <span className="text-subtle text-xs">{t("watchlist_action")}</span>
+                  <span className="text-subtle text-xs">{t("blocklist_action")}</span>
                   <span className="text-default text-sm">{report.watchlist.action}</span>
                 </div>
                 {report.watchlist.description && (
                   <div className="flex flex-col">
-                    <span className="text-subtle text-xs">{t("watchlist_description")}</span>
+                    <span className="text-subtle text-xs">{t("blocklist_description")}</span>
                     <span className="text-default text-sm">{report.watchlist.description}</span>
                   </div>
                 )}
@@ -143,7 +143,7 @@ export function BookingReportDetailsSheet({
           {!report.watchlistId && onAddToWatchlist && (
             <div className="pt-4">
               <Button onClick={onAddToWatchlist} color="primary" className="w-full justify-center">
-                {t("add_to_watchlist")}
+                {t("add_to_blocklist")}
               </Button>
             </div>
           )}
diff --git a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx b/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
index aa5b82cc52f402..f4d45a0ddf30b9 100644
--- a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
@@ -38,7 +38,7 @@ export function BulkAddToWatchlist({ reports, onSuccess }: BulkAddToWatchlistPro
         onClick={() => {
           setShowModal(true);
         }}>
-        {t("add_to_watchlist")}
+        {t("add_to_blocklist")}
       </Button>
 
       {showModal && (
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index bc53d61a427748..455ce2de8273f8 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -2863,15 +2863,14 @@
   "reported_by": "Reported By",
   "reported_at": "Reported At",
   "booking_date": "Booking Date",
-  "add_to_watchlist": "Add to Watchlist",
-  "in_watchlist": "In Watchlist",
-  "not_in_watchlist": "Not in Watchlist",
+  "add_to_blocklist": "Add to Blocklist",
+  "in_blocklist": "In Blocklist",
+  "not_in_blocklist": "Not in Blocklist",
   "view_booking_page": "View booking page",
-  "successfully_added_to_watchlist": "Successfully added to watchlist",
-  "add_booker_to_organization_watchlist": "Add booker to your organization's watchlist",
-  "add_to_watchlist_subtitle": "Monitor or restrict {{email}} on future bookings",
-  "add_multiple_to_watchlist_subtitle": "Add {{count}} booker(s) to watchlist with the same settings",
-  "what_to_add": "What to add to watchlist?",
+  "successfully_added_to_blocklist": "Successfully added to blocklist",
+  "add_to_blocklist_subtitle": "Monitor or restrict {{email}} on future bookings",
+  "add_multiple_to_blocklist_subtitle": "Add {{count}} booker(s) to blocklist with the same settings",
+  "what_to_add": "What to add to blocklist?",
   "this_email_address": "This email address",
   "entire_domain": "Entire domain",
   "all_emails_from": "All emails from",
@@ -2882,16 +2881,15 @@
   "block_all_bookings_description": "Prevent any bookings from being made",
   "notify_admins": "Notify admins",
   "notify_admins_description": "Send alerts when booking attempts are made",
-  "add_internal_note_placeholder": "Add a note to help your team understand why this was added to the watchlist",
+  "add_internal_note_placeholder": "Add a note to help your team understand why this was added to the blocklist",
   "report_details": "Report Details",
-  "watchlist_info": "Watchlist Information",
+  "blocklist_info": "Blocklist Information",
   "no_title": "No Title",
   "booking_title": "Booking Title",
-  "watchlist_value": "Watchlist Value",
-  "watchlist_action": "Watchlist Action",
-  "watchlist_description": "Watchlist Description",
-  "add_to_list": "Add to Watchlist",
-  "watchlist_type": "Watchlist Type",
+  "blocklist_value": "Blocklist Value",
+  "blocklist_action": "Blocklist Action",
+  "blocklist_description": "Blocklist Description",
+  "blocklist_type": "Blocklist Type",
   "delete_booking_report": "Delete Booking Report",
   "delete_booking_report_confirmation": "Are you sure you want to delete this booking report? This action cannot be undone.",
   "booking_report_deleted": "Booking report deleted successfully",
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index 55f8831d99cf9f..ab1634ce6d2e9b 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -119,7 +119,7 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
             },
           },
         },
-        orderBy: { createdAt: "desc" },
+        orderBy: [{ watchlistId: { sort: "asc", nulls: "first" } }, { createdAt: "desc" }],
       }),
     ]);
 
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
index 8cb31000632d82..74f775743bd08f 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
@@ -1,10 +1,11 @@
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
 import { prisma } from "@calcom/prisma";
+import { WatchlistAction } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
-import type { TrpcSessionUser } from "../../../../trpc";
+import type { TrpcSessionUser } from "../../../types";
 import type { TAddToWatchlistInputSchema } from "./addToWatchlist.schema";
 
 type AddToWatchlistOptions = {
@@ -74,7 +75,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
             type: input.type,
             value,
             organizationId,
-            action: input.action,
+            action: WatchlistAction.BLOCK,
             description: input.description,
             userId: user.id,
           });
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
index da470b7f3f6533..b081ef675b99fd 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
@@ -1,11 +1,10 @@
 import { z } from "zod";
 
-import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+import { WatchlistType } from "@calcom/prisma/enums";
 
 export const ZAddToWatchlistInputSchema = z.object({
   reportIds: z.array(z.string().uuid()).min(1),
   type: z.nativeEnum(WatchlistType),
-  action: z.nativeEnum(WatchlistAction),
   description: z.string().optional(),
 });
 

From 85bf89914e7049776e6a7a3f42189810a91a53cb Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 14:03:35 +0530
Subject: [PATCH 43/54] fix: conflicts

---
 .../privacy/booking-reports-table.tsx         |  4 +-
 .../booking-report-details-sheet.tsx          |  2 +-
 .../repository/bookingReport.interface.ts     |  6 +-
 .../lib/server/repository/bookingReport.ts    |  8 +-
 .../server/service/bookingAccessService.ts    | 96 -------------------
 .../migration.sql                             | 41 --------
 .../migration.sql                             | 48 ----------
 7 files changed, 10 insertions(+), 195 deletions(-)
 delete mode 100644 packages/lib/server/service/bookingAccessService.ts
 delete mode 100644 packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
 delete mode 100644 packages/prisma/migrations/20251011193952_add_booking_report/migration.sql

diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index 0b98a0bbe57748..c2bd2501fe09ce 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -134,9 +134,9 @@ export function BookingReportsTable() {
       {
         id: "reportedBy",
         header: t("reported_by"),
-        accessorFn: (row) => row.reporter.email,
+        accessorFn: (row) => row.reporter?.email ?? "-",
         size: 180,
-        cell: ({ row }) => <span className="text-default">{row.original.reporter.email}</span>,
+        cell: ({ row }) => <span className="text-default">{row.original.reporter?.email ?? "-"}</span>,
       },
       {
         id: "reason",
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
index b50b51f75da4d7..bfc973961845bb 100644
--- a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
@@ -94,7 +94,7 @@ export function BookingReportDetailsSheet({
               <div className="flex flex-col">
                 <span className="text-subtle text-xs">{t("reported_by")}</span>
                 <span className="text-default text-sm">
-                  {report.reporter.name || ""} ({report.reporter.email})
+                  {report.reporter.name || ""} ({report.reporter.email ?? "-"})
                 </span>
               </div>
               <div className="flex flex-col">
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index 0fa6babe29ca2a..f0c2cee3e9153c 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -20,16 +20,16 @@ export interface BookingReportSummary {
 
 export interface BookingReportWithDetails {
   id: string;
-  bookingId: number;
+  bookingUid: string;
   bookerEmail: string;
-  reportedById: number;
+  reportedById: number | null;
   reason: BookingReportReason;
   description: string | null;
   cancelled: boolean;
   createdAt: Date;
   watchlistId: string | null;
 
-  reporter: {
+  reporter?: {
     id: number;
     name: string | null;
     email: string;
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index ab1634ce6d2e9b..1c477211087db2 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -1,9 +1,9 @@
-import type { Prisma, PrismaClient } from "@calcom/prisma";
+import type { PrismaClient } from "@calcom/prisma";
+import type { Prisma } from "@calcom/prisma/client";
 
 import type {
   IBookingReportRepository,
   CreateBookingReportInput,
-  BookingReportSummary,
   BookingReportWithDetails,
   ListBookingReportsFilters,
 } from "./bookingReport.interface";
@@ -85,7 +85,7 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
         take: params.take,
         select: {
           id: true,
-          bookingId: true,
+          bookingUid: true,
           bookerEmail: true,
           reportedById: true,
           reason: true,
@@ -150,7 +150,7 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
       },
       select: {
         id: true,
-        bookingId: true,
+        bookingUid: true,
         bookerEmail: true,
         reportedById: true,
         reason: true,
diff --git a/packages/lib/server/service/bookingAccessService.ts b/packages/lib/server/service/bookingAccessService.ts
deleted file mode 100644
index 9909b0c8a245d5..00000000000000
--- a/packages/lib/server/service/bookingAccessService.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import type { PrismaClient } from "@calcom/prisma";
-
-import { BookingRepository } from "../repository/booking";
-import { UserRepository } from "../repository/user";
-
-type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["getBookingForAccessCheck"]>>>;
-
-export class BookingAccessService {
-  constructor(private prismaClient: PrismaClient) {}
-
-  private isUserAHost(userId: number, booking: BookingForAccessCheck): boolean {
-    const hostMap = new Map<number, { id: number; email: string }>();
-
-    const addHost = (id: number, email: string) => {
-      if (!hostMap.has(id)) {
-        hostMap.set(id, { id, email });
-      }
-    };
-
-    booking?.eventType?.hosts?.forEach((host) => addHost(host.userId, host.user.email));
-    booking?.eventType?.users?.forEach((user) => addHost(user.id, user.email));
-
-    if (booking?.user?.id && booking?.user?.email) {
-      addHost(booking.user.id, booking.user.email);
-    }
-
-    const attendeeEmails = new Set(booking.attendees?.map((attendee) => attendee.email));
-    const filteredHosts = Array.from(hostMap.values()).filter(
-      (host) => attendeeEmails.has(host.email) || host.id === booking.user?.id
-    );
-
-    return filteredHosts.some((host) => host.id === userId);
-  }
-
-  /**
-   * Determines if a user has access to a booking based on:
-   * 1. Being the booking organizer
-   * 2. Being one of the hosts in a multi-host booking
-   * 3. Being a team/org admin where the event type belongs
-   * 4. Being an org admin where the booking organizer belongs (for personal bookings)
-   * 5. Being a team admin of any team the booking organizer belongs to (for personal bookings)
-   */
-  async doesUserIdHaveAccessToBooking({
-    userId,
-    bookingId,
-  }: {
-    userId: number;
-    bookingId: number;
-  }): Promise<boolean> {
-    const bookingRepo = new BookingRepository(this.prismaClient);
-    const userRepo = new UserRepository(this.prismaClient);
-
-    const booking = await bookingRepo.getBookingForAccessCheck({ bookingId });
-
-    if (!booking) return false;
-
-    if (userId === booking.userId) return true;
-
-    if (this.isUserAHost(userId, booking)) return true;
-
-    // If booking has a teamId, check if user is admin of that team/org
-    if (booking.eventType?.teamId) {
-      const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
-        userId,
-        teamId: booking.eventType.teamId,
-      });
-      return isAdminOrUser;
-    }
-
-    if (!booking.userId) return false;
-
-    const bookingOwner = await userRepo.getUserOrganizationAndTeams({ userId: booking.userId });
-
-    if (!bookingOwner) return false;
-
-    // Check if user is admin of booking organizer's organization
-    if (bookingOwner.organizationId) {
-      const isOrgAdmin = await userRepo.isAdminOfTeamOrParentOrg({
-        userId,
-        teamId: bookingOwner.organizationId,
-      });
-      if (isOrgAdmin) return true;
-    }
-
-    // Check if user is admin of any team the booking organizer belongs to
-    for (const membership of bookingOwner.teams) {
-      const isTeamAdmin = await userRepo.isAdminOfTeamOrParentOrg({
-        userId,
-        teamId: membership.teamId,
-      });
-      if (isTeamAdmin) return true;
-    }
-
-    return false;
-  }
-}
diff --git a/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql b/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
deleted file mode 100644
index adf78cf9be492e..00000000000000
--- a/packages/prisma/migrations/20251008074026_add_booking_report/migration.sql
+++ /dev/null
@@ -1,41 +0,0 @@
--- CreateEnum
-CREATE TYPE "ReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
-
--- CreateTable
-CREATE TABLE "BookingReport" (
-    "id" UUID NOT NULL,
-    "bookingId" INTEGER NOT NULL,
-    "bookerEmail" TEXT NOT NULL,
-    "reportedById" INTEGER NOT NULL,
-    "reason" "ReportReason" NOT NULL,
-    "description" TEXT,
-    "cancelled" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "watchlistId" UUID,
-
-    CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "BookingReport_bookingId_key" ON "BookingReport"("bookingId");
-
--- CreateIndex
-CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
-
--- CreateIndex
-CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
-
--- CreateIndex
-CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
-
--- CreateIndex
-CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql b/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
deleted file mode 100644
index b7303d4f8f8882..00000000000000
--- a/packages/prisma/migrations/20251011193952_add_booking_report/migration.sql
+++ /dev/null
@@ -1,48 +0,0 @@
--- CreateEnum
-CREATE TYPE "ReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
-
--- CreateTable
-CREATE TABLE "BookingReport" (
-    "id" UUID NOT NULL,
-    "bookingId" INTEGER NOT NULL,
-    "bookerEmail" TEXT NOT NULL,
-    "reportedById" INTEGER NOT NULL,
-    "organizationId" INTEGER,
-    "reason" "ReportReason" NOT NULL,
-    "description" TEXT,
-    "cancelled" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "watchlistId" UUID,
-
-    CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "BookingReport_bookingId_key" ON "BookingReport"("bookingId");
-
--- CreateIndex
-CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
-
--- CreateIndex
-CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
-
--- CreateIndex
-CREATE INDEX "BookingReport_organizationId_idx" ON "BookingReport"("organizationId");
-
--- CreateIndex
-CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
-
--- CreateIndex
-CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;

From 6efa3600a8d1ce1df5b2c4b658081297df364c3d Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 14:15:29 +0530
Subject: [PATCH 44/54] chore: cleaning up

---
 .../privacy/booking-reports-table.tsx         |  8 +--
 ...t-modal.tsx => add-to-blocklist-modal.tsx} |  2 +-
 ...atchlist.tsx => bulk-add-to-blocklist.tsx} |  8 +--
 .../booking-report.repository.interface.ts    | 30 ----------
 .../bookings/lib/booking-report.repository.ts | 59 -------------------
 5 files changed, 9 insertions(+), 98 deletions(-)
 rename apps/web/modules/settings/organizations/privacy/components/{add-to-watchlist-modal.tsx => add-to-blocklist-modal.tsx} (98%)
 rename apps/web/modules/settings/organizations/privacy/components/{bulk-add-to-watchlist.tsx => bulk-add-to-blocklist.tsx} (79%)
 delete mode 100644 packages/features/bookings/lib/booking-report.repository.interface.ts
 delete mode 100644 packages/features/bookings/lib/booking-report.repository.ts

diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index c2bd2501fe09ce..5313ccdfdf5308 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -33,9 +33,9 @@ import { Checkbox } from "@calcom/ui/components/form";
 import { showToast } from "@calcom/ui/components/toast";
 import { Tooltip } from "@calcom/ui/components/tooltip";
 
-import { AddToWatchlistModal } from "./components/add-to-watchlist-modal";
+import { AddToBlocklistModal } from "./components/add-to-blocklist-modal";
 import { BookingReportDetailsSheet } from "./components/booking-report-details-sheet";
-import { BulkAddToWatchlist } from "./components/bulk-add-to-watchlist";
+import { BulkAddToBlocklist } from "./components/bulk-add-to-blocklist";
 
 type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
 
@@ -366,7 +366,7 @@ export function BookingReportsTable() {
             <p className="text-brand-subtle px-2 text-center text-xs leading-none sm:text-sm sm:font-medium">
               {t("number_selected", { count: numberOfSelectedRows })}
             </p>
-            <BulkAddToWatchlist
+            <BulkAddToBlocklist
               reports={table.getSelectedRowModel().flatRows.map((row) => row.original)}
               onSuccess={() => table.toggleAllPageRowsSelected(false)}
             />
@@ -394,7 +394,7 @@ export function BookingReportsTable() {
       )}
 
       {selectedReport && showWatchlistModal && (
-        <AddToWatchlistModal
+        <AddToBlocklistModal
           open={showWatchlistModal}
           onClose={() => {
             setShowWatchlistModal(false);
diff --git a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
similarity index 98%
rename from apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
rename to apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
index a62028f2a6c8f0..edc402b22cd19f 100644
--- a/apps/web/modules/settings/organizations/privacy/components/add-to-watchlist-modal.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
@@ -29,7 +29,7 @@ const formSchema = z.object({
 
 type FormValues = z.infer<typeof formSchema>;
 
-export function AddToWatchlistModal({ open, onClose, report, reports }: AddToWatchlistModalProps) {
+export function AddToBlocklistModal({ open, onClose, report, reports }: AddToWatchlistModalProps) {
   const { t } = useLocale();
   const utils = trpc.useUtils();
 
diff --git a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx b/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-blocklist.tsx
similarity index 79%
rename from apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
rename to apps/web/modules/settings/organizations/privacy/components/bulk-add-to-blocklist.tsx
index f4d45a0ddf30b9..92ce0413d07d68 100644
--- a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-watchlist.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-blocklist.tsx
@@ -6,16 +6,16 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
 
-import { AddToWatchlistModal } from "./add-to-watchlist-modal";
+import { AddToBlocklistModal } from "./add-to-blocklist-modal";
 
 type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
 
-interface BulkAddToWatchlistProps {
+interface BulkAddToBlocklistProps {
   reports: BookingReport[];
   onSuccess: () => void;
 }
 
-export function BulkAddToWatchlist({ reports, onSuccess }: BulkAddToWatchlistProps) {
+export function BulkAddToBlocklist({ reports, onSuccess }: BulkAddToBlocklistProps) {
   const { t } = useLocale();
   const [showModal, setShowModal] = useState(false);
 
@@ -42,7 +42,7 @@ export function BulkAddToWatchlist({ reports, onSuccess }: BulkAddToWatchlistPro
       </Button>
 
       {showModal && (
-        <AddToWatchlistModal open={showModal} onClose={handleModalClose} reports={reportsToAdd} />
+        <AddToBlocklistModal open={showModal} onClose={handleModalClose} reports={reportsToAdd} />
       )}
     </>
   );
diff --git a/packages/features/bookings/lib/booking-report.repository.interface.ts b/packages/features/bookings/lib/booking-report.repository.interface.ts
deleted file mode 100644
index ac79ad190c57e7..00000000000000
--- a/packages/features/bookings/lib/booking-report.repository.interface.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { ReportReason } from "@calcom/prisma/enums";
-
-export interface CreateBookingReportInput {
-  bookingId: number;
-  bookerEmail: string | null;
-  reportedById: number;
-  reason: ReportReason;
-  description?: string;
-  cancelled: boolean;
-}
-
-export interface BookingReportSummary {
-  id: string;
-  reportedById: number;
-  reason: ReportReason;
-  description: string | null;
-  createdAt: Date;
-}
-
-export interface IBookingReportRepository {
-  createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
-
-  findReportForBooking(bookingId: number): Promise<BookingReportSummary | null>;
-
-
-  findAllReportedBookings(params: {
-    skip?: number;
-    take?: number;
-  }): Promise<BookingReportSummary[]>;
-}
diff --git a/packages/features/bookings/lib/booking-report.repository.ts b/packages/features/bookings/lib/booking-report.repository.ts
deleted file mode 100644
index 6c2ac28d242b22..00000000000000
--- a/packages/features/bookings/lib/booking-report.repository.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { PrismaClient } from "@calcom/prisma";
-
-import type {
-  IBookingReportRepository,
-  CreateBookingReportInput,
-  BookingReportSummary,
-} from "./booking-report.repository.interface";
-
-export class BookingReportRepository implements IBookingReportRepository {
-  constructor(private readonly prismaClient: PrismaClient) {}
-
-  async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
-    const report = await this.prismaClient.bookingReport.create({
-      data: {
-        bookingId: input.bookingId,
-        bookerEmail: input.bookerEmail ?? "",
-        reportedById: input.reportedById,
-        reason: input.reason,
-        description: input.description,
-        cancelled: input.cancelled,
-      },
-      select: { id: true },
-    });
-    return report;
-  }
-
-  async findReportForBooking(bookingId: number): Promise<BookingReportSummary | null> {
-    const report = await this.prismaClient.bookingReport.findUnique({
-      where: { bookingId },
-      select: {
-        id: true,
-        reportedById: true,
-        reason: true,
-        description: true,
-        createdAt: true,
-      },
-    });
-    return report;
-  }
-
-  async findAllReportedBookings(params: {
-    skip?: number;
-    take?: number;
-  }): Promise<BookingReportSummary[]> {
-    const reports = await this.prismaClient.bookingReport.findMany({
-      skip: params.skip,
-      take: params.take,
-      select: {
-        id: true,
-        reportedById: true,
-        reason: true,
-        description: true,
-        createdAt: true,
-      },
-      orderBy: { createdAt: "desc" },
-    });
-    return reports;
-  }
-}

From 0e63309bda824ac005b4dff64c98d353bac6c9c4 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 15:55:45 +0530
Subject: [PATCH 45/54] fix: types

---
 .../organizations/privacy/booking-reports-table.tsx       | 2 +-
 .../privacy/components/booking-report-details-sheet.tsx   | 8 ++++----
 packages/lib/server/repository/bookingReport.interface.ts | 2 +-
 .../trpc/server/routers/viewer/bookings/get.handler.ts    | 3 ---
 .../viewer/organizations/addToWatchlist.handler.test.ts   | 6 +++---
 .../organizations/listBookingReports.handler.test.ts      | 8 ++++----
 .../viewer/organizations/listBookingReports.handler.ts    | 5 +++--
 .../viewer/organizations/listBookingReports.schema.ts     | 4 ++--
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index 5313ccdfdf5308..d993c7e3d3d646 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -382,7 +382,7 @@ export function BookingReportsTable() {
             setSelectedReport(null);
           }}
           report={selectedReport}
-          onAddToWatchlist={
+          onAddToBlocklist={
             !selectedReport.watchlistId
               ? () => {
                   setShowDetailsSheet(false);
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
index bfc973961845bb..60c59c884b2087 100644
--- a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
@@ -14,14 +14,14 @@ interface BookingReportDetailsSheetProps {
   open: boolean;
   onClose: () => void;
   report: BookingReport;
-  onAddToWatchlist?: () => void;
+  onAddToBlocklist?: () => void;
 }
 
 export function BookingReportDetailsSheet({
   open,
   onClose,
   report,
-  onAddToWatchlist,
+  onAddToBlocklist,
 }: BookingReportDetailsSheetProps) {
   const { t } = useLocale();
 
@@ -140,9 +140,9 @@ export function BookingReportDetailsSheet({
             </div>
           )}
 
-          {!report.watchlistId && onAddToWatchlist && (
+          {!report.watchlistId && onAddToBlocklist && (
             <div className="pt-4">
-              <Button onClick={onAddToWatchlist} color="primary" className="w-full justify-center">
+              <Button onClick={onAddToBlocklist} color="primary" className="w-full justify-center">
                 {t("add_to_blocklist")}
               </Button>
             </div>
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index f0c2cee3e9153c..fff2a05da6515d 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -33,7 +33,7 @@ export interface BookingReportWithDetails {
     id: number;
     name: string | null;
     email: string;
-  };
+  } | null;
   booking: {
     id: number;
     startTime: Date;
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 89912eaee30252..315b8679aeaf9e 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -728,12 +728,9 @@ export async function getBookings({
         }
       }
 
-      const report = await bookingReportRepo.findReportForBooking(booking.id);
-
       return {
         ...booking,
         rescheduler,
-        report,
         eventType: {
           ...booking.eventType,
           recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
index a7cb4e21c00ce2..9ac354576b6e85 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
-import { WatchlistType, WatchlistAction, ReportReason } from "@calcom/prisma/enums";
+import { WatchlistType, WatchlistAction, BookingReportReason } from "@calcom/prisma/enums";
 
 import { addToWatchlistHandler } from "./addToWatchlist.handler";
 
@@ -22,7 +22,7 @@ describe("addToWatchlistHandler", () => {
       bookingId: 1,
       bookerEmail: "spammer@example.com",
       reportedById: 1,
-      reason: ReportReason.SPAM,
+      reason: BookingReportReason.SPAM,
       description: null,
       cancelled: false,
       createdAt: new Date(),
@@ -42,7 +42,7 @@ describe("addToWatchlistHandler", () => {
       bookingId: 2,
       bookerEmail: "user@spammer.com",
       reportedById: 1,
-      reason: ReportReason.SPAM,
+      reason: BookingReportReason.SPAM,
       description: null,
       cancelled: false,
       createdAt: new Date(),
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
index d77da690bfa0de..82b751ee7f4c48 100644
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { ReportReason } from "@calcom/prisma/enums";
+import { BookingReportReason } from "@calcom/prisma/enums";
 
 import { listBookingReportsHandler } from "./listBookingReports.handler";
 
@@ -21,7 +21,7 @@ describe("listBookingReportsHandler", () => {
         bookingId: 1,
         bookerEmail: "user1@example.com",
         reportedById: 1,
-        reason: ReportReason.SPAM,
+        reason: BookingReportReason.SPAM,
         description: null,
         cancelled: false,
         createdAt: new Date("2025-01-01"),
@@ -41,7 +41,7 @@ describe("listBookingReportsHandler", () => {
         bookingId: 2,
         bookerEmail: "user2@example.com",
         reportedById: 1,
-        reason: ReportReason.DONT_KNOW_PERSON,
+        reason: BookingReportReason.DONT_KNOW_PERSON,
         description: "Unknown person",
         cancelled: true,
         createdAt: new Date("2025-01-02"),
@@ -143,7 +143,7 @@ describe("listBookingReportsHandler", () => {
       mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
 
       const filters = {
-        reason: [ReportReason.SPAM, ReportReason.DONT_KNOW_PERSON],
+        reason: [BookingReportReason.SPAM, BookingReportReason.DONT_KNOW_PERSON],
         cancelled: true,
         hasWatchlist: false,
       };
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
index 7ccbd605b7946a..489998e4ad911d 100644
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
@@ -3,12 +3,13 @@ import { prisma } from "@calcom/prisma";
 
 import { TRPCError } from "@trpc/server";
 
-import type { TrpcSessionUser } from "../../../../trpc";
 import type { TListBookingReportsInputSchema } from "./listBookingReports.schema";
 
 type ListBookingReportsOptions = {
   ctx: {
-    user: NonNullable<TrpcSessionUser>;
+    user: {
+      organizationId?: number;
+    };
   };
   input: TListBookingReportsInputSchema;
 };
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
index e2a3e348f1ed3a..843561fc84af7d 100644
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { ReportReason } from "@calcom/prisma/enums";
+import { BookingReportReason } from "@calcom/prisma/enums";
 
 export const ZListBookingReportsInputSchema = z.object({
   limit: z.number().min(1).max(100).optional(),
@@ -8,7 +8,7 @@ export const ZListBookingReportsInputSchema = z.object({
   searchTerm: z.string().optional(),
   filters: z
     .object({
-      reason: z.array(z.nativeEnum(ReportReason)).optional(),
+      reason: z.array(z.nativeEnum(BookingReportReason)).optional(),
       cancelled: z.boolean().optional(),
       hasWatchlist: z.boolean().optional(),
       dateRange: z

From 8e398ef63b5ed6b1b07cfd7f88f1ac4d7f3b5db3 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 21:10:11 +0530
Subject: [PATCH 46/54] feat: add blcoklist table

---
 .../(org-admin-only)/privacy/loading.tsx      |   5 -
 .../(org-admin-only)/privacy/page.tsx         |  20 +-
 .../organizations/privacy/blocklist-table.tsx | 211 ++++++++++++++++++
 .../privacy/booking-reports-table.tsx         |   1 +
 .../blocklist-entry-details-sheet.tsx         | 131 +++++++++++
 .../create-blocklist-entry-modal.tsx          | 166 ++++++++++++++
 apps/web/public/static/locales/en/common.json |  23 ++
 .../organizations/pages/settings/privacy.tsx  |  30 ++-
 .../pbac/domain/types/permission-registry.ts  |  42 +++-
 .../users/repositories/UserRepository.ts      |  13 ++
 packages/lib/emailSchema.ts                   |   8 +
 .../server/repository/watchlist.interface.ts  |  35 ++-
 .../server/repository/watchlist.repository.ts | 107 ++++++++-
 .../migration.sql                             |   2 +
 packages/prisma/schema.prisma                 |   4 +-
 .../routers/viewer/organizations/_router.tsx  |  28 +++
 .../organizations/addToWatchlist.handler.ts   |   4 +-
 .../createWatchlistEntry.handler.ts           |  86 +++++++
 .../createWatchlistEntry.schema.ts            |  11 +
 .../deleteWatchlistEntry.handler.ts           |  77 +++++++
 .../deleteWatchlistEntry.schema.ts            |   7 +
 .../getWatchlistEntryDetails.handler.ts       |  85 +++++++
 .../getWatchlistEntryDetails.schema.ts        |   7 +
 .../listWatchlistEntries.handler.ts           |  89 ++++++++
 .../listWatchlistEntries.schema.ts            |  16 ++
 25 files changed, 1187 insertions(+), 21 deletions(-)
 delete mode 100644 apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
 create mode 100644 packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql
 create mode 100644 packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts

diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx
deleted file mode 100644
index f8ab779db0f2da..00000000000000
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/loading.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DataTableSkeleton } from "@calcom/features/data-table";
-
-export default function Loading() {
-  return <DataTableSkeleton />;
-}
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
index 58ad14b3e28e23..641e9be469d2b1 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
@@ -41,13 +41,31 @@ const Page = async () => {
     },
   });
 
+  const watchlistPermissions = await getResourcePermissions({
+    userId: session.user.id,
+    teamId: session.user.profile.organizationId,
+    resource: Resource.Watchlist,
+    userRole: session.user.org.role,
+    fallbackRoles: {
+      read: {
+        roles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      },
+      create: {
+        roles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      },
+      delete: {
+        roles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      },
+    },
+  });
+
   if (!canRead) {
     return redirect("/settings/profile");
   }
 
   return (
     <SettingsHeader title={t("privacy_and_security")} description={t("privacy_organization_description")}>
-      <PrivacyView permissions={{ canRead, canEdit }} />
+      <PrivacyView permissions={{ canRead, canEdit }} watchlistPermissions={watchlistPermissions} />
     </SettingsHeader>
   );
 };
diff --git a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
new file mode 100644
index 00000000000000..01095d963be51d
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
@@ -0,0 +1,211 @@
+"use client";
+
+import { keepPreviousData } from "@tanstack/react-query";
+import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
+import { useMemo, useState } from "react";
+
+import { DataTableWrapper, DataTableToolbar, useDataTable } from "@calcom/features/data-table";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
+
+import { BlocklistEntryDetailsSheet } from "./components/blocklist-entry-details-sheet";
+import { CreateBlocklistEntryModal } from "./components/create-blocklist-entry-modal";
+
+type BlocklistEntry = RouterOutputs["viewer"]["organizations"]["listWatchlistEntries"]["rows"][number];
+
+interface BlocklistTableProps {
+  permissions?: {
+    canRead: boolean;
+    canCreate: boolean;
+    canDelete: boolean;
+  };
+}
+
+export function BlocklistTable({ permissions }: BlocklistTableProps) {
+  const { t } = useLocale();
+  const { limit, offset, searchTerm } = useDataTable();
+
+  const [showCreateModal, setShowCreateModal] = useState(false);
+  const [showDetailsSheet, setShowDetailsSheet] = useState(false);
+  const [selectedEntry, setSelectedEntry] = useState<BlocklistEntry | null>(null);
+  const [entryToDelete, setEntryToDelete] = useState<BlocklistEntry | null>(null);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+
+  const { data, isPending } = trpc.viewer.organizations.listWatchlistEntries.useQuery(
+    {
+      limit,
+      offset,
+      searchTerm,
+    },
+    {
+      placeholderData: keepPreviousData,
+    }
+  );
+
+  const utils = trpc.useUtils();
+
+  const deleteWatchlistEntry = trpc.viewer.organizations.deleteWatchlistEntry.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.organizations.listWatchlistEntries.invalidate();
+      showToast(t("blocklist_entry_deleted"), "success");
+      setShowDeleteDialog(false);
+      setEntryToDelete(null);
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
+  const handleDelete = (entry: BlocklistEntry) => {
+    setEntryToDelete(entry);
+    setShowDeleteDialog(true);
+  };
+
+  const confirmDelete = () => {
+    if (entryToDelete) {
+      deleteWatchlistEntry.mutate({ id: entryToDelete.id });
+    }
+  };
+
+  const handleViewDetails = (entry: BlocklistEntry) => {
+    setSelectedEntry(entry);
+    setShowDetailsSheet(true);
+  };
+
+  const getActionVariant = (action: string): "red" | "orange" | "blue" | "gray" => {
+    switch (action) {
+      case "BLOCK":
+        return "red";
+      case "REPORT":
+        return "orange";
+      case "ALERT":
+        return "blue";
+      default:
+        return "gray";
+    }
+  };
+
+  const totalRowCount = data?.meta?.totalRowCount ?? 0;
+  const flatData = useMemo<BlocklistEntry[]>(() => data?.rows ?? [], [data]);
+
+  const columns = useMemo<ColumnDef<BlocklistEntry>[]>(
+    () => [
+      {
+        id: "value",
+        header: t("value"),
+        accessorKey: "value",
+        enableHiding: false,
+        cell: ({ row }) => <span className="text-emphasis">{row.original.value}</span>,
+      },
+      {
+        id: "type",
+        header: t("type"),
+        accessorKey: "type",
+        size: 100,
+        cell: ({ row }) => (
+          <Badge variant="blue">{row.original.type === "EMAIL" ? t("email") : t("domain")}</Badge>
+        ),
+      },
+      {
+        id: "createdBy",
+        header: t("blocked_by"),
+        size: 180,
+        cell: ({ row }) => {
+          const creator = row.original.audits?.[0]?.changedByUser;
+          return <span className="text-default">{creator?.email || "—"}</span>;
+        },
+      },
+      {
+        id: "actions",
+        header: "",
+        size: 120,
+        enableHiding: false,
+        enableSorting: false,
+        enableResizing: false,
+        cell: ({ row }) => {
+          const entry = row.original;
+          return (
+            <div className="flex items-center justify-end">
+              <ButtonGroup combined containerProps={{ className: "border-default" }}>
+                <Button
+                  color="secondary"
+                  variant="icon"
+                  StartIcon="eye"
+                  onClick={() => handleViewDetails(entry)}
+                  tooltip={t("view")}
+                />
+                {permissions?.canDelete && (
+                  <Button
+                    color="destructive"
+                    variant="icon"
+                    StartIcon="trash"
+                    onClick={() => handleDelete(entry)}
+                    tooltip={t("delete")}
+                  />
+                )}
+              </ButtonGroup>
+            </div>
+          );
+        },
+      },
+    ],
+    [t]
+  );
+
+  const table = useReactTable({
+    data: flatData,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    manualPagination: true,
+    pageCount: Math.ceil(totalRowCount / limit),
+  });
+
+  return (
+    <>
+      <DataTableWrapper
+        table={table}
+        isPending={isPending}
+        variant="minimal"
+        totalDbDataCount={totalRowCount}>
+        <div className="flex items-center justify-between">
+          <DataTableToolbar.SearchBar />
+          <div className="flex items-center gap-2">
+            {permissions?.canCreate && (
+              <Button color="primary" StartIcon="plus" onClick={() => setShowCreateModal(true)}>
+                {t("create_block_entry")}
+              </Button>
+            )}
+          </div>
+        </div>
+      </DataTableWrapper>
+
+      <CreateBlocklistEntryModal isOpen={showCreateModal} onClose={() => setShowCreateModal(false)} />
+
+      <BlocklistEntryDetailsSheet
+        entry={selectedEntry}
+        isOpen={showDetailsSheet}
+        onClose={() => {
+          setShowDetailsSheet(false);
+          setSelectedEntry(null);
+        }}
+      />
+
+      <Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+        <ConfirmationDialogContent
+          variety="danger"
+          title={t("delete_blocklist_entry")}
+          confirmBtnText={t("delete")}
+          onConfirm={confirmDelete}>
+          {t("delete_blocklist_entry_confirmation", { value: entryToDelete?.value })}
+        </ConfirmationDialogContent>
+      </Dialog>
+    </>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index d993c7e3d3d646..67bc2bd2163daf 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -39,6 +39,7 @@ import { BulkAddToBlocklist } from "./components/bulk-add-to-blocklist";
 
 type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
 
+// TODO: We would use it in system admin table
 export function BookingReportsTable() {
   const { t } = useLocale();
   const { limit, offset, searchTerm } = useDataTable();
diff --git a/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
new file mode 100644
index 00000000000000..cd3268be65c312
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
@@ -0,0 +1,131 @@
+"use client";
+
+import { format } from "date-fns";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { trpc } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@calcom/ui/components/sheet";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+
+type BlocklistEntry = RouterOutputs["viewer"]["organizations"]["listWatchlistEntries"]["rows"][number];
+
+interface BlocklistEntryDetailsSheetProps {
+  entry: BlocklistEntry | null;
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+export function BlocklistEntryDetailsSheet({ entry, isOpen, onClose }: BlocklistEntryDetailsSheetProps) {
+  const { t } = useLocale();
+
+  const { data, isLoading } = trpc.viewer.organizations.getWatchlistEntryDetails.useQuery(
+    { id: entry?.id ?? "" },
+    {
+      enabled: !!entry?.id && isOpen,
+    }
+  );
+
+  const getActionVariant = (action: string) => {
+    switch (action) {
+      case "BLOCK":
+        return "red";
+      case "REPORT":
+        return "orange";
+      case "ALERT":
+        return "blue";
+      default:
+        return "gray";
+    }
+  };
+
+  return (
+    <Sheet open={isOpen} onOpenChange={onClose}>
+      <SheetContent className="overflow-y-auto">
+        <SheetHeader>
+          <SheetTitle>{t("blocklist_entry_details")}</SheetTitle>
+        </SheetHeader>
+
+        {isLoading ? (
+          <div className="mt-6 space-y-4">
+            <SkeletonText className="h-6 w-32" />
+            <SkeletonText className="h-10 w-full" />
+            <SkeletonText className="h-6 w-32" />
+            <SkeletonText className="h-10 w-full" />
+            <SkeletonText className="h-6 w-32" />
+            <SkeletonText className="h-20 w-full" />
+          </div>
+        ) : data?.entry ? (
+          <div className="mt-6">
+            <div className="space-y-4">
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("type")}</label>
+                <Badge variant="blue" size="lg">
+                  {data.entry.type === "EMAIL" ? t("email") : t("domain")}
+                </Badge>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("value")}</label>
+                <p className="text-emphasis text-base">{data.entry.value}</p>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("action")}</label>
+                <Badge variant={getActionVariant(data.entry.action)} size="lg">
+                  {t(data.entry.action.toLowerCase())}
+                </Badge>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("description")}</label>
+                <p className="text-default">{data.entry.description || t("no_description_provided")}</p>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("created_by")}</label>
+                <p className="text-default">{data.auditHistory[0]?.changedByUser?.email || "—"}</p>
+              </div>
+            </div>
+
+            <div className="border-subtle my-6 border-t" />
+
+            <div>
+              <h3 className="text-emphasis mb-4 font-semibold">{t("audit_history")}</h3>
+              {data.auditHistory.length > 0 ? (
+                <div className="space-y-0">
+                  {data.auditHistory.map((audit, index) => (
+                    <div
+                      key={audit.id}
+                      className={`py-3 ${
+                        index !== data.auditHistory.length - 1 ? "border-subtle border-b" : ""
+                      }`}>
+                      <div className="mb-1 flex items-start justify-between">
+                        <div className="flex items-center gap-1.5">
+                          <span className="text-muted text-xs">{t("by")}:</span>
+                          <span className="text-default text-sm">{audit.changedByUser?.email || "—"}</span>
+                        </div>
+                        <span className="text-muted text-xs">
+                          {format(new Date(audit.changedAt), "MMM d, h:mm a")}
+                        </span>
+                      </div>
+                      <div className="flex items-center gap-1.5">
+                        <span className="text-muted text-xs">{t("added")}:</span>
+                        <span className="text-emphasis text-sm">{audit.value}</span>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <p className="text-muted text-sm">{t("no_audit_history")}</p>
+              )}
+            </div>
+          </div>
+        ) : (
+          <div className="text-muted mt-8 text-center">{t("blocklist_entry_not_found")}</div>
+        )}
+      </SheetContent>
+    </Sheet>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
new file mode 100644
index 00000000000000..399123cf1c7544
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
@@ -0,0 +1,166 @@
+"use client";
+
+import { Controller, useForm } from "react-hook-form";
+
+import { domainWithAtRegex, emailRegex } from "@calcom/lib/emailSchema";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { WatchlistType } from "@calcom/prisma/enums";
+import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { Input, Select, Label, TextArea } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+
+interface CreateBlocklistEntryModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+interface FormData {
+  type: WatchlistType;
+  value: string;
+  description?: string;
+}
+
+export function CreateBlocklistEntryModal({ isOpen, onClose }: CreateBlocklistEntryModalProps) {
+  const { t } = useLocale();
+  const utils = trpc.useUtils();
+
+  const {
+    control,
+    handleSubmit,
+    watch,
+    setValue,
+    reset,
+    formState: { errors, isSubmitting },
+  } = useForm<FormData>({
+    defaultValues: {
+      type: WatchlistType.EMAIL,
+      value: "",
+      description: "",
+    },
+  });
+
+  const watchType = watch("type");
+
+  const createWatchlistEntry = trpc.viewer.organizations.createWatchlistEntry.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.organizations.listWatchlistEntries.invalidate();
+      showToast(t("blocklist_entry_created"), "success");
+      onClose();
+      reset();
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
+  const onSubmit = (data: FormData) => {
+    createWatchlistEntry.mutate({
+      type: data.type,
+      value: data.value,
+      description: data.description,
+    });
+  };
+
+  const validateValue = (value: string) => {
+    if (!value) return t("required");
+
+    if (watchType === WatchlistType.EMAIL) {
+      if (!emailRegex.test(value)) {
+        return t("invalid_email_address");
+      }
+    } else if (watchType === WatchlistType.DOMAIN) {
+      if (!domainWithAtRegex.test(value)) {
+        return t("invalid_domain_format");
+      }
+    }
+
+    return true;
+  };
+
+  const typeOptions = [
+    { label: t("email"), value: WatchlistType.EMAIL },
+    { label: t("domain"), value: WatchlistType.DOMAIN },
+  ];
+
+  return (
+    <Dialog open={isOpen} onOpenChange={onClose}>
+      <DialogContent enableOverflow>
+        <DialogHeader title={t("create_block_entry")} />
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <div className="space-y-4">
+            <div>
+              <Label htmlFor="type" className="text-emphasis mb-2 block text-sm font-medium">
+                {t("what_would_you_like_to_block")} <span className="text-destructive">*</span>
+              </Label>
+              <Controller
+                name="type"
+                control={control}
+                rules={{ required: t("field_required") }}
+                render={({ field }) => (
+                  <Select
+                    {...field}
+                    options={typeOptions}
+                    onChange={(option) => {
+                      if (option) {
+                        field.onChange(option.value);
+                        setValue("value", "");
+                      }
+                    }}
+                    value={typeOptions.find((opt) => opt.value === field.value)}
+                  />
+                )}
+              />
+              {errors.type && <p className="text-destructive mt-1 text-sm">{errors.type.message}</p>}
+            </div>
+
+            <div>
+              <Label htmlFor="value" className="text-emphasis mb-2 block text-sm font-medium">
+                {watchType === WatchlistType.EMAIL ? t("email_address") : t("domain_name")}{" "}
+                <span className="text-destructive">*</span>
+              </Label>
+              <Controller
+                name="value"
+                control={control}
+                rules={{
+                  required: t("field_required"),
+                  validate: validateValue,
+                }}
+                render={({ field }) => (
+                  <Input
+                    {...field}
+                    placeholder={watchType === WatchlistType.EMAIL ? "user@example.com" : "@spammer.com"}
+                  />
+                )}
+              />
+              {errors.value && <p className="text-destructive mt-1 text-sm">{errors.value.message}</p>}
+            </div>
+
+            <div>
+              <Label htmlFor="description" className="text-emphasis mb-2 block text-sm font-medium">
+                {t("description")} <span className="text-subtle font-normal">({t("optional")})</span>
+              </Label>
+              <Controller
+                name="description"
+                control={control}
+                render={({ field }) => (
+                  <TextArea {...field} placeholder={t("reason_for_adding_to_blocklist")} rows={3} />
+                )}
+              />
+            </div>
+          </div>
+
+          <DialogFooter className="mt-6">
+            <Button type="button" color="secondary" onClick={onClose} disabled={isSubmitting}>
+              {t("cancel")}
+            </Button>
+            <Button type="submit" loading={isSubmitting} disabled={isSubmitting}>
+              {t("create_entry")}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 455ce2de8273f8..3f1e6907921960 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -3860,5 +3860,28 @@
   "edit_configuration": "Edit Configuration",
   "select_event_type_for_inbound_calls": "Inbound calls can book only one event type. Select the event type where meetings will be scheduled when callers reach your agent.",
   "setup_inbound_agent_for_incoming_calls": "Set up inbound agent for incoming calls",
+  "create_block_entry": "Create Block Entry",
+  "blocklist_entry_details": "Blocklist Entry Details",
+  "blocklist_entry_not_found": "Blocklist entry not found",
+  "blocklist_entry_created": "Blocklist entry created successfully",
+  "blocklist_entry_updated": "Blocklist entry updated successfully",
+  "blocklist_entry_deleted": "Blocklist entry deleted successfully",
+  "audit_history": "Audit History",
+  "no_audit_history": "No audit history available",
+  "edit_blocklist_entry": "Edit Blocklist Entry",
+  "delete_blocklist_entry": "Delete Blocklist Entry",
+  "delete_blocklist_entry_confirmation": "Are you sure you want to remove \"{{value}}\" from the blocklist? This action cannot be undone.",
+  "created_by": "Created By",
+  "blocked_by": "Blocked By",
+  "by": "By",
+  "added": "Added",
+  "no_description_provided": "No description provided",
+  "organization_blocklist": "Organization Blocklist",
+  "manage_blocked_emails_and_domains": "Manage blocked emails and domains for your organization",
+  "invalid_domain_format": "Invalid domain format. Example: @example.com",
+  "invalid_email_address": "Invalid email address. Example: user@example.com",
+  "reason_for_adding_to_blocklist": "Reason for adding to blocklist",
+  "what_would_you_like_to_block": "What would you like to block?",
+  "domain_name": "Domain Name",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
 }
diff --git a/packages/features/ee/organizations/pages/settings/privacy.tsx b/packages/features/ee/organizations/pages/settings/privacy.tsx
index 81d85deba3dde8..9240ef9e12a424 100644
--- a/packages/features/ee/organizations/pages/settings/privacy.tsx
+++ b/packages/features/ee/organizations/pages/settings/privacy.tsx
@@ -4,11 +4,23 @@ import { DataTableProvider } from "@calcom/features/data-table";
 import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import MakeTeamPrivateSwitch from "@calcom/features/ee/teams/components/MakeTeamPrivateSwitch";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 
-import { BookingReportsTable } from "~/settings/organizations/privacy/booking-reports-table";
-
-const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit: boolean } }) => {
+import { BlocklistTable } from "~/settings/organizations/privacy/blocklist-table";
+
+const PrivacyView = ({
+  permissions,
+  watchlistPermissions,
+}: {
+  permissions: { canRead: boolean; canEdit: boolean };
+  watchlistPermissions?: {
+    canRead: boolean;
+    canCreate: boolean;
+    canDelete: boolean;
+  };
+}) => {
+  const { t } = useLocale();
   const { data: currentOrg } = trpc.viewer.organizations.listCurrent.useQuery();
   const isInviteOpen = !currentOrg?.user.accepted;
 
@@ -18,7 +30,7 @@ const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit
 
   return (
     <LicenseRequired>
-      <div>
+      <div className="space-y-6">
         <MakeTeamPrivateSwitch
           isOrg={true}
           teamId={currentOrg.id}
@@ -26,10 +38,14 @@ const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit
           disabled={isDisabled}
         />
 
-        {permissions.canEdit && (
-          <div className="mt-8">
+        {watchlistPermissions?.canRead && (
+          <div className="space-y-4">
+            <div>
+              <h2 className="text-emphasis text-lg font-semibold">{t("organization_blocklist")}</h2>
+              <p className="text-muted text-sm">{t("manage_blocked_emails_and_domains")}</p>
+            </div>
             <DataTableProvider useSegments={useSegments} defaultPageSize={25}>
-              <BookingReportsTable />
+              <BlocklistTable permissions={watchlistPermissions} />
             </DataTableProvider>
           </div>
         )}
diff --git a/packages/features/pbac/domain/types/permission-registry.ts b/packages/features/pbac/domain/types/permission-registry.ts
index d4e61e2ce32db0..448add14338cf5 100644
--- a/packages/features/pbac/domain/types/permission-registry.ts
+++ b/packages/features/pbac/domain/types/permission-registry.ts
@@ -12,6 +12,7 @@ export enum Resource {
   Webhook = "webhook",
   Availability = "availability",
   OutOfOffice = "ooo",
+  Watchlist = "watchlist",
 }
 
 export enum CrudAction {
@@ -120,7 +121,7 @@ export const isValidPermissionString = (val: unknown): val is PermissionString =
  * @returns A new object without the _resource property
  */
 export const filterResourceConfig = (config: ResourceConfig): Omit<ResourceConfig, "_resource"> => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   const { _resource, ...rest } = config;
   return rest;
 };
@@ -147,7 +148,8 @@ export const getPermissionsForScope = (scope: Scope, isPrivate?: boolean): Permi
       const scopeMatches = !permissionDetails.scope || permissionDetails.scope.includes(scope);
 
       // Check privacy visibility (only if isPrivate is provided)
-      const privacyMatches = teamPrivacy === undefined ||
+      const privacyMatches =
+        teamPrivacy === undefined ||
         !permissionDetails.visibleWhen?.teamPrivacy ||
         permissionDetails.visibleWhen.teamPrivacy === "both" ||
         permissionDetails.visibleWhen.teamPrivacy === teamPrivacy;
@@ -672,4 +674,40 @@ export const PERMISSION_REGISTRY: PermissionRegistry = {
       dependsOn: ["ooo.read"],
     },
   },
+  [Resource.Watchlist]: {
+    _resource: {
+      i18nKey: "pbac_resource_watchlist",
+    },
+    [CrudAction.Create]: {
+      description: "Create watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_create",
+      descriptionI18nKey: "pbac_desc_create_watchlist_entries",
+      scope: [Scope.Organization],
+      dependsOn: ["watchlist.read"],
+    },
+    [CrudAction.Read]: {
+      description: "View watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_read",
+      descriptionI18nKey: "pbac_desc_view_watchlist_entries",
+      scope: [Scope.Organization],
+    },
+    [CrudAction.Update]: {
+      description: "Update watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_update",
+      descriptionI18nKey: "pbac_desc_update_watchlist_entries",
+      scope: [Scope.Organization],
+      dependsOn: ["watchlist.read"],
+    },
+    [CrudAction.Delete]: {
+      description: "Delete watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_delete",
+      descriptionI18nKey: "pbac_desc_delete_watchlist_entries",
+      scope: [Scope.Organization],
+      dependsOn: ["watchlist.read"],
+    },
+  },
 };
diff --git a/packages/features/users/repositories/UserRepository.ts b/packages/features/users/repositories/UserRepository.ts
index 627460bc5ddd63..5d78e70a4370c2 100644
--- a/packages/features/users/repositories/UserRepository.ts
+++ b/packages/features/users/repositories/UserRepository.ts
@@ -1042,6 +1042,19 @@ export class UserRepository {
     });
   }
 
+  async findUsersByIds(userIds: number[]) {
+    return this.prismaClient.user.findMany({
+      where: {
+        id: { in: userIds },
+      },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+      },
+    });
+  }
+
   async findUsersWithLastBooking({ userIds, eventTypeId }: { userIds: number[]; eventTypeId: number }) {
     return this.prismaClient.user.findMany({
       where: {
diff --git a/packages/lib/emailSchema.ts b/packages/lib/emailSchema.ts
index bad54fa8e73cda..64d45d97f2cf51 100644
--- a/packages/lib/emailSchema.ts
+++ b/packages/lib/emailSchema.ts
@@ -4,6 +4,14 @@ import { z } from "zod";
 export const emailRegex =
   /^(?!\.)(?!.*\.\.)([A-Z0-9_+-\.']*)[A-Z0-9_+'-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i;
 
+/**
+ * Domain regex for watchlist entries - requires @ prefix
+ * Supports international domains with Unicode characters
+ * Examples: @example.com, @münchen.de, @example.co.uk
+ */
+export const domainWithAtRegex =
+  /^@[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?(\.[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?)*$/;
+
 /**
  * RFC 5321 Section 4.5.3.1.3 specifies:
  * - Maximum email address length: 254 characters
diff --git a/packages/lib/server/repository/watchlist.interface.ts b/packages/lib/server/repository/watchlist.interface.ts
index 0bd1612ff81256..03c8e1d37b34e3 100644
--- a/packages/lib/server/repository/watchlist.interface.ts
+++ b/packages/lib/server/repository/watchlist.interface.ts
@@ -9,6 +9,20 @@ export interface WatchlistEntry {
   organizationId: number | null;
   isGlobal: boolean;
   source: WatchlistSource;
+  createdAt?: Date;
+  lastUpdatedAt?: Date;
+}
+
+export interface WatchlistAuditEntry {
+  id: string;
+  watchlistId: string;
+  type: WatchlistType;
+  value: string;
+  description: string | null;
+  action: WatchlistAction;
+  eventType?: string;
+  changedByUserId: number | null;
+  changedAt: Date;
 }
 
 export interface CreateWatchlistInput {
@@ -26,7 +40,26 @@ export interface CheckWatchlistInput {
   organizationId: number;
 }
 
+export interface FindAllEntriesInput {
+  organizationId: number;
+  limit: number;
+  offset: number;
+  searchTerm?: string;
+  filters?: {
+    type?: WatchlistType;
+  };
+}
+
 export interface IWatchlistRepository {
-  createEntry(params: CreateWatchlistInput): Promise<{ id: string }>;
+  createEntry(params: CreateWatchlistInput): Promise<WatchlistEntry>;
   checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null>;
+  findAllEntries(params: FindAllEntriesInput): Promise<{
+    rows: WatchlistEntry[];
+    meta: { totalRowCount: number };
+  }>;
+  findEntryWithAudit(id: string): Promise<{
+    entry: WatchlistEntry | null;
+    auditHistory: WatchlistAuditEntry[];
+  }>;
+  deleteEntry(id: string, userId: number): Promise<void>;
 }
diff --git a/packages/lib/server/repository/watchlist.repository.ts b/packages/lib/server/repository/watchlist.repository.ts
index 21ce000d34fede..c35778a49e9599 100644
--- a/packages/lib/server/repository/watchlist.repository.ts
+++ b/packages/lib/server/repository/watchlist.repository.ts
@@ -6,12 +6,14 @@ import type {
   CreateWatchlistInput,
   CheckWatchlistInput,
   WatchlistEntry,
+  FindAllEntriesInput,
+  WatchlistAuditEntry,
 } from "./watchlist.interface";
 
 export class WatchlistRepository implements IWatchlistRepository {
   constructor(private readonly prismaClient: PrismaClient) {}
 
-  async createEntry(params: CreateWatchlistInput): Promise<{ id: string }> {
+  async createEntry(params: CreateWatchlistInput): Promise<WatchlistEntry> {
     const existing = await this.checkExists({
       type: params.type,
       value: params.value,
@@ -32,7 +34,6 @@ export class WatchlistRepository implements IWatchlistRepository {
         source: WatchlistSource.MANUAL,
         isGlobal: false,
       },
-      select: { id: true },
     });
 
     await this.prismaClient.watchlistAudit.create({
@@ -62,4 +63,106 @@ export class WatchlistRepository implements IWatchlistRepository {
 
     return entry;
   }
+
+  async findAllEntries(params: FindAllEntriesInput): Promise<{
+    rows: WatchlistEntry[];
+    meta: { totalRowCount: number };
+  }> {
+    const where = {
+      organizationId: params.organizationId,
+      ...(params.searchTerm && {
+        value: {
+          contains: params.searchTerm,
+          mode: "insensitive" as const,
+        },
+      }),
+      ...(params.filters?.type && {
+        type: params.filters.type,
+      }),
+    };
+
+    const [rows, totalRowCount] = await Promise.all([
+      this.prismaClient.watchlist.findMany({
+        where,
+        take: params.limit,
+        skip: params.offset,
+        orderBy: {
+          lastUpdatedAt: "desc",
+        },
+        include: {
+          audits: {
+            take: 1,
+            orderBy: {
+              changedAt: "asc",
+            },
+            select: {
+              changedByUserId: true,
+            },
+          },
+        },
+      }),
+      this.prismaClient.watchlist.count({ where }),
+    ]);
+
+    return {
+      rows,
+      meta: { totalRowCount },
+    };
+  }
+
+  async findEntryWithAudit(id: string): Promise<{
+    entry: WatchlistEntry | null;
+    auditHistory: WatchlistAuditEntry[];
+  }> {
+    const entry = await this.prismaClient.watchlist.findUnique({
+      where: { id },
+      include: {
+        audits: {
+          select: {
+            id: true,
+            watchlistId: true,
+            type: true,
+            value: true,
+            description: true,
+            action: true,
+            changedByUserId: true,
+            changedAt: true,
+          },
+          orderBy: {
+            changedAt: "desc",
+          },
+        },
+      },
+    });
+
+    return {
+      entry: entry ? { ...entry, audits: undefined } : null,
+      auditHistory: entry?.audits || [],
+    };
+  }
+
+  async deleteEntry(id: string, userId: number): Promise<void> {
+    const existing = await this.prismaClient.watchlist.findUnique({
+      where: { id },
+    });
+
+    if (!existing) {
+      throw new Error("Watchlist entry not found");
+    }
+
+    await this.prismaClient.watchlistAudit.create({
+      data: {
+        watchlistId: id,
+        type: existing.type,
+        value: existing.value,
+        description: existing.description,
+        action: existing.action,
+        changedByUserId: userId,
+      },
+    });
+
+    await this.prismaClient.watchlist.delete({
+      where: { id },
+    });
+  }
 }
diff --git a/packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql b/packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql
new file mode 100644
index 00000000000000..ee2940b61fb787
--- /dev/null
+++ b/packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql
@@ -0,0 +1,2 @@
+-- AddForeignKey
+ALTER TABLE "WatchlistAudit" ADD CONSTRAINT "WatchlistAudit_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 173698f5f84d5f..f129005c158072 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -2321,6 +2321,7 @@ model Watchlist {
   lastUpdatedAt  DateTime        @default(now())
 
   bookingReports BookingReport[]
+  audits         WatchlistAudit[]
 
   @@unique([type, value, organizationId])
   @@index([type, value, organizationId, action])
@@ -2337,7 +2338,8 @@ model WatchlistAudit {
   changedAt       DateTime @default(now())
   changedByUserId Int?
 
-  watchlistId String @db.Uuid
+  watchlistId String     @db.Uuid
+  watchlist   Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: Cascade)
 
   @@index([watchlistId, changedAt])
 }
diff --git a/packages/trpc/server/routers/viewer/organizations/_router.tsx b/packages/trpc/server/routers/viewer/organizations/_router.tsx
index 7e0bc7a83dd175..77d752390f018a 100644
--- a/packages/trpc/server/routers/viewer/organizations/_router.tsx
+++ b/packages/trpc/server/routers/viewer/organizations/_router.tsx
@@ -18,16 +18,20 @@ import { ZBulkUsersDelete } from "./bulkDeleteUsers.schema.";
 import { ZCreateInputSchema } from "./create.schema";
 import { ZCreateSelfHostedInputSchema } from "./createSelfHosted.schema";
 import { ZCreateTeamsSchema } from "./createTeams.schema";
+import { ZCreateWatchlistEntryInputSchema } from "./createWatchlistEntry.schema";
 import { ZCreateWithPaymentIntentInputSchema } from "./createWithPaymentIntent.schema";
 import { ZDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
 import { ZDeleteTeamInputSchema } from "./deleteTeam.schema";
+import { ZDeleteWatchlistEntryInputSchema } from "./deleteWatchlistEntry.schema";
 import { ZGetMembersInput } from "./getMembers.schema";
 import { ZGetOtherTeamInputSchema } from "./getOtherTeam.handler";
 import { ZGetUserInput } from "./getUser.schema";
+import { ZGetWatchlistEntryDetailsInputSchema } from "./getWatchlistEntryDetails.schema";
 import { ZIntentToCreateOrgInputSchema } from "./intentToCreateOrg.schema";
 import { ZListBookingReportsInputSchema } from "./listBookingReports.schema";
 import { ZListMembersInputSchema } from "./listMembers.schema";
 import { ZListOtherTeamMembersSchema } from "./listOtherTeamMembers.handler";
+import { ZListWatchlistEntriesInputSchema } from "./listWatchlistEntries.schema";
 import { ZRemoveHostsFromEventTypes } from "./removeHostsFromEventTypes.schema";
 import { ZSetPasswordSchema } from "./setPassword.schema";
 import { ZUpdateInputSchema } from "./update.schema";
@@ -174,6 +178,30 @@ export const viewerOrganizationsRouter = router({
     const { default: handler } = await import("./addToWatchlist.handler");
     return handler(opts);
   }),
+  listWatchlistEntries: authedOrgAdminProcedure
+    .input(ZListWatchlistEntriesInputSchema)
+    .query(async (opts) => {
+      const { default: handler } = await import("./listWatchlistEntries.handler");
+      return handler(opts);
+    }),
+  createWatchlistEntry: authedOrgAdminProcedure
+    .input(ZCreateWatchlistEntryInputSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./createWatchlistEntry.handler");
+      return handler(opts);
+    }),
+  deleteWatchlistEntry: authedOrgAdminProcedure
+    .input(ZDeleteWatchlistEntryInputSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./deleteWatchlistEntry.handler");
+      return handler(opts);
+    }),
+  getWatchlistEntryDetails: authedOrgAdminProcedure
+    .input(ZGetWatchlistEntryDetailsInputSchema)
+    .query(async (opts) => {
+      const { default: handler } = await import("./getWatchlistEntryDetails.handler");
+      return handler(opts);
+    }),
 
   deleteBookingReport: authedOrgAdminProcedure
     .input(ZDeleteBookingReportInputSchema)
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
index 74f775743bd08f..26c117f57f26d0 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
@@ -22,7 +22,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
   if (!organizationId) {
     throw new TRPCError({
       code: "FORBIDDEN",
-      message: "You must be part of an organization to manage watchlist",
+      message: "You must be part of an organization to manage blocklist",
     });
   }
 
@@ -102,7 +102,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
     if (error instanceof Error && error.message.includes("already exists")) {
       throw new TRPCError({
         code: "BAD_REQUEST",
-        message: "This entry already exists in the watchlist for your organization",
+        message: "This entry already exists in the blocklist for your organization",
       });
     }
     throw error;
diff --git a/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts
new file mode 100644
index 00000000000000..6e098eba804885
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts
@@ -0,0 +1,86 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { domainWithAtRegex, emailRegex } from "@calcom/lib/emailSchema";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole, WatchlistAction } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TCreateWatchlistEntryInputSchema } from "./createWatchlistEntry.schema";
+
+type CreateWatchlistEntryOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TCreateWatchlistEntryInputSchema;
+};
+
+export const createWatchlistEntryHandler = async ({ ctx, input }: CreateWatchlistEntryOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.create",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to create blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+
+  if (input.type === "EMAIL" && !emailRegex.test(input.value)) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "Invalid email address format",
+    });
+  }
+
+  if (input.type === "DOMAIN" && !domainWithAtRegex.test(input.value)) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "Invalid domain format. Domain must start with @ (e.g., @example.com)",
+    });
+  }
+
+  try {
+    const entry = await watchlistRepo.createEntry({
+      type: input.type,
+      value: input.value.toLowerCase(),
+      organizationId,
+      action: WatchlistAction.BLOCK,
+      description: input.description,
+      userId: user.id,
+    });
+
+    return {
+      success: true,
+      entry,
+    };
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("already exists")) {
+      throw new TRPCError({
+        code: "BAD_REQUEST",
+        message: "This entry already exists in the blocklist for your organization",
+      });
+    }
+    throw error;
+  }
+};
+
+export default createWatchlistEntryHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts
new file mode 100644
index 00000000000000..763f803e001d47
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts
@@ -0,0 +1,11 @@
+import { z } from "zod";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+export const ZCreateWatchlistEntryInputSchema = z.object({
+  type: z.nativeEnum(WatchlistType),
+  value: z.string().min(1).max(255),
+  description: z.string().optional(),
+});
+
+export type TCreateWatchlistEntryInputSchema = z.infer<typeof ZCreateWatchlistEntryInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts
new file mode 100644
index 00000000000000..b488fb4ee870ab
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts
@@ -0,0 +1,77 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TDeleteWatchlistEntryInputSchema } from "./deleteWatchlistEntry.schema";
+
+type DeleteWatchlistEntryOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TDeleteWatchlistEntryInputSchema;
+};
+
+export const deleteWatchlistEntryHandler = async ({ ctx, input }: DeleteWatchlistEntryOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.delete",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to delete blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+
+  const { entry } = await watchlistRepo.findEntryWithAudit(input.id);
+
+  if (!entry) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: "Blocklist entry not found",
+    });
+  }
+
+  if (entry.organizationId !== organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You can only delete blocklist entries from your organization",
+    });
+  }
+
+  try {
+    await watchlistRepo.deleteEntry(input.id, user.id);
+
+    return {
+      success: true,
+      message: "Blocklist entry deleted successfully",
+    };
+  } catch (error) {
+    throw new TRPCError({
+      code: "INTERNAL_SERVER_ERROR",
+      message: "Failed to delete blocklist entry",
+    });
+  }
+};
+
+export default deleteWatchlistEntryHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts
new file mode 100644
index 00000000000000..65377da9f04887
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const ZDeleteWatchlistEntryInputSchema = z.object({
+  id: z.string().uuid(),
+});
+
+export type TDeleteWatchlistEntryInputSchema = z.infer<typeof ZDeleteWatchlistEntryInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts
new file mode 100644
index 00000000000000..f95ab1926216e0
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts
@@ -0,0 +1,85 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TGetWatchlistEntryDetailsInputSchema } from "./getWatchlistEntryDetails.schema";
+
+type GetWatchlistEntryDetailsOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TGetWatchlistEntryDetailsInputSchema;
+};
+
+export const getWatchlistEntryDetailsHandler = async ({ ctx, input }: GetWatchlistEntryDetailsOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to view blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.read",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to view blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+  const userRepo = new UserRepository(prisma);
+
+  const result = await watchlistRepo.findEntryWithAudit(input.id);
+
+  if (!result.entry) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: "Blocklist entry not found",
+    });
+  }
+
+  if (result.entry.organizationId !== organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You can only view blocklist entries from your organization",
+    });
+  }
+
+  const userIds = result.auditHistory
+    .map((audit) => audit.changedByUserId)
+    .filter((id): id is number => id !== null && id !== undefined);
+
+  const uniqueUserIds = Array.from(new Set(userIds));
+
+  const users = uniqueUserIds.length > 0 ? await userRepo.findUsersByIds(uniqueUserIds) : [];
+
+  const userMap = new Map(users.map((u) => [u.id, u]));
+
+  const auditHistoryWithUsers = result.auditHistory.map((audit) => ({
+    ...audit,
+    changedByUser: audit.changedByUserId ? userMap.get(audit.changedByUserId) : undefined,
+  }));
+
+  return {
+    entry: result.entry,
+    auditHistory: auditHistoryWithUsers,
+  };
+};
+
+export default getWatchlistEntryDetailsHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts
new file mode 100644
index 00000000000000..be3f4643c53c17
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const ZGetWatchlistEntryDetailsInputSchema = z.object({
+  id: z.string().uuid(),
+});
+
+export type TGetWatchlistEntryDetailsInputSchema = z.infer<typeof ZGetWatchlistEntryDetailsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts
new file mode 100644
index 00000000000000..486b1e469dcab9
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts
@@ -0,0 +1,89 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TListWatchlistEntriesInputSchema } from "./listWatchlistEntries.schema";
+
+type ListWatchlistEntriesOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TListWatchlistEntriesInputSchema;
+};
+
+export const listWatchlistEntriesHandler = async ({ ctx, input }: ListWatchlistEntriesOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.read",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to view blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+  const userRepo = new UserRepository(prisma);
+
+  const result = await watchlistRepo.findAllEntries({
+    organizationId,
+    limit: input.limit,
+    offset: input.offset,
+    searchTerm: input.searchTerm,
+    filters: input.filters,
+  });
+
+  const userIds = result.rows
+    .map((entry) => entry.audits?.[0]?.changedByUserId)
+    .filter((id): id is number => id !== null && id !== undefined);
+
+  const uniqueUserIds = Array.from(new Set(userIds));
+
+  const users = uniqueUserIds.length > 0 ? await userRepo.findUsersByIds(uniqueUserIds) : [];
+
+  const userMap = new Map(users.map((u) => [u.id, u]));
+
+  const rowsWithCreators = result.rows.map((entry) => {
+    const audit = entry.audits?.[0];
+    if (audit?.changedByUserId) {
+      const changedByUser = userMap.get(audit.changedByUserId);
+      return {
+        ...entry,
+        audits: [
+          {
+            ...audit,
+            changedByUser,
+          },
+        ],
+      };
+    }
+    return entry;
+  });
+
+  return {
+    rows: rowsWithCreators,
+    meta: result.meta,
+  };
+};
+
+export default listWatchlistEntriesHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts
new file mode 100644
index 00000000000000..4e08b7c37601e5
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts
@@ -0,0 +1,16 @@
+import { z } from "zod";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+export const ZListWatchlistEntriesInputSchema = z.object({
+  limit: z.number().min(1).max(100).default(25),
+  offset: z.number().min(0).default(0),
+  searchTerm: z.string().optional(),
+  filters: z
+    .object({
+      type: z.nativeEnum(WatchlistType).optional(),
+    })
+    .optional(),
+});
+
+export type TListWatchlistEntriesInputSchema = z.infer<typeof ZListWatchlistEntriesInputSchema>;

From 21dd35128e6414534c8af8584f4b91db58315608 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 21:13:13 +0530
Subject: [PATCH 47/54] feat: add blcoklist table

---
 .../components/create-blocklist-entry-modal.tsx       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
index 399123cf1c7544..f1e3323ad96078 100644
--- a/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
@@ -152,10 +152,17 @@ export function CreateBlocklistEntryModal({ isOpen, onClose }: CreateBlocklistEn
           </div>
 
           <DialogFooter className="mt-6">
-            <Button type="button" color="secondary" onClick={onClose} disabled={isSubmitting}>
+            <Button
+              type="button"
+              color="secondary"
+              onClick={onClose}
+              disabled={isSubmitting || createWatchlistEntry.isPending}>
               {t("cancel")}
             </Button>
-            <Button type="submit" loading={isSubmitting} disabled={isSubmitting}>
+            <Button
+              type="submit"
+              loading={isSubmitting || createWatchlistEntry.isPending}
+              disabled={isSubmitting || createWatchlistEntry.isPending}>
               {t("create_entry")}
             </Button>
           </DialogFooter>

From 7b39534ebe7f38e275fbfe326d8d3decdbbb4187 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 21:51:02 +0530
Subject: [PATCH 48/54] feat: types

---
 .../server/repository/bookingReport.test.ts   | 49 +++++++++++++------
 .../server/repository/watchlist.interface.ts  |  4 +-
 .../server/repository/watchlist.repository.ts | 16 +++++-
 .../routers/viewer/bookings/get.handler.ts    |  1 -
 .../organizations/addToWatchlist.handler.ts   |  7 ++-
 .../listBookingReports.handler.ts             |  5 +-
 6 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/packages/lib/server/repository/bookingReport.test.ts b/packages/lib/server/repository/bookingReport.test.ts
index d185c8606ffc98..61c4f6b8de4cdd 100644
--- a/packages/lib/server/repository/bookingReport.test.ts
+++ b/packages/lib/server/repository/bookingReport.test.ts
@@ -19,6 +19,9 @@ describe("PrismaBookingReportRepository", () => {
       findUnique: vi.fn(),
       findMany: vi.fn(),
       findFirst: vi.fn(),
+      count: vi.fn(),
+      update: vi.fn(),
+      delete: vi.fn(),
     },
   } as unknown as PrismaClient;
 
@@ -94,37 +97,53 @@ describe("PrismaBookingReportRepository", () => {
       const mockReports = [
         {
           id: "report-1",
+          bookingUid: "uid-1",
+          bookerEmail: "a@example.com",
           reportedById: 1,
           reason: BookingReportReason.SPAM,
           description: "Spam",
+          cancelled: false,
           createdAt: new Date("2025-01-01T10:00:00Z"),
+          watchlistId: null,
+          reportedBy: { id: 1, name: "Admin", email: "admin@example.com" },
+          booking: { id: 1, startTime: new Date(), endTime: new Date(), title: "t", uid: "uid-1" },
+          watchlist: null,
         },
         {
           id: "report-2",
+          bookingUid: "uid-2",
+          bookerEmail: "b@example.com",
           reportedById: 2,
           reason: BookingReportReason.DONT_KNOW_PERSON,
           description: null,
+          cancelled: true,
           createdAt: new Date("2025-01-01T11:00:00Z"),
+          watchlistId: null,
+          reportedBy: { id: 2, name: "User", email: "user@example.com" },
+          booking: { id: 2, startTime: new Date(), endTime: new Date(), title: "t2", uid: "uid-2" },
+          watchlist: null,
         },
       ];
 
+      mockPrisma.bookingReport.count.mockResolvedValue(mockReports.length);
       mockPrisma.bookingReport.findMany.mockResolvedValue(mockReports);
 
-      const result = await repository.findAllReportedBookings({ skip: 0, take: 10 });
-
-      expect(result).toEqual(mockReports);
-      expect(mockPrisma.bookingReport.findMany).toHaveBeenCalledWith({
-        skip: 0,
-        take: 10,
-        select: {
-          id: true,
-          reportedById: true,
-          reason: true,
-          description: true,
-          createdAt: true,
-        },
-        orderBy: { createdAt: "desc" },
-      });
+      const result = await repository.findAllReportedBookings({ organizationId: 10, skip: 0, take: 10 });
+
+      expect(result.meta.totalRowCount).toBe(2);
+      expect(result.rows).toEqual(
+        mockReports.map((r) => ({ ...r, reporter: r.reportedBy }))
+      );
+      expect(mockPrisma.bookingReport.findMany).toHaveBeenCalledWith(
+        expect.objectContaining({
+          where: expect.objectContaining({ organizationId: 10 }),
+          skip: 0,
+          take: 10,
+        })
+      );
+      expect(mockPrisma.bookingReport.count).toHaveBeenCalledWith(
+        expect.objectContaining({ where: expect.objectContaining({ organizationId: 10 }) })
+      );
     });
   });
 });
diff --git a/packages/lib/server/repository/watchlist.interface.ts b/packages/lib/server/repository/watchlist.interface.ts
index 03c8e1d37b34e3..ee95d5d79ce8e2 100644
--- a/packages/lib/server/repository/watchlist.interface.ts
+++ b/packages/lib/server/repository/watchlist.interface.ts
@@ -54,7 +54,9 @@ export interface IWatchlistRepository {
   createEntry(params: CreateWatchlistInput): Promise<WatchlistEntry>;
   checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null>;
   findAllEntries(params: FindAllEntriesInput): Promise<{
-    rows: WatchlistEntry[];
+    rows: (WatchlistEntry & {
+      audits?: { changedByUserId: number | null }[];
+    })[];
     meta: { totalRowCount: number };
   }>;
   findEntryWithAudit(id: string): Promise<{
diff --git a/packages/lib/server/repository/watchlist.repository.ts b/packages/lib/server/repository/watchlist.repository.ts
index c35778a49e9599..f2e750434e8d3f 100644
--- a/packages/lib/server/repository/watchlist.repository.ts
+++ b/packages/lib/server/repository/watchlist.repository.ts
@@ -65,7 +65,7 @@ export class WatchlistRepository implements IWatchlistRepository {
   }
 
   async findAllEntries(params: FindAllEntriesInput): Promise<{
-    rows: WatchlistEntry[];
+    rows: (WatchlistEntry & { audits?: { changedByUserId: number | null }[] })[];
     meta: { totalRowCount: number };
   }> {
     const where = {
@@ -136,7 +136,19 @@ export class WatchlistRepository implements IWatchlistRepository {
     });
 
     return {
-      entry: entry ? { ...entry, audits: undefined } : null,
+      entry: entry
+        ? {
+            id: entry.id,
+            type: entry.type,
+            value: entry.value,
+            action: entry.action,
+            description: entry.description ?? null,
+            organizationId: entry.organizationId ?? null,
+            isGlobal: entry.isGlobal,
+            source: entry.source,
+            lastUpdatedAt: entry.lastUpdatedAt,
+          }
+        : null,
       auditHistory: entry?.audits || [],
     };
   }
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 315b8679aeaf9e..19d99cff918b48 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -3,7 +3,6 @@ import { type SelectQueryBuilder } from "kysely";
 import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";
 
 import dayjs from "@calcom/dayjs";
-import { BookingReportRepository } from "@calcom/features/bookings/lib/booking-report.repository";
 import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
 import type { DB } from "@calcom/kysely";
 import kysely from "@calcom/kysely";
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
index 26c117f57f26d0..2252291e5446ca 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
@@ -1,7 +1,6 @@
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
 import { prisma } from "@calcom/prisma";
-import { WatchlistAction } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
@@ -22,7 +21,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
   if (!organizationId) {
     throw new TRPCError({
       code: "FORBIDDEN",
-      message: "You must be part of an organization to manage blocklist",
+      message: "You must be part of an organization to manage watchlist",
     });
   }
 
@@ -75,7 +74,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
             type: input.type,
             value,
             organizationId,
-            action: WatchlistAction.BLOCK,
+            action: input.action,
             description: input.description,
             userId: user.id,
           });
@@ -102,7 +101,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
     if (error instanceof Error && error.message.includes("already exists")) {
       throw new TRPCError({
         code: "BAD_REQUEST",
-        message: "This entry already exists in the blocklist for your organization",
+          message: "This entry already exists in the watchlist for your organization",
       });
     }
     throw error;
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
index 489998e4ad911d..7e83ae31597d5f 100644
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
@@ -2,14 +2,13 @@ import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/boo
 import { prisma } from "@calcom/prisma";
 
 import { TRPCError } from "@trpc/server";
+import type { TrpcSessionUser } from "../../../types";
 
 import type { TListBookingReportsInputSchema } from "./listBookingReports.schema";
 
 type ListBookingReportsOptions = {
   ctx: {
-    user: {
-      organizationId?: number;
-    };
+    user: NonNullable<TrpcSessionUser>;
   };
   input: TListBookingReportsInputSchema;
 };

From fb22095059d96d17327434c1a7a68daf93600dc3 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 21:59:07 +0530
Subject: [PATCH 49/54] feat: types

---
 .../routers/viewer/organizations/addToWatchlist.schema.ts      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
index b081ef675b99fd..3275b8ba235efd 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
@@ -1,10 +1,11 @@
 import { z } from "zod";
 
-import { WatchlistType } from "@calcom/prisma/enums";
+import { WatchlistAction, WatchlistType } from "@calcom/prisma/enums";
 
 export const ZAddToWatchlistInputSchema = z.object({
   reportIds: z.array(z.string().uuid()).min(1),
   type: z.nativeEnum(WatchlistType),
+  action: z.nativeEnum(WatchlistAction),
   description: z.string().optional(),
 });
 

From 9ffe0cd7e17ac22cd5537d1d919e241e3ddf1eb1 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 22:16:26 +0530
Subject: [PATCH 50/54] feat: types

---
 .../organizations/privacy/blocklist-table.tsx | 20 ++++---------------
 .../privacy/booking-reports-table.tsx         |  4 ++--
 .../components/add-to-blocklist-modal.tsx     |  2 +-
 .../booking-report-details-sheet.tsx          |  2 +-
 .../addToWatchlist.handler.test.ts            |  4 ++--
 .../organizations/addToWatchlist.handler.ts   |  5 +++--
 .../organizations/addToWatchlist.schema.ts    |  3 +--
 7 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
index 01095d963be51d..68213b7a8dfa28 100644
--- a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
@@ -78,18 +78,6 @@ export function BlocklistTable({ permissions }: BlocklistTableProps) {
     setShowDetailsSheet(true);
   };
 
-  const getActionVariant = (action: string): "red" | "orange" | "blue" | "gray" => {
-    switch (action) {
-      case "BLOCK":
-        return "red";
-      case "REPORT":
-        return "orange";
-      case "ALERT":
-        return "blue";
-      default:
-        return "gray";
-    }
-  };
 
   const totalRowCount = data?.meta?.totalRowCount ?? 0;
   const flatData = useMemo<BlocklistEntry[]>(() => data?.rows ?? [], [data]);
@@ -117,8 +105,8 @@ export function BlocklistTable({ permissions }: BlocklistTableProps) {
         header: t("blocked_by"),
         size: 180,
         cell: ({ row }) => {
-          const creator = row.original.audits?.[0]?.changedByUser;
-          return <span className="text-default">{creator?.email || "—"}</span>;
+          const _creatorId = row.original.audits?.[0]?.changedByUserId;
+          return <span className="text-default">{"—"}</span>;
         },
       },
       {
@@ -155,7 +143,7 @@ export function BlocklistTable({ permissions }: BlocklistTableProps) {
         },
       },
     ],
-    [t]
+    [t, permissions?.canDelete]
   );
 
   const table = useReactTable({
@@ -172,7 +160,7 @@ export function BlocklistTable({ permissions }: BlocklistTableProps) {
       <DataTableWrapper
         table={table}
         isPending={isPending}
-        variant="minimal"
+        variant="compact"
         totalDbDataCount={totalRowCount}>
         <div className="flex items-center justify-between">
           <DataTableToolbar.SearchBar />
diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index 67bc2bd2163daf..cf321e5bcae5dd 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -145,7 +145,7 @@ export function BookingReportsTable() {
         accessorKey: "reason",
         size: 90,
         meta: {
-          type: ColumnFilterType.MULTI_SELECT,
+          filterType: ColumnFilterType.MULTI_SELECT,
         },
         cell: ({ row }) => {
           const reasonColors: Record<string, "red" | "orange" | "gray"> = {
@@ -167,7 +167,7 @@ export function BookingReportsTable() {
         accessorFn: (row) => (row.watchlistId ? "true" : "false"),
         size: 120,
         meta: {
-          type: ColumnFilterType.MULTI_SELECT,
+          filterType: ColumnFilterType.MULTI_SELECT,
         },
         cell: ({ row }) => (
           <Badge variant={row.original.watchlistId ? "blue" : "gray"}>
diff --git a/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
index edc402b22cd19f..ab88431eec5df9 100644
--- a/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
@@ -5,7 +5,7 @@ import { useForm } from "react-hook-form";
 import { z } from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { WatchlistType } from "@calcom/prisma/enums";
+import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
index 60c59c884b2087..303ca4be868f44 100644
--- a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
+++ b/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
@@ -94,7 +94,7 @@ export function BookingReportDetailsSheet({
               <div className="flex flex-col">
                 <span className="text-subtle text-xs">{t("reported_by")}</span>
                 <span className="text-default text-sm">
-                  {report.reporter.name || ""} ({report.reporter.email ?? "-"})
+                  {(report.reporter?.name || "")} ({report.reporter?.email ?? "-"})
                 </span>
               </div>
               <div className="flex flex-col">
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
index 9ac354576b6e85..80ea1e2536f5b5 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
@@ -162,7 +162,7 @@ describe("addToWatchlistHandler", () => {
         input: {
           reportIds: ["report-1"],
           type: WatchlistType.EMAIL,
-          action: WatchlistAction.REPORT,
+          action: WatchlistAction.BLOCK,
           description: "Spam user",
         },
       });
@@ -173,7 +173,7 @@ describe("addToWatchlistHandler", () => {
         type: WatchlistType.EMAIL,
         value: "spammer@example.com",
         organizationId: 100,
-        action: WatchlistAction.REPORT,
+        action: WatchlistAction.BLOCK,
         description: "Spam user",
         userId: 1,
       });
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
index 2252291e5446ca..74f775743bd08f 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
@@ -1,6 +1,7 @@
 import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
 import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
 import { prisma } from "@calcom/prisma";
+import { WatchlistAction } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
@@ -74,7 +75,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
             type: input.type,
             value,
             organizationId,
-            action: input.action,
+            action: WatchlistAction.BLOCK,
             description: input.description,
             userId: user.id,
           });
@@ -101,7 +102,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
     if (error instanceof Error && error.message.includes("already exists")) {
       throw new TRPCError({
         code: "BAD_REQUEST",
-          message: "This entry already exists in the watchlist for your organization",
+        message: "This entry already exists in the watchlist for your organization",
       });
     }
     throw error;
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
index 3275b8ba235efd..b081ef675b99fd 100644
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
@@ -1,11 +1,10 @@
 import { z } from "zod";
 
-import { WatchlistAction, WatchlistType } from "@calcom/prisma/enums";
+import { WatchlistType } from "@calcom/prisma/enums";
 
 export const ZAddToWatchlistInputSchema = z.object({
   reportIds: z.array(z.string().uuid()).min(1),
   type: z.nativeEnum(WatchlistType),
-  action: z.nativeEnum(WatchlistAction),
   description: z.string().optional(),
 });
 

From 27f2823fe60e2855d306d1e4b866cb1ab08438b3 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 22:28:20 +0530
Subject: [PATCH 51/54] feat: types

---
 .../organizations/privacy/blocklist-table.tsx       | 13 +++++++++----
 .../organizations/privacy/booking-reports-table.tsx |  6 ------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
index 68213b7a8dfa28..c4cb372b3002d5 100644
--- a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
@@ -105,8 +105,12 @@ export function BlocklistTable({ permissions }: BlocklistTableProps) {
         header: t("blocked_by"),
         size: 180,
         cell: ({ row }) => {
-          const _creatorId = row.original.audits?.[0]?.changedByUserId;
-          return <span className="text-default">{"—"}</span>;
+          const audit = row.original.audits?.[0] as
+            | { changedByUserId: number | null }
+            | { changedByUser?: { id: number; email: string; name: string | null } | undefined; changedByUserId: number | null }
+            | undefined;
+          const email = (audit && "changedByUser" in audit ? audit.changedByUser?.email : undefined) ?? undefined;
+          return <span className="text-default">{email ?? "—"}</span>;
         },
       },
       {
@@ -160,8 +164,9 @@ export function BlocklistTable({ permissions }: BlocklistTableProps) {
       <DataTableWrapper
         table={table}
         isPending={isPending}
-        variant="compact"
-        totalDbDataCount={totalRowCount}>
+        variant="default"
+        paginationMode="standard"
+        totalRowCount={totalRowCount}>
         <div className="flex items-center justify-between">
           <DataTableToolbar.SearchBar />
           <div className="flex items-center gap-2">
diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
index cf321e5bcae5dd..781df93c8458fc 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
@@ -144,9 +144,6 @@ export function BookingReportsTable() {
         header: t("reason"),
         accessorKey: "reason",
         size: 90,
-        meta: {
-          filterType: ColumnFilterType.MULTI_SELECT,
-        },
         cell: ({ row }) => {
           const reasonColors: Record<string, "red" | "orange" | "gray"> = {
             SPAM: "red",
@@ -166,9 +163,6 @@ export function BookingReportsTable() {
         header: t("in_blocklist"),
         accessorFn: (row) => (row.watchlistId ? "true" : "false"),
         size: 120,
-        meta: {
-          filterType: ColumnFilterType.MULTI_SELECT,
-        },
         cell: ({ row }) => (
           <Badge variant={row.original.watchlistId ? "blue" : "gray"}>
             {row.original.watchlistId ? t("yes") : t("no")}

From 4ecb1d6595af3944b765bbb1b360ba1414397f79 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 14 Oct 2025 22:40:08 +0530
Subject: [PATCH 52/54] tests: add more unit tests

---
 .../createWatchlistEntry.handler.test.ts      | 296 +++++++++++++++
 .../deleteWatchlistEntry.handler.test.ts      | 194 ++++++++++
 .../getWatchlistEntryDetails.handler.test.ts  | 357 ++++++++++++++++++
 3 files changed, 847 insertions(+)
 create mode 100644 packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts

diff --git a/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts
new file mode 100644
index 00000000000000..0e43e7ff9303f1
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts
@@ -0,0 +1,296 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { WatchlistType, WatchlistAction, MembershipRole } from "@calcom/prisma/enums";
+
+import { createWatchlistEntryHandler } from "./createWatchlistEntry.handler";
+
+vi.mock("@calcom/features/pbac/services/permission-check.service");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("createWatchlistEntryHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+    profile: null,
+  };
+
+  const mockPermissionCheckService = {
+    checkPermission: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    createEntry: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PermissionCheckService).mockImplementation(() => mockPermissionCheckService as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined, profile: null } },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "spam@example.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to manage blocklist",
+      });
+
+      expect(mockPermissionCheckService.checkPermission).not.toHaveBeenCalled();
+    });
+
+    it("should throw UNAUTHORIZED when user lacks permission", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(false);
+
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "spam@example.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "You are not authorized to create blocklist entries",
+      });
+
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+    });
+
+    it("should check permission with correct parameters", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 100,
+        permission: "watchlist.create",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+  });
+
+  describe("validation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should throw BAD_REQUEST for invalid email format", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "invalid-email",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Invalid email address format",
+      });
+
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+    });
+
+    it("should throw BAD_REQUEST for email missing @ symbol", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "notanemail.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Invalid email address format",
+      });
+    });
+
+    it("should throw BAD_REQUEST for invalid domain format without @", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            type: WatchlistType.DOMAIN,
+            value: "example.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Invalid domain format. Domain must start with @ (e.g., @example.com)",
+      });
+
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+    });
+
+    it("should throw BAD_REQUEST for domain with invalid format", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            type: WatchlistType.DOMAIN,
+            value: "not-a-domain",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Invalid domain format. Domain must start with @ (e.g., @example.com)",
+      });
+    });
+
+    it("should accept valid email format", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "valid@example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalled();
+    });
+
+    it("should accept valid domain format with @", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.DOMAIN,
+          value: "@example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalled();
+    });
+  });
+
+  describe("successful creation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should create watchlist entry for EMAIL type", async () => {
+      const mockEntry = {
+        id: "watchlist-1",
+        type: WatchlistType.EMAIL,
+        value: "spam@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+      };
+      mockWatchlistRepo.createEntry.mockResolvedValue(mockEntry);
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "spam@example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.entry).toEqual(mockEntry);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spam@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should create watchlist entry for DOMAIN type", async () => {
+      const mockEntry = {
+        id: "watchlist-2",
+        type: WatchlistType.DOMAIN,
+        value: "@spammer.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+      };
+      mockWatchlistRepo.createEntry.mockResolvedValue(mockEntry);
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.DOMAIN,
+          value: "@spammer.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.entry).toEqual(mockEntry);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.DOMAIN,
+        value: "@spammer.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should convert value to lowercase", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-4" });
+
+      await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "SPAM@EXAMPLE.COM",
+        },
+      });
+
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spam@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should always set action to BLOCK", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-5" });
+
+      await createWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+        },
+      });
+
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith(
+        expect.objectContaining({
+          action: WatchlistAction.BLOCK,
+        })
+      );
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts
new file mode 100644
index 00000000000000..596468ef1de7dc
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts
@@ -0,0 +1,194 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { MembershipRole, WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+
+import { deleteWatchlistEntryHandler } from "./deleteWatchlistEntry.handler";
+
+vi.mock("@calcom/features/pbac/services/permission-check.service");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("deleteWatchlistEntryHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+    profile: null,
+  };
+
+  const mockEntry = {
+    id: "entry-123",
+    type: WatchlistType.EMAIL,
+    value: "spam@example.com",
+    organizationId: 100,
+    action: WatchlistAction.BLOCK,
+    description: null,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+
+  const mockPermissionCheckService = {
+    checkPermission: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    findEntryWithAudit: vi.fn(),
+    deleteEntry: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PermissionCheckService).mockImplementation(() => mockPermissionCheckService as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined, profile: null } },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to manage blocklist",
+      });
+
+      expect(mockPermissionCheckService.checkPermission).not.toHaveBeenCalled();
+    });
+
+    it("should throw UNAUTHORIZED when user lacks permission", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(false);
+
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "You are not authorized to delete blocklist entries",
+      });
+
+      expect(mockWatchlistRepo.findEntryWithAudit).not.toHaveBeenCalled();
+    });
+
+    it("should check permission with correct parameters", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+      mockWatchlistRepo.deleteEntry.mockResolvedValue(undefined);
+
+      await deleteWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 100,
+        permission: "watchlist.delete",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+  });
+
+  describe("validation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should throw NOT_FOUND when entry does not exist", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: null,
+        auditHistory: [],
+      });
+
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "non-existent-id",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: "Blocklist entry not found",
+      });
+
+      expect(mockWatchlistRepo.deleteEntry).not.toHaveBeenCalled();
+    });
+
+    it("should throw FORBIDDEN when entry belongs to different organization", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: { ...mockEntry, organizationId: 999 },
+        auditHistory: [],
+      });
+
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You can only delete blocklist entries from your organization",
+      });
+
+      expect(mockWatchlistRepo.deleteEntry).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("successful deletion", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should successfully delete entry when authorized", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+      mockWatchlistRepo.deleteEntry.mockResolvedValue(undefined);
+
+      const result = await deleteWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.message).toBe("Blocklist entry deleted successfully");
+      expect(mockWatchlistRepo.deleteEntry).toHaveBeenCalledWith("entry-123", 1);
+    });
+
+    it("should pass correct userId to deleteEntry", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+      mockWatchlistRepo.deleteEntry.mockResolvedValue(undefined);
+
+      await deleteWatchlistEntryHandler({
+        ctx: { user: { ...mockUser, id: 42 } },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockWatchlistRepo.deleteEntry).toHaveBeenCalledWith("entry-123", 42);
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts
new file mode 100644
index 00000000000000..26e72a4a2d4f60
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts
@@ -0,0 +1,357 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { MembershipRole, WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+
+import { getWatchlistEntryDetailsHandler } from "./getWatchlistEntryDetails.handler";
+
+vi.mock("@calcom/features/pbac/services/permission-check.service");
+vi.mock("@calcom/features/users/repositories/UserRepository");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("getWatchlistEntryDetailsHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+    profile: null,
+  };
+
+  const mockEntry = {
+    id: "entry-123",
+    type: WatchlistType.EMAIL,
+    value: "spam@example.com",
+    organizationId: 100,
+    action: WatchlistAction.BLOCK,
+    description: "Known spammer",
+    createdAt: new Date("2025-01-01"),
+    updatedAt: new Date("2025-01-02"),
+  };
+
+  const mockAuditHistory = [
+    {
+      id: "audit-1",
+      watchlistId: "entry-123",
+      action: "CREATED" as const,
+      changedByUserId: 1,
+      timestamp: new Date("2025-01-01"),
+      previousValue: null,
+      newValue: "spam@example.com",
+    },
+    {
+      id: "audit-2",
+      watchlistId: "entry-123",
+      action: "UPDATED" as const,
+      changedByUserId: 2,
+      timestamp: new Date("2025-01-02"),
+      previousValue: null,
+      newValue: "Known spammer",
+    },
+  ];
+
+  const mockUsers = [
+    { id: 1, name: "Admin", email: "admin@example.com" },
+    { id: 2, name: "Editor", email: "editor@example.com" },
+  ];
+
+  const mockPermissionCheckService = {
+    checkPermission: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    findEntryWithAudit: vi.fn(),
+  };
+
+  const mockUserRepo = {
+    findUsersByIds: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PermissionCheckService).mockImplementation(() => mockPermissionCheckService as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+    vi.mocked(UserRepository).mockImplementation(() => mockUserRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined, profile: null } },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to view blocklist",
+      });
+
+      expect(mockPermissionCheckService.checkPermission).not.toHaveBeenCalled();
+    });
+
+    it("should use profile.organizationId when available", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: { ...mockEntry, organizationId: 200 },
+        auditHistory: [],
+      });
+
+      await getWatchlistEntryDetailsHandler({
+        ctx: {
+          user: {
+            ...mockUser,
+            organizationId: undefined,
+            profile: { organizationId: 200 },
+          },
+        },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 200,
+        permission: "watchlist.read",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+
+    it("should throw UNAUTHORIZED when user lacks permission", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(false);
+
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "You are not authorized to view blocklist entries",
+      });
+
+      expect(mockWatchlistRepo.findEntryWithAudit).not.toHaveBeenCalled();
+    });
+
+    it("should check permission with correct parameters", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+
+      await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 100,
+        permission: "watchlist.read",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+  });
+
+  describe("validation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should throw NOT_FOUND when entry does not exist", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: null,
+        auditHistory: [],
+      });
+
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "non-existent-id",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: "Blocklist entry not found",
+      });
+    });
+
+    it("should throw FORBIDDEN when entry belongs to different organization", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: { ...mockEntry, organizationId: 999 },
+        auditHistory: [],
+      });
+
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You can only view blocklist entries from your organization",
+      });
+    });
+  });
+
+  describe("successful retrieval", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should return entry and audit history when authorized", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: mockAuditHistory,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue(mockUsers);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.entry).toEqual(mockEntry);
+      expect(result.auditHistory).toHaveLength(2);
+      expect(mockWatchlistRepo.findEntryWithAudit).toHaveBeenCalledWith("entry-123");
+    });
+
+    it("should enrich audit history with user details", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: mockAuditHistory,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue(mockUsers);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.auditHistory[0].changedByUser).toEqual(mockUsers[0]);
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[1]);
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([1, 2]);
+    });
+
+    it("should handle audit history with duplicate user IDs", async () => {
+      const auditWithDuplicates = [
+        { ...mockAuditHistory[0], changedByUserId: 1 },
+        { ...mockAuditHistory[1], changedByUserId: 1 },
+      ];
+
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: auditWithDuplicates,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([mockUsers[0]]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([1]);
+      expect(result.auditHistory[0].changedByUser).toEqual(mockUsers[0]);
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[0]);
+    });
+
+    it("should handle audit history with null user IDs", async () => {
+      const auditWithNulls = [
+        { ...mockAuditHistory[0], changedByUserId: null },
+        { ...mockAuditHistory[1], changedByUserId: 2 },
+      ];
+
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: auditWithNulls,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([mockUsers[1]]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([2]);
+      expect(result.auditHistory[0].changedByUser).toBeUndefined();
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[1]);
+    });
+
+    it("should handle audit history with undefined user IDs", async () => {
+      const auditWithUndefined = [
+        { ...mockAuditHistory[0], changedByUserId: undefined },
+        { ...mockAuditHistory[1], changedByUserId: 2 },
+      ];
+
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: auditWithUndefined,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([mockUsers[1]]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([2]);
+      expect(result.auditHistory[0].changedByUser).toBeUndefined();
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[1]);
+    });
+
+    it("should not call findUsersByIds when audit history is empty", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.auditHistory).toHaveLength(0);
+      expect(mockUserRepo.findUsersByIds).not.toHaveBeenCalled();
+    });
+
+    it("should handle when user is not found in user map", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [mockAuditHistory[0]],
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.auditHistory[0].changedByUser).toBeUndefined();
+    });
+  });
+});
\ No newline at end of file

From 4e7d07e98fe78607619b9f1b74e05f774e2594a8 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 16 Oct 2025 20:30:03 +0530
Subject: [PATCH 53/54] refactor: move to system admin

---
 .../admin/booking-reports/page.tsx            |  26 ++
 .../SettingsLayoutAppDirClient.tsx            |   1 +
 .../booking-reports-view.tsx}                 |  45 ++-
 .../components/add-to-blocklist-modal.tsx     |   8 +-
 .../booking-report-details-sheet.tsx          |   4 +-
 .../components/bulk-add-to-blocklist.tsx      |   2 +-
 apps/web/public/static/locales/en/common.json |  21 ++
 .../repository/bookingReport.interface.ts     |   6 +-
 .../lib/server/repository/bookingReport.ts    |  40 +-
 .../server/routers/viewer/admin/_router.ts    |  39 +-
 .../admin/addToWatchlist.handler.test.ts      | 357 ++++++++++++++++++
 .../viewer/admin/addToWatchlist.handler.ts    | 114 ++++++
 .../viewer/admin/addToWatchlist.schema.ts     |  11 +
 .../admin/deleteBookingReport.handler.test.ts |  91 +++++
 .../admin/deleteBookingReport.handler.ts      |  24 ++
 .../admin/deleteBookingReport.schema.ts       |   7 +
 .../admin/listBookingReports.handler.test.ts  | 220 +++++++++++
 .../admin/listBookingReports.handler.ts       |  27 ++
 .../viewer/admin/listBookingReports.schema.ts |  24 ++
 19 files changed, 1009 insertions(+), 58 deletions(-)
 create mode 100644 apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/booking-reports/page.tsx
 rename apps/web/modules/settings/{organizations/privacy/booking-reports-table.tsx => admin/booking-reports-view.tsx} (91%)
 rename apps/web/modules/settings/{organizations/privacy => admin}/components/add-to-blocklist-modal.tsx (93%)
 rename apps/web/modules/settings/{organizations/privacy => admin}/components/booking-report-details-sheet.tsx (97%)
 rename apps/web/modules/settings/{organizations/privacy => admin}/components/bulk-add-to-blocklist.tsx (91%)
 create mode 100644 packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/addToWatchlist.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/deleteBookingReport.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/listBookingReports.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/listBookingReports.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/listBookingReports.schema.ts

diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/booking-reports/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/booking-reports/page.tsx
new file mode 100644
index 00000000000000..a681fce0050f77
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/booking-reports/page.tsx
@@ -0,0 +1,26 @@
+import { _generateMetadata } from "app/_utils";
+import { getTranslate } from "app/_utils";
+
+import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+
+import BookingReportsView from "~/settings/admin/booking-reports-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("booking_reports"),
+    (t) => t("admin_booking_reports_description"),
+    undefined,
+    undefined,
+    "/settings/admin/booking-reports"
+  );
+
+const Page = async () => {
+  const t = await getTranslate();
+  return (
+    <SettingsHeader title={t("booking_reports")} description={t("admin_booking_reports_description")}>
+      <BookingReportsView />
+    </SettingsHeader>
+  );
+};
+
+export default Page;
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
index 43190417291565..354a1448f30887 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
@@ -142,6 +142,7 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
         { name: "apps", href: "/settings/admin/apps/calendar" },
         { name: "users", href: "/settings/admin/users" },
         { name: "organizations", href: "/settings/admin/organizations" },
+        { name: "booking_reports", href: "/settings/admin/booking-reports" },
         { name: "lockedSMS", href: "/settings/admin/lockedSMS" },
         { name: "oAuth", href: "/settings/admin/oAuth" },
         { name: "Workspace Platforms", href: "/settings/admin/workspace-platforms" },
diff --git a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx b/apps/web/modules/settings/admin/booking-reports-view.tsx
similarity index 91%
rename from apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
rename to apps/web/modules/settings/admin/booking-reports-view.tsx
index 781df93c8458fc..f4b5bedc8e594d 100644
--- a/apps/web/modules/settings/organizations/privacy/booking-reports-table.tsx
+++ b/apps/web/modules/settings/admin/booking-reports-view.tsx
@@ -13,7 +13,9 @@ import {
   useColumnFilters,
   convertFacetedValuesToMap,
   DataTableSelectionBar,
+  DataTableProvider,
 } from "@calcom/features/data-table";
+import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc";
 import type { RouterOutputs } from "@calcom/trpc/react";
@@ -37,10 +39,9 @@ import { AddToBlocklistModal } from "./components/add-to-blocklist-modal";
 import { BookingReportDetailsSheet } from "./components/booking-report-details-sheet";
 import { BulkAddToBlocklist } from "./components/bulk-add-to-blocklist";
 
-type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+type BookingReport = RouterOutputs["viewer"]["admin"]["listBookingReports"]["rows"][number];
 
-// TODO: We would use it in system admin table
-export function BookingReportsTable() {
+function BookingReportsTable() {
   const { t } = useLocale();
   const { limit, offset, searchTerm } = useDataTable();
   const columnFilters = useColumnFilters();
@@ -52,17 +53,17 @@ export function BookingReportsTable() {
   const [rowSelection, setRowSelection] = useState({});
 
   const filters = useMemo(() => {
-    const hasWatchlistFilter = columnFilters.find((f) => f.id === "hasWatchlist");
+    const statusFilter = columnFilters.find((f) => f.id === "status");
 
     let hasWatchlistValue: boolean | undefined = undefined;
 
-    if (hasWatchlistFilter && hasWatchlistFilter.value.type === ColumnFilterType.MULTI_SELECT) {
-      const filterValues = hasWatchlistFilter.value.data;
+    if (statusFilter && statusFilter.value.type === ColumnFilterType.MULTI_SELECT) {
+      const filterValues = statusFilter.value.data;
       if (Array.isArray(filterValues) && filterValues.length > 0) {
         if (filterValues.length === 2 || filterValues.length === 0) {
           hasWatchlistValue = undefined;
         } else {
-          hasWatchlistValue = filterValues[0] === "true";
+          hasWatchlistValue = filterValues[0] === "blocked";
         }
       }
     }
@@ -72,7 +73,7 @@ export function BookingReportsTable() {
     };
   }, [columnFilters]);
 
-  const { data, isPending } = trpc.viewer.organizations.listBookingReports.useQuery(
+  const { data, isPending } = trpc.viewer.admin.listBookingReports.useQuery(
     {
       limit,
       offset,
@@ -86,9 +87,9 @@ export function BookingReportsTable() {
 
   const utils = trpc.useUtils();
 
-  const deleteReportMutation = trpc.viewer.organizations.deleteBookingReport.useMutation({
+  const deleteReportMutation = trpc.viewer.admin.deleteBookingReport.useMutation({
     onSuccess: async () => {
-      await utils.viewer.organizations.listBookingReports.invalidate();
+      await utils.viewer.admin.listBookingReports.invalidate();
       showToast(t("booking_report_deleted"), "success");
       setShowDeleteDialog(false);
       setSelectedReport(null);
@@ -159,13 +160,13 @@ export function BookingReportsTable() {
         },
       },
       {
-        id: "hasWatchlist",
-        header: t("in_blocklist"),
-        accessorFn: (row) => (row.watchlistId ? "true" : "false"),
+        id: "status",
+        header: t("status"),
+        accessorFn: (row) => (row.watchlistId ? "blocked" : "pending"),
         size: 120,
         cell: ({ row }) => (
-          <Badge variant={row.original.watchlistId ? "blue" : "gray"}>
-            {row.original.watchlistId ? t("yes") : t("no")}
+          <Badge variant={row.original.watchlistId ? "blue" : "orange"}>
+            {row.original.watchlistId ? t("blocked") : t("pending")}
           </Badge>
         ),
       },
@@ -319,10 +320,10 @@ export function BookingReportsTable() {
     enableRowSelection: true,
     getFacetedUniqueValues: (_, columnId) => () => {
       switch (columnId) {
-        case "hasWatchlist":
+        case "status":
           return convertFacetedValuesToMap([
-            { label: t("no"), value: "false" },
-            { label: t("yes"), value: "true" },
+            { label: t("pending"), value: "pending" },
+            { label: t("blocked"), value: "blocked" },
           ]);
         case "reason":
           return convertFacetedValuesToMap([
@@ -422,3 +423,11 @@ export function BookingReportsTable() {
     </>
   );
 }
+
+export default function BookingReportsView() {
+  return (
+    <DataTableProvider useSegments={useSegments} defaultPageSize={25}>
+      <BookingReportsTable />
+    </DataTableProvider>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx b/apps/web/modules/settings/admin/components/add-to-blocklist-modal.tsx
similarity index 93%
rename from apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
rename to apps/web/modules/settings/admin/components/add-to-blocklist-modal.tsx
index ab88431eec5df9..6b0682a9a5a65e 100644
--- a/apps/web/modules/settings/organizations/privacy/components/add-to-blocklist-modal.tsx
+++ b/apps/web/modules/settings/admin/components/add-to-blocklist-modal.tsx
@@ -5,7 +5,7 @@ import { useForm } from "react-hook-form";
 import { z } from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+import { WatchlistType } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
@@ -13,7 +13,7 @@ import { Dialog, DialogContent, DialogHeader, DialogFooter } from "@calcom/ui/co
 import { Form, Label, Select, TextAreaField } from "@calcom/ui/components/form";
 import { showToast } from "@calcom/ui/components/toast";
 
-type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+type BookingReport = RouterOutputs["viewer"]["admin"]["listBookingReports"]["rows"][number];
 
 interface AddToWatchlistModalProps {
   open: boolean;
@@ -50,10 +50,10 @@ export function AddToBlocklistModal({ open, onClose, report, reports }: AddToWat
 
   const watchlistType = form.watch("type");
 
-  const addToWatchlistMutation = trpc.viewer.organizations.addToWatchlist.useMutation({
+  const addToWatchlistMutation = trpc.viewer.admin.addToWatchlist.useMutation({
     onSuccess: () => {
       showToast(t("successfully_added_to_blocklist"), "success");
-      utils.viewer.organizations.listBookingReports.invalidate();
+      utils.viewer.admin.listBookingReports.invalidate();
       onClose();
       form.reset();
     },
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx b/apps/web/modules/settings/admin/components/booking-report-details-sheet.tsx
similarity index 97%
rename from apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
rename to apps/web/modules/settings/admin/components/booking-report-details-sheet.tsx
index 303ca4be868f44..b239f4c3767685 100644
--- a/apps/web/modules/settings/organizations/privacy/components/booking-report-details-sheet.tsx
+++ b/apps/web/modules/settings/admin/components/booking-report-details-sheet.tsx
@@ -8,7 +8,7 @@ import { Badge } from "@calcom/ui/components/badge";
 import { Button } from "@calcom/ui/components/button";
 import { Sheet, SheetContent, SheetHeader, SheetBody } from "@calcom/ui/components/sheet";
 
-type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+type BookingReport = RouterOutputs["viewer"]["admin"]["listBookingReports"]["rows"][number];
 
 interface BookingReportDetailsSheetProps {
   open: boolean;
@@ -94,7 +94,7 @@ export function BookingReportDetailsSheet({
               <div className="flex flex-col">
                 <span className="text-subtle text-xs">{t("reported_by")}</span>
                 <span className="text-default text-sm">
-                  {(report.reporter?.name || "")} ({report.reporter?.email ?? "-"})
+                  {report.reporter?.name || ""} ({report.reporter?.email ?? "-"})
                 </span>
               </div>
               <div className="flex flex-col">
diff --git a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-blocklist.tsx b/apps/web/modules/settings/admin/components/bulk-add-to-blocklist.tsx
similarity index 91%
rename from apps/web/modules/settings/organizations/privacy/components/bulk-add-to-blocklist.tsx
rename to apps/web/modules/settings/admin/components/bulk-add-to-blocklist.tsx
index 92ce0413d07d68..bc424e5a9afbbd 100644
--- a/apps/web/modules/settings/organizations/privacy/components/bulk-add-to-blocklist.tsx
+++ b/apps/web/modules/settings/admin/components/bulk-add-to-blocklist.tsx
@@ -8,7 +8,7 @@ import { Button } from "@calcom/ui/components/button";
 
 import { AddToBlocklistModal } from "./add-to-blocklist-modal";
 
-type BookingReport = RouterOutputs["viewer"]["organizations"]["listBookingReports"]["rows"][number];
+type BookingReport = RouterOutputs["viewer"]["admin"]["listBookingReports"]["rows"][number];
 
 interface BulkAddToBlocklistProps {
   reports: BookingReport[];
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index c68527b661e3fb..2d92f86f8fd582 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1707,6 +1707,11 @@
   "impersonation": "Impersonation",
   "impersonation_description": "Settings to manage user impersonation",
   "recent_impersonations": "Recent Impersonations",
+  "booking_reports": "Booking Reports",
+  "admin_booking_reports_description": "View and manage booking reports",
+  "booker_email": "Booker Email",
+  "reported_by": "Reported By",
+  "in_blocklist": "In Blocklist",
   "quick_impersonate": "Quick Impersonate",
   "no_recent_impersonations": "No recent impersonations",
   "users": "Users",
@@ -3839,5 +3844,21 @@
   "reason_for_adding_to_blocklist": "Reason for adding to blocklist",
   "what_would_you_like_to_block": "What would you like to block?",
   "domain_name": "Domain Name",
+  "add_to_blocklist": "Add to Blocklist",
+  "add_to_blocklist_subtitle": "Block {{email}} from booking with your organization",
+  "add_multiple_to_blocklist_subtitle": "Add {{count}} bookers to the blocklist",
+  "what_to_add": "What to add",
+  "this_email_address": "This email address",
+  "entire_domain": "Entire domain",
+  "all_emails_from": "All emails from",
+  "add_internal_note_placeholder": "Add an optional internal note about why this is being blocked",
+  "successfully_added_to_blocklist": "Successfully added to blocklist",
+  "report_details": "Report Details",
+  "blocklist_info": "Blocklist Info",
+  "blocklist_type": "Blocklist Type",
+  "blocklist_value": "Blocklist Value",
+  "blocklist_action": "Blocklist Action",
+  "blocklist_description": "Blocklist Description",
+  "blocked": "Blocked",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
 }
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
index fff2a05da6515d..c3ab79f99e5303 100644
--- a/packages/lib/server/repository/bookingReport.interface.ts
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -64,7 +64,7 @@ export interface IBookingReportRepository {
   createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
 
   findAllReportedBookings(params: {
-    organizationId: number;
+    organizationId?: number;
     skip?: number;
     take?: number;
     searchTerm?: string;
@@ -76,10 +76,10 @@ export interface IBookingReportRepository {
 
   findReportsByIds(params: {
     reportIds: string[];
-    organizationId: number;
+    organizationId?: number;
   }): Promise<BookingReportWithDetails[]>;
 
   linkWatchlistToReport(params: { reportId: string; watchlistId: string }): Promise<void>;
 
-  deleteReport(params: { reportId: string; organizationId: number }): Promise<void>;
+  deleteReport(params: { reportId: string; organizationId?: number }): Promise<void>;
 }
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
index 1c477211087db2..cf03a5d20fbe3f 100644
--- a/packages/lib/server/repository/bookingReport.ts
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -28,7 +28,7 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
   }
 
   async findAllReportedBookings(params: {
-    organizationId: number;
+    organizationId?: number;
     skip?: number;
     take?: number;
     searchTerm?: string;
@@ -37,9 +37,11 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
     rows: BookingReportWithDetails[];
     meta: { totalRowCount: number };
   }> {
-    const where: Prisma.BookingReportWhereInput = {
-      organizationId: params.organizationId,
-    };
+    const where: Prisma.BookingReportWhereInput = {};
+
+    if (params.organizationId !== undefined) {
+      where.organizationId = params.organizationId;
+    }
 
     if (params.searchTerm) {
       where.OR = [
@@ -141,13 +143,18 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
 
   async findReportsByIds(params: {
     reportIds: string[];
-    organizationId: number;
+    organizationId?: number;
   }): Promise<BookingReportWithDetails[]> {
+    const where: Prisma.BookingReportWhereInput = {
+      id: { in: params.reportIds },
+    };
+
+    if (params.organizationId !== undefined) {
+      where.organizationId = params.organizationId;
+    }
+
     const reports = await this.prismaClient.bookingReport.findMany({
-      where: {
-        id: { in: params.reportIds },
-        organizationId: params.organizationId,
-      },
+      where,
       select: {
         id: true,
         bookingUid: true,
@@ -192,12 +199,17 @@ export class PrismaBookingReportRepository implements IBookingReportRepository {
     }));
   }
 
-  async deleteReport(params: { reportId: string; organizationId: number }): Promise<void> {
+  async deleteReport(params: { reportId: string; organizationId?: number }): Promise<void> {
+    const where: Prisma.BookingReportWhereInput & { id: string } = {
+      id: params.reportId,
+    };
+
+    if (params.organizationId !== undefined) {
+      where.organizationId = params.organizationId;
+    }
+
     await this.prismaClient.bookingReport.delete({
-      where: {
-        id: params.reportId,
-        organizationId: params.organizationId,
-      },
+      where,
     });
   }
 }
diff --git a/packages/trpc/server/routers/viewer/admin/_router.ts b/packages/trpc/server/routers/viewer/admin/_router.ts
index b2c145727b25b9..cd020d74d3429b 100644
--- a/packages/trpc/server/routers/viewer/admin/_router.ts
+++ b/packages/trpc/server/routers/viewer/admin/_router.ts
@@ -1,8 +1,11 @@
 import { authedAdminProcedure } from "../../../procedures/authedProcedure";
 import { router } from "../../../trpc";
+import { ZAddToWatchlistInputSchema } from "./addToWatchlist.schema";
 import { ZAdminAssignFeatureToTeamSchema } from "./assignFeatureToTeam.schema";
 import { ZCreateSelfHostedLicenseSchema } from "./createSelfHostedLicenseKey.schema";
+import { ZDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
 import { ZAdminGetTeamsForFeatureSchema } from "./getTeamsForFeature.schema";
+import { ZListBookingReportsInputSchema } from "./listBookingReports.schema";
 import { ZListMembersSchema } from "./listPaginated.schema";
 import { ZAdminLockUserAccountSchema } from "./lockUserAccount.schema";
 import { ZAdminRemoveTwoFactor } from "./removeTwoFactor.schema";
@@ -19,10 +22,6 @@ import {
   workspacePlatformToggleEnabledSchema,
 } from "./workspacePlatform/schema";
 
-const NAMESPACE = "admin";
-
-const namespaced = (s: string) => `${NAMESPACE}.${s}`;
-
 export const adminRouter = router({
   listPaginated: authedAdminProcedure.input(ZListMembersSchema).query(async (opts) => {
     const { default: handler } = await import("./listPaginated.handler");
@@ -63,18 +62,14 @@ export const adminRouter = router({
     const { default: handler } = await import("./whitelistUserWorkflows.handler");
     return handler(opts);
   }),
-  getTeamsForFeature: authedAdminProcedure
-    .input(ZAdminGetTeamsForFeatureSchema)
-    .query(async (opts) => {
-      const { default: handler } = await import("./getTeamsForFeature.handler");
-      return handler(opts);
-    }),
-  assignFeatureToTeam: authedAdminProcedure
-    .input(ZAdminAssignFeatureToTeamSchema)
-    .mutation(async (opts) => {
-      const { default: handler } = await import("./assignFeatureToTeam.handler");
-      return handler(opts);
-    }),
+  getTeamsForFeature: authedAdminProcedure.input(ZAdminGetTeamsForFeatureSchema).query(async (opts) => {
+    const { default: handler } = await import("./getTeamsForFeature.handler");
+    return handler(opts);
+  }),
+  assignFeatureToTeam: authedAdminProcedure.input(ZAdminAssignFeatureToTeamSchema).mutation(async (opts) => {
+    const { default: handler } = await import("./assignFeatureToTeam.handler");
+    return handler(opts);
+  }),
   unassignFeatureFromTeam: authedAdminProcedure
     .input(ZAdminUnassignFeatureFromTeamSchema)
     .mutation(async (opts) => {
@@ -105,4 +100,16 @@ export const adminRouter = router({
       return handler(opts);
     }),
   }),
+  listBookingReports: authedAdminProcedure.input(ZListBookingReportsInputSchema).query(async (opts) => {
+    const { default: handler } = await import("./listBookingReports.handler");
+    return handler(opts);
+  }),
+  deleteBookingReport: authedAdminProcedure.input(ZDeleteBookingReportInputSchema).mutation(async (opts) => {
+    const { default: handler } = await import("./deleteBookingReport.handler");
+    return handler(opts);
+  }),
+  addToWatchlist: authedAdminProcedure.input(ZAddToWatchlistInputSchema).mutation(async (opts) => {
+    const { default: handler } = await import("./addToWatchlist.handler");
+    return handler(opts);
+  }),
 });
diff --git a/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts
new file mode 100644
index 00000000000000..2335b47eb833c2
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts
@@ -0,0 +1,357 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { WatchlistType, WatchlistAction, BookingReportReason } from "@calcom/prisma/enums";
+
+import { addToWatchlistHandler } from "./addToWatchlist.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+vi.mock("@calcom/prisma", () => ({
+  prisma: {
+    bookingReport: {
+      findUnique: vi.fn(),
+    },
+  },
+}));
+
+describe("addToWatchlistHandler (Admin)", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    role: "ADMIN" as const,
+  };
+
+  const mockReports = [
+    {
+      id: "report-1",
+      bookingId: 1,
+      bookerEmail: "spammer@example.com",
+      reportedById: 1,
+      reason: BookingReportReason.SPAM,
+      description: null,
+      cancelled: false,
+      createdAt: new Date(),
+      watchlistId: null,
+      reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+      booking: {
+        id: 1,
+        startTime: new Date(),
+        endTime: new Date(),
+        title: "Test Booking",
+        uid: "booking-uid-1",
+      },
+      watchlist: null,
+    },
+    {
+      id: "report-2",
+      bookingId: 2,
+      bookerEmail: "user@spammer.com",
+      reportedById: 1,
+      reason: BookingReportReason.SPAM,
+      description: null,
+      cancelled: false,
+      createdAt: new Date(),
+      watchlistId: null,
+      reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+      booking: {
+        id: 2,
+        startTime: new Date(),
+        endTime: new Date(),
+        title: "Test Booking 2",
+        uid: "booking-uid-2",
+      },
+      watchlist: null,
+    },
+  ];
+
+  const mockReportRepo = {
+    findReportsByIds: vi.fn(),
+    linkWatchlistToReport: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    checkExists: vi.fn(),
+    createEntry: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw NOT_FOUND when report IDs don't exist", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([]);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1", "report-2"],
+            type: WatchlistType.EMAIL,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: expect.stringContaining("Booking report(s) not found"),
+      });
+    });
+
+    it("should throw NOT_FOUND with specific missing IDs", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1", "report-2", "report-3"],
+            type: WatchlistType.EMAIL,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: expect.stringContaining("report-2, report-3"),
+      });
+    });
+
+    it("should throw BAD_REQUEST when report has no organizationId", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: null } as any);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1"],
+            type: WatchlistType.EMAIL,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: expect.stringContaining("does not have an associated organization"),
+      });
+    });
+  });
+
+  describe("duplicate prevention", () => {
+    it("should throw BAD_REQUEST when all reports are already in watchlist", async () => {
+      const reportsInWatchlist = mockReports.map((r) => ({ ...r, watchlistId: "watchlist-123" }));
+      mockReportRepo.findReportsByIds.mockResolvedValue(reportsInWatchlist);
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1", "report-2"],
+            type: WatchlistType.EMAIL,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "All selected bookers are already in the watchlist",
+      });
+    });
+  });
+
+  describe("successful addition", () => {
+    it("should create new watchlist entry for EMAIL type and link report", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-new" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1"],
+          type: WatchlistType.EMAIL,
+          description: "Spam user",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.addedCount).toBe(1);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spammer@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: "Spam user",
+        userId: 1,
+      });
+      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
+        reportId: "report-1",
+        watchlistId: "watchlist-new",
+      });
+    });
+
+    it("should create new watchlist entry for DOMAIN type and link report", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-domain" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1"],
+          type: WatchlistType.DOMAIN,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.DOMAIN,
+        value: "example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should reuse existing watchlist entry when value already exists", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue({ id: "existing-watchlist" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1"],
+          type: WatchlistType.EMAIL,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
+        reportId: "report-1",
+        watchlistId: "existing-watchlist",
+      });
+    });
+
+    it("should process multiple reports in batch", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue(mockReports);
+      vi.mocked(prisma.bookingReport.findUnique)
+        .mockResolvedValueOnce({ organizationId: 100 } as any)
+        .mockResolvedValueOnce({ organizationId: 100 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry
+        .mockResolvedValueOnce({ id: "watchlist-1" })
+        .mockResolvedValueOnce({ id: "watchlist-2" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1", "report-2"],
+          type: WatchlistType.EMAIL,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.addedCount).toBe(2);
+      expect(result.results).toHaveLength(2);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledTimes(2);
+      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledTimes(2);
+    });
+
+    it("should return correct counts when processing multiple reports", async () => {
+      const mixedReports = [mockReports[0], { ...mockReports[1], watchlistId: "already-added" }];
+      mockReportRepo.findReportsByIds.mockResolvedValue(mixedReports);
+      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "new-watchlist" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-1", "report-2"],
+          type: WatchlistType.EMAIL,
+        },
+      });
+
+      expect(result.addedCount).toBe(1);
+      expect(result.skippedCount).toBe(1);
+      expect(result.message).toBe("Successfully added 1 report(s) to watchlist");
+    });
+  });
+
+  describe("cross-organization support", () => {
+    it("should handle reports from different organizations", async () => {
+      const crossOrgReports = [
+        { ...mockReports[0], id: "report-org-100" },
+        { ...mockReports[1], id: "report-org-200" },
+      ];
+      mockReportRepo.findReportsByIds.mockResolvedValue(crossOrgReports);
+      vi.mocked(prisma.bookingReport.findUnique)
+        .mockResolvedValueOnce({ organizationId: 100 } as any)
+        .mockResolvedValueOnce({ organizationId: 200 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry
+        .mockResolvedValueOnce({ id: "watchlist-org-100" })
+        .mockResolvedValueOnce({ id: "watchlist-org-200" });
+      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
+
+      const result = await addToWatchlistHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportIds: ["report-org-100", "report-org-200"],
+          type: WatchlistType.EMAIL,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.addedCount).toBe(2);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenNthCalledWith(1, {
+        type: WatchlistType.EMAIL,
+        value: "spammer@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+      expect(mockWatchlistRepo.createEntry).toHaveBeenNthCalledWith(2, {
+        type: WatchlistType.EMAIL,
+        value: "user@spammer.com",
+        organizationId: 200,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+  });
+
+  describe("error handling", () => {
+    it("should handle already exists errors gracefully", async () => {
+      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
+      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
+      mockWatchlistRepo.checkExists.mockResolvedValue(null);
+      mockWatchlistRepo.createEntry.mockRejectedValue(
+        new Error("Watchlist entry already exists for this value")
+      );
+
+      await expect(
+        addToWatchlistHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportIds: ["report-1"],
+            type: WatchlistType.EMAIL,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "This entry already exists in the watchlist for the organization",
+      });
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts
new file mode 100644
index 00000000000000..9a2d975a0ee4a3
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts
@@ -0,0 +1,114 @@
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { WatchlistAction } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TAddToWatchlistInputSchema } from "./addToWatchlist.schema";
+
+type AddToWatchlistOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TAddToWatchlistInputSchema;
+};
+
+export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOptions) => {
+  const { user } = ctx;
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+  const watchlistRepo = new WatchlistRepository(prisma);
+
+  const validReports = await bookingReportRepo.findReportsByIds({
+    reportIds: input.reportIds,
+  });
+
+  if (validReports.length !== input.reportIds.length) {
+    const foundIds = validReports.map((r) => r.id);
+    const missingIds = input.reportIds.filter((id) => !foundIds.includes(id));
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: `Booking report(s) not found: ${missingIds.join(", ")}`,
+    });
+  }
+
+  const reportsToAdd = validReports.filter((report) => !report.watchlistId);
+
+  if (reportsToAdd.length === 0) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "All selected bookers are already in the watchlist",
+    });
+  }
+
+  try {
+    const results = await Promise.all(
+      reportsToAdd.map(async (report) => {
+        const reportWithOrg = await prisma.bookingReport.findUnique({
+          where: { id: report.id },
+          select: { organizationId: true },
+        });
+
+        if (!reportWithOrg?.organizationId) {
+          throw new TRPCError({
+            code: "BAD_REQUEST",
+            message: `Report ${report.id} does not have an associated organization`,
+          });
+        }
+
+        const value =
+          input.type === "EMAIL"
+            ? report.bookerEmail
+            : report.bookerEmail.split("@")[1] || report.bookerEmail;
+
+        const existingWatchlist = await watchlistRepo.checkExists({
+          type: input.type,
+          value,
+          organizationId: reportWithOrg.organizationId,
+        });
+
+        let watchlistId: string;
+
+        if (existingWatchlist) {
+          watchlistId = existingWatchlist.id;
+        } else {
+          const newWatchlist = await watchlistRepo.createEntry({
+            type: input.type,
+            value,
+            organizationId: reportWithOrg.organizationId,
+            action: WatchlistAction.BLOCK,
+            description: input.description,
+            userId: user.id,
+          });
+          watchlistId = newWatchlist.id;
+        }
+
+        await bookingReportRepo.linkWatchlistToReport({
+          reportId: report.id,
+          watchlistId,
+        });
+
+        return { reportId: report.id, watchlistId, value };
+      })
+    );
+
+    return {
+      success: true,
+      message: `Successfully added ${reportsToAdd.length} report(s) to watchlist`,
+      addedCount: reportsToAdd.length,
+      skippedCount: validReports.length - reportsToAdd.length,
+      results: results.map((r) => ({ reportId: r.reportId, watchlistId: r.watchlistId })),
+    };
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("already exists")) {
+      throw new TRPCError({
+        code: "BAD_REQUEST",
+        message: "This entry already exists in the watchlist for the organization",
+      });
+    }
+    throw error;
+  }
+};
+
+export default addToWatchlistHandler;
diff --git a/packages/trpc/server/routers/viewer/admin/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/admin/addToWatchlist.schema.ts
new file mode 100644
index 00000000000000..b081ef675b99fd
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/addToWatchlist.schema.ts
@@ -0,0 +1,11 @@
+import { z } from "zod";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+export const ZAddToWatchlistInputSchema = z.object({
+  reportIds: z.array(z.string().uuid()).min(1),
+  type: z.nativeEnum(WatchlistType),
+  description: z.string().optional(),
+});
+
+export type TAddToWatchlistInputSchema = z.infer<typeof ZAddToWatchlistInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.test.ts b/packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.test.ts
new file mode 100644
index 00000000000000..01f25368b8a5bf
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.test.ts
@@ -0,0 +1,91 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+
+import { deleteBookingReportHandler } from "./deleteBookingReport.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+
+describe("deleteBookingReportHandler (Admin)", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    role: "ADMIN" as const,
+  };
+
+  const mockReportRepo = {
+    deleteReport: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
+  });
+
+  describe("successful deletion", () => {
+    it("should successfully delete report without organizationId requirement", async () => {
+      mockReportRepo.deleteReport.mockResolvedValue(undefined);
+
+      const result = await deleteBookingReportHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportId: "report-123",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
+        reportId: "report-123",
+      });
+    });
+
+    it("should call repository deleteReport with correct parameters", async () => {
+      mockReportRepo.deleteReport.mockResolvedValue(undefined);
+
+      await deleteBookingReportHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportId: "different-report-456",
+        },
+      });
+
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
+        reportId: "different-report-456",
+      });
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe("error handling", () => {
+    it("should propagate repository errors when report not found", async () => {
+      mockReportRepo.deleteReport.mockRejectedValue(new Error("Report not found"));
+
+      await expect(
+        deleteBookingReportHandler({
+          ctx: { user: mockUser },
+          input: {
+            reportId: "non-existent-report",
+          },
+        })
+      ).rejects.toThrow("Report not found");
+    });
+  });
+
+  describe("cross-organization access", () => {
+    it("should allow admin to delete reports from any organization", async () => {
+      mockReportRepo.deleteReport.mockResolvedValue(undefined);
+
+      const result = await deleteBookingReportHandler({
+        ctx: { user: mockUser },
+        input: {
+          reportId: "report-from-org-200",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
+        reportId: "report-from-org-200",
+      });
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.ts b/packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.ts
new file mode 100644
index 00000000000000..c3b7bb65323d74
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/deleteBookingReport.handler.ts
@@ -0,0 +1,24 @@
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { prisma } from "@calcom/prisma";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
+
+type DeleteBookingReportOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TDeleteBookingReportInputSchema;
+};
+
+export const deleteBookingReportHandler = async ({ input }: DeleteBookingReportOptions) => {
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+
+  await bookingReportRepo.deleteReport({
+    reportId: input.reportId,
+  });
+
+  return { success: true };
+};
+
+export default deleteBookingReportHandler;
diff --git a/packages/trpc/server/routers/viewer/admin/deleteBookingReport.schema.ts b/packages/trpc/server/routers/viewer/admin/deleteBookingReport.schema.ts
new file mode 100644
index 00000000000000..2ed43063e7e038
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/deleteBookingReport.schema.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const ZDeleteBookingReportInputSchema = z.object({
+  reportId: z.string().uuid(),
+});
+
+export type TDeleteBookingReportInputSchema = z.infer<typeof ZDeleteBookingReportInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/admin/listBookingReports.handler.test.ts b/packages/trpc/server/routers/viewer/admin/listBookingReports.handler.test.ts
new file mode 100644
index 00000000000000..6fa2ed57556caf
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/listBookingReports.handler.test.ts
@@ -0,0 +1,220 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { BookingReportReason } from "@calcom/prisma/enums";
+
+import { listBookingReportsHandler } from "./listBookingReports.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+
+describe("listBookingReportsHandler (Admin)", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    role: "ADMIN" as const,
+  };
+
+  const mockReportData = {
+    rows: [
+      {
+        id: "report-1",
+        bookingId: 1,
+        bookerEmail: "user1@example.com",
+        reportedById: 1,
+        reason: BookingReportReason.SPAM,
+        description: null,
+        cancelled: false,
+        createdAt: new Date("2025-01-01"),
+        watchlistId: null,
+        reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+        booking: {
+          id: 1,
+          startTime: new Date(),
+          endTime: new Date(),
+          title: "Test Booking",
+          uid: "uid-1",
+        },
+        watchlist: null,
+      },
+      {
+        id: "report-2",
+        bookingId: 2,
+        bookerEmail: "user2@example.com",
+        reportedById: 1,
+        reason: BookingReportReason.DONT_KNOW_PERSON,
+        description: "Unknown person",
+        cancelled: true,
+        createdAt: new Date("2025-01-02"),
+        watchlistId: "watchlist-123",
+        reporter: { id: 1, name: "Admin", email: "admin@example.com" },
+        booking: {
+          id: 2,
+          startTime: new Date(),
+          endTime: new Date(),
+          title: "Test Booking 2",
+          uid: "uid-2",
+        },
+        watchlist: {
+          id: "watchlist-123",
+          type: "EMAIL" as const,
+          value: "user2@example.com",
+          action: "REPORT" as const,
+          description: null,
+        },
+      },
+    ],
+    meta: { totalRowCount: 2 },
+  };
+
+  const mockReportRepo = {
+    findAllReportedBookings: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
+  });
+
+  describe("successful listing", () => {
+    it("should return paginated booking reports across all organizations", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
+
+      const result = await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+        },
+      });
+
+      expect(result).toEqual(mockReportData);
+      expect(result.rows).toHaveLength(2);
+      expect(result.meta.totalRowCount).toBe(2);
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        skip: 0,
+        take: 10,
+        searchTerm: undefined,
+        filters: undefined,
+      });
+    });
+
+    it("should pass search term to repository", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
+
+      await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+          searchTerm: "spam@example.com",
+        },
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        skip: 0,
+        take: 10,
+        searchTerm: "spam@example.com",
+        filters: undefined,
+      });
+    });
+
+    it("should pass filters to repository", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
+
+      const filters = {
+        reason: [BookingReportReason.SPAM, BookingReportReason.DONT_KNOW_PERSON],
+        cancelled: true,
+        hasWatchlist: false,
+      };
+
+      await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 20,
+          offset: 10,
+          filters,
+        },
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        skip: 10,
+        take: 20,
+        searchTerm: undefined,
+        filters,
+      });
+    });
+
+    it("should return rows and meta from repository", async () => {
+      const customData = {
+        rows: [mockReportData.rows[0]],
+        meta: { totalRowCount: 1 },
+      };
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(customData);
+
+      const result = await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+        },
+      });
+
+      expect(result.rows).toHaveLength(1);
+      expect(result.meta.totalRowCount).toBe(1);
+    });
+  });
+
+  describe("pagination", () => {
+    it("should correctly pass limit and offset to repository", async () => {
+      mockReportRepo.findAllReportedBookings.mockResolvedValue({
+        rows: [],
+        meta: { totalRowCount: 0 },
+      });
+
+      await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 50,
+          offset: 100,
+        },
+      });
+
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        skip: 100,
+        take: 50,
+        searchTerm: undefined,
+        filters: undefined,
+      });
+    });
+  });
+
+  describe("cross-organization access", () => {
+    it("should allow admin to access reports from all organizations", async () => {
+      const crossOrgReports = {
+        rows: [
+          { ...mockReportData.rows[0], organizationId: 100 },
+          { ...mockReportData.rows[1], organizationId: 200 },
+        ],
+        meta: { totalRowCount: 2 },
+      };
+
+      mockReportRepo.findAllReportedBookings.mockResolvedValue(crossOrgReports);
+
+      const result = await listBookingReportsHandler({
+        ctx: { user: mockUser },
+        input: {
+          limit: 10,
+          offset: 0,
+        },
+      });
+
+      expect(result.rows).toHaveLength(2);
+      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
+        skip: 0,
+        take: 10,
+        searchTerm: undefined,
+        filters: undefined,
+      });
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/admin/listBookingReports.handler.ts b/packages/trpc/server/routers/viewer/admin/listBookingReports.handler.ts
new file mode 100644
index 00000000000000..e321ccef409630
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/listBookingReports.handler.ts
@@ -0,0 +1,27 @@
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { prisma } from "@calcom/prisma";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TListBookingReportsInputSchema } from "./listBookingReports.schema";
+
+type ListBookingReportsOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TListBookingReportsInputSchema;
+};
+
+export const listBookingReportsHandler = async ({ input }: ListBookingReportsOptions) => {
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+
+  const result = await bookingReportRepo.findAllReportedBookings({
+    skip: input.offset,
+    take: input.limit,
+    searchTerm: input.searchTerm,
+    filters: input.filters,
+  });
+
+  return result;
+};
+
+export default listBookingReportsHandler;
diff --git a/packages/trpc/server/routers/viewer/admin/listBookingReports.schema.ts b/packages/trpc/server/routers/viewer/admin/listBookingReports.schema.ts
new file mode 100644
index 00000000000000..843561fc84af7d
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/listBookingReports.schema.ts
@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+import { BookingReportReason } from "@calcom/prisma/enums";
+
+export const ZListBookingReportsInputSchema = z.object({
+  limit: z.number().min(1).max(100).optional(),
+  offset: z.number().min(0).optional(),
+  searchTerm: z.string().optional(),
+  filters: z
+    .object({
+      reason: z.array(z.nativeEnum(BookingReportReason)).optional(),
+      cancelled: z.boolean().optional(),
+      hasWatchlist: z.boolean().optional(),
+      dateRange: z
+        .object({
+          from: z.coerce.date().optional(),
+          to: z.coerce.date().optional(),
+        })
+        .optional(),
+    })
+    .optional(),
+});
+
+export type TListBookingReportsInputSchema = z.infer<typeof ZListBookingReportsInputSchema>;

From 3e1ac2aab3d24e626d9f18808b3fd16eaea826c3 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 16 Oct 2025 20:41:29 +0530
Subject: [PATCH 54/54] chore: remove

---
 .../server/repository/watchlist.interface.ts  |   6 +-
 .../server/repository/watchlist.repository.ts |  19 +-
 .../admin/addToWatchlist.handler.test.ts      | 117 +------
 .../viewer/admin/addToWatchlist.handler.ts    |  19 +-
 .../routers/viewer/organizations/_router.tsx  |  17 -
 .../addToWatchlist.handler.test.ts            | 303 ------------------
 .../organizations/addToWatchlist.handler.ts   | 112 -------
 .../organizations/addToWatchlist.schema.ts    |  11 -
 .../deleteBookingReport.handler.test.ts       |  93 ------
 .../deleteBookingReport.handler.ts            |  36 ---
 .../deleteBookingReport.schema.ts             |   7 -
 .../listBookingReports.handler.test.ts        | 213 ------------
 .../listBookingReports.handler.ts             |  40 ---
 .../listBookingReports.schema.ts              |  24 --
 14 files changed, 40 insertions(+), 977 deletions(-)
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
 delete mode 100644 packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts

diff --git a/packages/lib/server/repository/watchlist.interface.ts b/packages/lib/server/repository/watchlist.interface.ts
index ee95d5d79ce8e2..8a006835151982 100644
--- a/packages/lib/server/repository/watchlist.interface.ts
+++ b/packages/lib/server/repository/watchlist.interface.ts
@@ -28,16 +28,18 @@ export interface WatchlistAuditEntry {
 export interface CreateWatchlistInput {
   type: WatchlistType;
   value: string;
-  organizationId: number;
+  organizationId?: number | null;
   action: WatchlistAction;
   description?: string;
   userId: number;
+  isGlobal?: boolean;
 }
 
 export interface CheckWatchlistInput {
   type: WatchlistType;
   value: string;
-  organizationId: number;
+  organizationId?: number | null;
+  isGlobal?: boolean;
 }
 
 export interface FindAllEntriesInput {
diff --git a/packages/lib/server/repository/watchlist.repository.ts b/packages/lib/server/repository/watchlist.repository.ts
index e648be6efed8c5..dcd008788f8a52 100644
--- a/packages/lib/server/repository/watchlist.repository.ts
+++ b/packages/lib/server/repository/watchlist.repository.ts
@@ -18,6 +18,7 @@ export class WatchlistRepository implements IWatchlistRepository {
       type: params.type,
       value: params.value,
       organizationId: params.organizationId,
+      isGlobal: params.isGlobal,
     });
 
     if (existing) {
@@ -29,11 +30,11 @@ export class WatchlistRepository implements IWatchlistRepository {
         data: {
           type: params.type,
           value: params.value,
-          organizationId: params.organizationId,
+          organizationId: params.organizationId ?? null,
           action: params.action,
           description: params.description,
           source: WatchlistSource.MANUAL,
-          isGlobal: false,
+          isGlobal: params.isGlobal ?? false,
         },
       });
 
@@ -55,12 +56,24 @@ export class WatchlistRepository implements IWatchlistRepository {
   }
 
   async checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null> {
+    if (params.isGlobal) {
+      const entry = await this.prismaClient.watchlist.findFirst({
+        where: {
+          type: params.type,
+          value: params.value,
+          isGlobal: true,
+          organizationId: null,
+        },
+      });
+      return entry;
+    }
+
     const entry = await this.prismaClient.watchlist.findUnique({
       where: {
         type_value_organizationId: {
           type: params.type,
           value: params.value,
-          organizationId: params.organizationId,
+          organizationId: params.organizationId ?? null,
         },
       },
     });
diff --git a/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts
index 2335b47eb833c2..5f0767636f322d 100644
--- a/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.test.ts
@@ -118,23 +118,6 @@ describe("addToWatchlistHandler (Admin)", () => {
       });
     });
 
-    it("should throw BAD_REQUEST when report has no organizationId", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: null } as any);
-
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportIds: ["report-1"],
-            type: WatchlistType.EMAIL,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: expect.stringContaining("does not have an associated organization"),
-      });
-    });
   });
 
   describe("duplicate prevention", () => {
@@ -158,9 +141,8 @@ describe("addToWatchlistHandler (Admin)", () => {
   });
 
   describe("successful addition", () => {
-    it("should create new watchlist entry for EMAIL type and link report", async () => {
+    it("should create new global watchlist entry for EMAIL type and link report", async () => {
       mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
       mockWatchlistRepo.checkExists.mockResolvedValue(null);
       mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-new" });
       mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
@@ -176,13 +158,19 @@ describe("addToWatchlistHandler (Admin)", () => {
 
       expect(result.success).toBe(true);
       expect(result.addedCount).toBe(1);
+      expect(mockWatchlistRepo.checkExists).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spammer@example.com",
+        isGlobal: true,
+      });
       expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
         type: WatchlistType.EMAIL,
         value: "spammer@example.com",
-        organizationId: 100,
+        organizationId: null,
         action: WatchlistAction.BLOCK,
         description: "Spam user",
         userId: 1,
+        isGlobal: true,
       });
       expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
         reportId: "report-1",
@@ -190,9 +178,8 @@ describe("addToWatchlistHandler (Admin)", () => {
       });
     });
 
-    it("should create new watchlist entry for DOMAIN type and link report", async () => {
+    it("should create new global watchlist entry for DOMAIN type and link report", async () => {
       mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
       mockWatchlistRepo.checkExists.mockResolvedValue(null);
       mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-domain" });
       mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
@@ -209,17 +196,17 @@ describe("addToWatchlistHandler (Admin)", () => {
       expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
         type: WatchlistType.DOMAIN,
         value: "example.com",
-        organizationId: 100,
+        organizationId: null,
         action: WatchlistAction.BLOCK,
         description: undefined,
         userId: 1,
+        isGlobal: true,
       });
     });
 
-    it("should reuse existing watchlist entry when value already exists", async () => {
+    it("should reuse existing global watchlist entry when value already exists", async () => {
       mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
-      mockWatchlistRepo.checkExists.mockResolvedValue({ id: "existing-watchlist" });
+      mockWatchlistRepo.checkExists.mockResolvedValue({ id: "existing-watchlist" } as any);
       mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
 
       const result = await addToWatchlistHandler({
@@ -240,13 +227,10 @@ describe("addToWatchlistHandler (Admin)", () => {
 
     it("should process multiple reports in batch", async () => {
       mockReportRepo.findReportsByIds.mockResolvedValue(mockReports);
-      vi.mocked(prisma.bookingReport.findUnique)
-        .mockResolvedValueOnce({ organizationId: 100 } as any)
-        .mockResolvedValueOnce({ organizationId: 100 } as any);
       mockWatchlistRepo.checkExists.mockResolvedValue(null);
       mockWatchlistRepo.createEntry
-        .mockResolvedValueOnce({ id: "watchlist-1" })
-        .mockResolvedValueOnce({ id: "watchlist-2" });
+        .mockResolvedValueOnce({ id: "watchlist-1" } as any)
+        .mockResolvedValueOnce({ id: "watchlist-2" } as any);
       mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
 
       const result = await addToWatchlistHandler({
@@ -267,9 +251,8 @@ describe("addToWatchlistHandler (Admin)", () => {
     it("should return correct counts when processing multiple reports", async () => {
       const mixedReports = [mockReports[0], { ...mockReports[1], watchlistId: "already-added" }];
       mockReportRepo.findReportsByIds.mockResolvedValue(mixedReports);
-      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
       mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "new-watchlist" });
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "new-watchlist" } as any);
       mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
 
       const result = await addToWatchlistHandler({
@@ -286,72 +269,4 @@ describe("addToWatchlistHandler (Admin)", () => {
     });
   });
 
-  describe("cross-organization support", () => {
-    it("should handle reports from different organizations", async () => {
-      const crossOrgReports = [
-        { ...mockReports[0], id: "report-org-100" },
-        { ...mockReports[1], id: "report-org-200" },
-      ];
-      mockReportRepo.findReportsByIds.mockResolvedValue(crossOrgReports);
-      vi.mocked(prisma.bookingReport.findUnique)
-        .mockResolvedValueOnce({ organizationId: 100 } as any)
-        .mockResolvedValueOnce({ organizationId: 200 } as any);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry
-        .mockResolvedValueOnce({ id: "watchlist-org-100" })
-        .mockResolvedValueOnce({ id: "watchlist-org-200" });
-      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
-
-      const result = await addToWatchlistHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportIds: ["report-org-100", "report-org-200"],
-          type: WatchlistType.EMAIL,
-        },
-      });
-
-      expect(result.success).toBe(true);
-      expect(result.addedCount).toBe(2);
-      expect(mockWatchlistRepo.createEntry).toHaveBeenNthCalledWith(1, {
-        type: WatchlistType.EMAIL,
-        value: "spammer@example.com",
-        organizationId: 100,
-        action: WatchlistAction.BLOCK,
-        description: undefined,
-        userId: 1,
-      });
-      expect(mockWatchlistRepo.createEntry).toHaveBeenNthCalledWith(2, {
-        type: WatchlistType.EMAIL,
-        value: "user@spammer.com",
-        organizationId: 200,
-        action: WatchlistAction.BLOCK,
-        description: undefined,
-        userId: 1,
-      });
-    });
-  });
-
-  describe("error handling", () => {
-    it("should handle already exists errors gracefully", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      vi.mocked(prisma.bookingReport.findUnique).mockResolvedValue({ organizationId: 100 } as any);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry.mockRejectedValue(
-        new Error("Watchlist entry already exists for this value")
-      );
-
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportIds: ["report-1"],
-            type: WatchlistType.EMAIL,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: "This entry already exists in the watchlist for the organization",
-      });
-    });
-  });
 });
diff --git a/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts
index 9a2d975a0ee4a3..b67cf842669e14 100644
--- a/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts
+++ b/packages/trpc/server/routers/viewer/admin/addToWatchlist.handler.ts
@@ -45,18 +45,6 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
   try {
     const results = await Promise.all(
       reportsToAdd.map(async (report) => {
-        const reportWithOrg = await prisma.bookingReport.findUnique({
-          where: { id: report.id },
-          select: { organizationId: true },
-        });
-
-        if (!reportWithOrg?.organizationId) {
-          throw new TRPCError({
-            code: "BAD_REQUEST",
-            message: `Report ${report.id} does not have an associated organization`,
-          });
-        }
-
         const value =
           input.type === "EMAIL"
             ? report.bookerEmail
@@ -65,7 +53,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
         const existingWatchlist = await watchlistRepo.checkExists({
           type: input.type,
           value,
-          organizationId: reportWithOrg.organizationId,
+          isGlobal: true,
         });
 
         let watchlistId: string;
@@ -76,10 +64,11 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
           const newWatchlist = await watchlistRepo.createEntry({
             type: input.type,
             value,
-            organizationId: reportWithOrg.organizationId,
+            organizationId: null,
             action: WatchlistAction.BLOCK,
             description: input.description,
             userId: user.id,
+            isGlobal: true,
           });
           watchlistId = newWatchlist.id;
         }
@@ -104,7 +93,7 @@ export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOption
     if (error instanceof Error && error.message.includes("already exists")) {
       throw new TRPCError({
         code: "BAD_REQUEST",
-        message: "This entry already exists in the watchlist for the organization",
+        message: "This entry already exists in the global watchlist",
       });
     }
     throw error;
diff --git a/packages/trpc/server/routers/viewer/organizations/_router.tsx b/packages/trpc/server/routers/viewer/organizations/_router.tsx
index c8f16cba615576..04d720e2db7392 100644
--- a/packages/trpc/server/routers/viewer/organizations/_router.tsx
+++ b/packages/trpc/server/routers/viewer/organizations/_router.tsx
@@ -9,7 +9,6 @@ import { router } from "../../../trpc";
 import { eventOwnerProcedure } from "../eventTypes/util";
 import { ZAddMembersToEventTypes } from "./addMembersToEventTypes.schema";
 import { ZAddMembersToTeams } from "./addMembersToTeams.schema";
-import { ZAddToWatchlistInputSchema } from "./addToWatchlist.schema";
 import { ZAdminDeleteInput } from "./adminDelete.schema";
 import { ZAdminGet } from "./adminGet.schema";
 import { ZAdminUpdate } from "./adminUpdate.schema";
@@ -20,7 +19,6 @@ import { ZCreateSelfHostedInputSchema } from "./createSelfHosted.schema";
 import { ZCreateTeamsSchema } from "./createTeams.schema";
 import { ZCreateWatchlistEntryInputSchema } from "./createWatchlistEntry.schema";
 import { ZCreateWithPaymentIntentInputSchema } from "./createWithPaymentIntent.schema";
-import { ZDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
 import { ZDeleteTeamInputSchema } from "./deleteTeam.schema";
 import { ZDeleteWatchlistEntryInputSchema } from "./deleteWatchlistEntry.schema";
 import { ZGetMembersInput } from "./getMembers.schema";
@@ -28,7 +26,6 @@ import { ZGetOtherTeamInputSchema } from "./getOtherTeam.handler";
 import { ZGetUserInput } from "./getUser.schema";
 import { ZGetWatchlistEntryDetailsInputSchema } from "./getWatchlistEntryDetails.schema";
 import { ZIntentToCreateOrgInputSchema } from "./intentToCreateOrg.schema";
-import { ZListBookingReportsInputSchema } from "./listBookingReports.schema";
 import { ZListMembersInputSchema } from "./listMembers.schema";
 import { ZListOtherTeamMembersSchema } from "./listOtherTeamMembers.handler";
 import { ZListWatchlistEntriesInputSchema } from "./listWatchlistEntries.schema";
@@ -170,14 +167,6 @@ export const viewerOrganizationsRouter = router({
     const { default: handler } = await import("./createSelfHosted.handler");
     return handler(opts);
   }),
-  listBookingReports: authedOrgAdminProcedure.input(ZListBookingReportsInputSchema).query(async (opts) => {
-    const { default: handler } = await import("./listBookingReports.handler");
-    return handler(opts);
-  }),
-  addToWatchlist: authedOrgAdminProcedure.input(ZAddToWatchlistInputSchema).mutation(async (opts) => {
-    const { default: handler } = await import("./addToWatchlist.handler");
-    return handler(opts);
-  }),
   listWatchlistEntries: authedOrgAdminProcedure
     .input(ZListWatchlistEntriesInputSchema)
     .query(async (opts) => {
@@ -202,10 +191,4 @@ export const viewerOrganizationsRouter = router({
       const { default: handler } = await import("./getWatchlistEntryDetails.handler");
       return handler(opts);
     }),
-  deleteBookingReport: authedOrgAdminProcedure
-    .input(ZDeleteBookingReportInputSchema)
-    .mutation(async (opts) => {
-      const { default: handler } = await import("./deleteBookingReport.handler");
-      return handler(opts);
-    }),
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
deleted file mode 100644
index 80ea1e2536f5b5..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.test.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
-import { WatchlistType, WatchlistAction, BookingReportReason } from "@calcom/prisma/enums";
-
-import { addToWatchlistHandler } from "./addToWatchlist.handler";
-
-vi.mock("@calcom/lib/server/repository/bookingReport");
-vi.mock("@calcom/lib/server/repository/watchlist.repository");
-
-describe("addToWatchlistHandler", () => {
-  const mockUser = {
-    id: 1,
-    email: "admin@example.com",
-    organizationId: 100,
-  };
-
-  const mockReports = [
-    {
-      id: "report-1",
-      bookingId: 1,
-      bookerEmail: "spammer@example.com",
-      reportedById: 1,
-      reason: BookingReportReason.SPAM,
-      description: null,
-      cancelled: false,
-      createdAt: new Date(),
-      watchlistId: null,
-      reporter: { id: 1, name: "Admin", email: "admin@example.com" },
-      booking: {
-        id: 1,
-        startTime: new Date(),
-        endTime: new Date(),
-        title: "Test Booking",
-        uid: "booking-uid-1",
-      },
-      watchlist: null,
-    },
-    {
-      id: "report-2",
-      bookingId: 2,
-      bookerEmail: "user@spammer.com",
-      reportedById: 1,
-      reason: BookingReportReason.SPAM,
-      description: null,
-      cancelled: false,
-      createdAt: new Date(),
-      watchlistId: null,
-      reporter: { id: 1, name: "Admin", email: "admin@example.com" },
-      booking: {
-        id: 2,
-        startTime: new Date(),
-        endTime: new Date(),
-        title: "Test Booking 2",
-        uid: "booking-uid-2",
-      },
-      watchlist: null,
-    },
-  ];
-
-  const mockReportRepo = {
-    findReportsByIds: vi.fn(),
-    linkWatchlistToReport: vi.fn(),
-  };
-
-  const mockWatchlistRepo = {
-    checkExists: vi.fn(),
-    createEntry: vi.fn(),
-  };
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
-    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
-  });
-
-  describe("access control", () => {
-    it("should throw FORBIDDEN when user is not part of an organization", async () => {
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: { ...mockUser, organizationId: undefined } },
-          input: {
-            reportIds: ["report-1"],
-            type: WatchlistType.EMAIL,
-            action: WatchlistAction.REPORT,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "FORBIDDEN",
-        message: "You must be part of an organization to manage watchlist",
-      });
-    });
-
-    it("should throw NOT_FOUND when report IDs don't exist or belong to different organization", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([]);
-
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportIds: ["report-1", "report-2"],
-            type: WatchlistType.EMAIL,
-            action: WatchlistAction.REPORT,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "NOT_FOUND",
-        message: expect.stringContaining("Booking report(s) not found"),
-      });
-    });
-
-    it("should throw NOT_FOUND with specific missing IDs", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportIds: ["report-1", "report-2", "report-3"],
-            type: WatchlistType.EMAIL,
-            action: WatchlistAction.REPORT,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "NOT_FOUND",
-        message: expect.stringContaining("report-2, report-3"),
-      });
-    });
-  });
-
-  describe("duplicate prevention", () => {
-    it("should throw BAD_REQUEST when all reports are already in watchlist", async () => {
-      const reportsInWatchlist = mockReports.map((r) => ({ ...r, watchlistId: "watchlist-123" }));
-      mockReportRepo.findReportsByIds.mockResolvedValue(reportsInWatchlist);
-
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportIds: ["report-1", "report-2"],
-            type: WatchlistType.EMAIL,
-            action: WatchlistAction.REPORT,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: "All selected bookers are already in the watchlist",
-      });
-    });
-  });
-
-  describe("successful addition", () => {
-    it("should create new watchlist entry for EMAIL type and link report", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-new" });
-      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
-
-      const result = await addToWatchlistHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportIds: ["report-1"],
-          type: WatchlistType.EMAIL,
-          action: WatchlistAction.BLOCK,
-          description: "Spam user",
-        },
-      });
-
-      expect(result.success).toBe(true);
-      expect(result.addedCount).toBe(1);
-      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
-        type: WatchlistType.EMAIL,
-        value: "spammer@example.com",
-        organizationId: 100,
-        action: WatchlistAction.BLOCK,
-        description: "Spam user",
-        userId: 1,
-      });
-      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
-        reportId: "report-1",
-        watchlistId: "watchlist-new",
-      });
-    });
-
-    it("should create new watchlist entry for DOMAIN type and link report", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-domain" });
-      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
-
-      const result = await addToWatchlistHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportIds: ["report-1"],
-          type: WatchlistType.DOMAIN,
-          action: WatchlistAction.BLOCK,
-        },
-      });
-
-      expect(result.success).toBe(true);
-      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
-        type: WatchlistType.DOMAIN,
-        value: "example.com",
-        organizationId: 100,
-        action: WatchlistAction.BLOCK,
-        description: undefined,
-        userId: 1,
-      });
-    });
-
-    it("should reuse existing watchlist entry when value already exists", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      mockWatchlistRepo.checkExists.mockResolvedValue({ id: "existing-watchlist" });
-      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
-
-      const result = await addToWatchlistHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportIds: ["report-1"],
-          type: WatchlistType.EMAIL,
-          action: WatchlistAction.REPORT,
-        },
-      });
-
-      expect(result.success).toBe(true);
-      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
-      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledWith({
-        reportId: "report-1",
-        watchlistId: "existing-watchlist",
-      });
-    });
-
-    it("should process multiple reports in batch", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue(mockReports);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry
-        .mockResolvedValueOnce({ id: "watchlist-1" })
-        .mockResolvedValueOnce({ id: "watchlist-2" });
-      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
-
-      const result = await addToWatchlistHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportIds: ["report-1", "report-2"],
-          type: WatchlistType.EMAIL,
-          action: WatchlistAction.BLOCK,
-        },
-      });
-
-      expect(result.success).toBe(true);
-      expect(result.addedCount).toBe(2);
-      expect(result.results).toHaveLength(2);
-      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledTimes(2);
-      expect(mockReportRepo.linkWatchlistToReport).toHaveBeenCalledTimes(2);
-    });
-
-    it("should return correct counts when processing multiple reports", async () => {
-      const mixedReports = [mockReports[0], { ...mockReports[1], watchlistId: "already-added" }];
-      mockReportRepo.findReportsByIds.mockResolvedValue(mixedReports);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "new-watchlist" });
-      mockReportRepo.linkWatchlistToReport.mockResolvedValue(undefined);
-
-      const result = await addToWatchlistHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportIds: ["report-1", "report-2"],
-          type: WatchlistType.EMAIL,
-          action: WatchlistAction.REPORT,
-        },
-      });
-
-      expect(result.addedCount).toBe(1);
-      expect(result.skippedCount).toBe(1);
-      expect(result.message).toBe("Successfully added 1 report(s) to watchlist");
-    });
-  });
-
-  describe("error handling", () => {
-    it("should handle already exists errors gracefully", async () => {
-      mockReportRepo.findReportsByIds.mockResolvedValue([mockReports[0]]);
-      mockWatchlistRepo.checkExists.mockResolvedValue(null);
-      mockWatchlistRepo.createEntry.mockRejectedValue(
-        new Error("Watchlist entry already exists for this value")
-      );
-
-      await expect(
-        addToWatchlistHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportIds: ["report-1"],
-            type: WatchlistType.EMAIL,
-            action: WatchlistAction.REPORT,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "BAD_REQUEST",
-        message: "This entry already exists in the watchlist for your organization",
-      });
-    });
-  });
-});
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
deleted file mode 100644
index 74f775743bd08f..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.handler.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
-import { prisma } from "@calcom/prisma";
-import { WatchlistAction } from "@calcom/prisma/enums";
-
-import { TRPCError } from "@trpc/server";
-
-import type { TrpcSessionUser } from "../../../types";
-import type { TAddToWatchlistInputSchema } from "./addToWatchlist.schema";
-
-type AddToWatchlistOptions = {
-  ctx: {
-    user: NonNullable<TrpcSessionUser>;
-  };
-  input: TAddToWatchlistInputSchema;
-};
-
-export const addToWatchlistHandler = async ({ ctx, input }: AddToWatchlistOptions) => {
-  const { user } = ctx;
-
-  const organizationId = user.profile?.organizationId || user.organizationId;
-  if (!organizationId) {
-    throw new TRPCError({
-      code: "FORBIDDEN",
-      message: "You must be part of an organization to manage watchlist",
-    });
-  }
-
-  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
-  const watchlistRepo = new WatchlistRepository(prisma);
-
-  const validReports = await bookingReportRepo.findReportsByIds({
-    reportIds: input.reportIds,
-    organizationId,
-  });
-
-  if (validReports.length !== input.reportIds.length) {
-    const foundIds = validReports.map((r) => r.id);
-    const missingIds = input.reportIds.filter((id) => !foundIds.includes(id));
-    throw new TRPCError({
-      code: "NOT_FOUND",
-      message: `Booking report(s) not found or do not belong to your organization: ${missingIds.join(", ")}`,
-    });
-  }
-
-  const reportsToAdd = validReports.filter((report) => !report.watchlistId);
-
-  if (reportsToAdd.length === 0) {
-    throw new TRPCError({
-      code: "BAD_REQUEST",
-      message: "All selected bookers are already in the watchlist",
-    });
-  }
-
-  try {
-    const results = await Promise.all(
-      reportsToAdd.map(async (report) => {
-        const value =
-          input.type === "EMAIL"
-            ? report.bookerEmail
-            : report.bookerEmail.split("@")[1] || report.bookerEmail;
-
-        const existingWatchlist = await watchlistRepo.checkExists({
-          type: input.type,
-          value,
-          organizationId,
-        });
-
-        let watchlistId: string;
-
-        if (existingWatchlist) {
-          watchlistId = existingWatchlist.id;
-        } else {
-          const newWatchlist = await watchlistRepo.createEntry({
-            type: input.type,
-            value,
-            organizationId,
-            action: WatchlistAction.BLOCK,
-            description: input.description,
-            userId: user.id,
-          });
-          watchlistId = newWatchlist.id;
-        }
-
-        await bookingReportRepo.linkWatchlistToReport({
-          reportId: report.id,
-          watchlistId,
-        });
-
-        return { reportId: report.id, watchlistId, value };
-      })
-    );
-
-    return {
-      success: true,
-      message: `Successfully added ${reportsToAdd.length} report(s) to watchlist`,
-      addedCount: reportsToAdd.length,
-      skippedCount: validReports.length - reportsToAdd.length,
-      results: results.map((r) => ({ reportId: r.reportId, watchlistId: r.watchlistId })),
-    };
-  } catch (error) {
-    if (error instanceof Error && error.message.includes("already exists")) {
-      throw new TRPCError({
-        code: "BAD_REQUEST",
-        message: "This entry already exists in the watchlist for your organization",
-      });
-    }
-    throw error;
-  }
-};
-
-export default addToWatchlistHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts b/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
deleted file mode 100644
index b081ef675b99fd..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/addToWatchlist.schema.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { z } from "zod";
-
-import { WatchlistType } from "@calcom/prisma/enums";
-
-export const ZAddToWatchlistInputSchema = z.object({
-  reportIds: z.array(z.string().uuid()).min(1),
-  type: z.nativeEnum(WatchlistType),
-  description: z.string().optional(),
-});
-
-export type TAddToWatchlistInputSchema = z.infer<typeof ZAddToWatchlistInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts
deleted file mode 100644
index 8b21d6958e6ee9..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-
-import { deleteBookingReportHandler } from "./deleteBookingReport.handler";
-
-vi.mock("@calcom/lib/server/repository/bookingReport");
-
-describe("deleteBookingReportHandler", () => {
-  const mockUser = {
-    id: 1,
-    email: "admin@example.com",
-    organizationId: 100,
-  };
-
-  const mockReportRepo = {
-    deleteReport: vi.fn(),
-  };
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
-  });
-
-  describe("access control", () => {
-    it("should throw UNAUTHORIZED when user is not part of an organization", async () => {
-      await expect(
-        deleteBookingReportHandler({
-          ctx: { user: { ...mockUser, organizationId: undefined } },
-          input: {
-            reportId: "report-123",
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "UNAUTHORIZED",
-        message: "User must be part of an organization",
-      });
-
-      expect(mockReportRepo.deleteReport).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("successful deletion", () => {
-    it("should successfully delete report when user has organizationId", async () => {
-      mockReportRepo.deleteReport.mockResolvedValue(undefined);
-
-      const result = await deleteBookingReportHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportId: "report-123",
-        },
-      });
-
-      expect(result.success).toBe(true);
-      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
-        reportId: "report-123",
-        organizationId: 100,
-      });
-    });
-
-    it("should call repository deleteReport with correct parameters", async () => {
-      mockReportRepo.deleteReport.mockResolvedValue(undefined);
-
-      await deleteBookingReportHandler({
-        ctx: { user: mockUser },
-        input: {
-          reportId: "different-report-456",
-        },
-      });
-
-      expect(mockReportRepo.deleteReport).toHaveBeenCalledWith({
-        reportId: "different-report-456",
-        organizationId: 100,
-      });
-      expect(mockReportRepo.deleteReport).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("error handling", () => {
-    it("should propagate repository errors when report not found", async () => {
-      mockReportRepo.deleteReport.mockRejectedValue(new Error("Report not found"));
-
-      await expect(
-        deleteBookingReportHandler({
-          ctx: { user: mockUser },
-          input: {
-            reportId: "non-existent-report",
-          },
-        })
-      ).rejects.toThrow("Report not found");
-    });
-  });
-});
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts
deleted file mode 100644
index a8d3a90d5457fb..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.handler.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { prisma } from "@calcom/prisma";
-
-import { TRPCError } from "@trpc/server";
-
-import type { TrpcSessionUser } from "../../../types";
-import type { TDeleteBookingReportInputSchema } from "./deleteBookingReport.schema";
-
-type DeleteBookingReportOptions = {
-  ctx: {
-    user: NonNullable<TrpcSessionUser>;
-  };
-  input: TDeleteBookingReportInputSchema;
-};
-
-export const deleteBookingReportHandler = async ({ ctx, input }: DeleteBookingReportOptions) => {
-  const { user } = ctx;
-
-  if (!user.organizationId) {
-    throw new TRPCError({
-      code: "UNAUTHORIZED",
-      message: "User must be part of an organization",
-    });
-  }
-
-  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
-
-  await bookingReportRepo.deleteReport({
-    reportId: input.reportId,
-    organizationId: user.organizationId,
-  });
-
-  return { success: true };
-};
-
-export default deleteBookingReportHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts b/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts
deleted file mode 100644
index 2ed43063e7e038..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/deleteBookingReport.schema.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { z } from "zod";
-
-export const ZDeleteBookingReportInputSchema = z.object({
-  reportId: z.string().uuid(),
-});
-
-export type TDeleteBookingReportInputSchema = z.infer<typeof ZDeleteBookingReportInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
deleted file mode 100644
index 82b751ee7f4c48..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.test.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { BookingReportReason } from "@calcom/prisma/enums";
-
-import { listBookingReportsHandler } from "./listBookingReports.handler";
-
-vi.mock("@calcom/lib/server/repository/bookingReport");
-
-describe("listBookingReportsHandler", () => {
-  const mockUser = {
-    id: 1,
-    email: "admin@example.com",
-    organizationId: 100,
-  };
-
-  const mockReportData = {
-    rows: [
-      {
-        id: "report-1",
-        bookingId: 1,
-        bookerEmail: "user1@example.com",
-        reportedById: 1,
-        reason: BookingReportReason.SPAM,
-        description: null,
-        cancelled: false,
-        createdAt: new Date("2025-01-01"),
-        watchlistId: null,
-        reporter: { id: 1, name: "Admin", email: "admin@example.com" },
-        booking: {
-          id: 1,
-          startTime: new Date(),
-          endTime: new Date(),
-          title: "Test Booking",
-          uid: "uid-1",
-        },
-        watchlist: null,
-      },
-      {
-        id: "report-2",
-        bookingId: 2,
-        bookerEmail: "user2@example.com",
-        reportedById: 1,
-        reason: BookingReportReason.DONT_KNOW_PERSON,
-        description: "Unknown person",
-        cancelled: true,
-        createdAt: new Date("2025-01-02"),
-        watchlistId: "watchlist-123",
-        reporter: { id: 1, name: "Admin", email: "admin@example.com" },
-        booking: {
-          id: 2,
-          startTime: new Date(),
-          endTime: new Date(),
-          title: "Test Booking 2",
-          uid: "uid-2",
-        },
-        watchlist: {
-          id: "watchlist-123",
-          type: "EMAIL" as const,
-          value: "user2@example.com",
-          action: "REPORT" as const,
-          description: null,
-        },
-      },
-    ],
-    meta: { totalRowCount: 2 },
-  };
-
-  const mockReportRepo = {
-    findAllReportedBookings: vi.fn(),
-  };
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo as any);
-  });
-
-  describe("access control", () => {
-    it("should throw FORBIDDEN when user is not part of an organization", async () => {
-      await expect(
-        listBookingReportsHandler({
-          ctx: { user: { ...mockUser, organizationId: undefined } },
-          input: {
-            limit: 10,
-            offset: 0,
-          },
-        })
-      ).rejects.toMatchObject({
-        code: "FORBIDDEN",
-        message: "You must be part of an organization to view booking reports",
-      });
-
-      expect(mockReportRepo.findAllReportedBookings).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("successful listing", () => {
-    it("should return paginated booking reports with correct parameters", async () => {
-      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
-
-      const result = await listBookingReportsHandler({
-        ctx: { user: mockUser },
-        input: {
-          limit: 10,
-          offset: 0,
-        },
-      });
-
-      expect(result).toEqual(mockReportData);
-      expect(result.rows).toHaveLength(2);
-      expect(result.meta.totalRowCount).toBe(2);
-      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
-        organizationId: 100,
-        skip: 0,
-        take: 10,
-        searchTerm: undefined,
-        filters: undefined,
-      });
-    });
-
-    it("should pass search term to repository", async () => {
-      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
-
-      await listBookingReportsHandler({
-        ctx: { user: mockUser },
-        input: {
-          limit: 10,
-          offset: 0,
-          searchTerm: "spam@example.com",
-        },
-      });
-
-      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
-        organizationId: 100,
-        skip: 0,
-        take: 10,
-        searchTerm: "spam@example.com",
-        filters: undefined,
-      });
-    });
-
-    it("should pass filters to repository", async () => {
-      mockReportRepo.findAllReportedBookings.mockResolvedValue(mockReportData);
-
-      const filters = {
-        reason: [BookingReportReason.SPAM, BookingReportReason.DONT_KNOW_PERSON],
-        cancelled: true,
-        hasWatchlist: false,
-      };
-
-      await listBookingReportsHandler({
-        ctx: { user: mockUser },
-        input: {
-          limit: 20,
-          offset: 10,
-          filters,
-        },
-      });
-
-      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
-        organizationId: 100,
-        skip: 10,
-        take: 20,
-        searchTerm: undefined,
-        filters,
-      });
-    });
-
-    it("should return rows and meta from repository", async () => {
-      const customData = {
-        rows: [mockReportData.rows[0]],
-        meta: { totalRowCount: 1 },
-      };
-      mockReportRepo.findAllReportedBookings.mockResolvedValue(customData);
-
-      const result = await listBookingReportsHandler({
-        ctx: { user: mockUser },
-        input: {
-          limit: 10,
-          offset: 0,
-        },
-      });
-
-      expect(result.rows).toHaveLength(1);
-      expect(result.meta.totalRowCount).toBe(1);
-    });
-  });
-
-  describe("pagination", () => {
-    it("should correctly pass limit and offset to repository", async () => {
-      mockReportRepo.findAllReportedBookings.mockResolvedValue({
-        rows: [],
-        meta: { totalRowCount: 0 },
-      });
-
-      await listBookingReportsHandler({
-        ctx: { user: mockUser },
-        input: {
-          limit: 50,
-          offset: 100,
-        },
-      });
-
-      expect(mockReportRepo.findAllReportedBookings).toHaveBeenCalledWith({
-        organizationId: 100,
-        skip: 100,
-        take: 50,
-        searchTerm: undefined,
-        filters: undefined,
-      });
-    });
-  });
-});
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
deleted file mode 100644
index 7e83ae31597d5f..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.handler.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
-import { prisma } from "@calcom/prisma";
-
-import { TRPCError } from "@trpc/server";
-import type { TrpcSessionUser } from "../../../types";
-
-import type { TListBookingReportsInputSchema } from "./listBookingReports.schema";
-
-type ListBookingReportsOptions = {
-  ctx: {
-    user: NonNullable<TrpcSessionUser>;
-  };
-  input: TListBookingReportsInputSchema;
-};
-
-export const listBookingReportsHandler = async ({ ctx, input }: ListBookingReportsOptions) => {
-  const { user } = ctx;
-
-  const organizationId = user.organizationId;
-  if (!organizationId) {
-    throw new TRPCError({
-      code: "FORBIDDEN",
-      message: "You must be part of an organization to view booking reports",
-    });
-  }
-
-  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
-
-  const result = await bookingReportRepo.findAllReportedBookings({
-    organizationId,
-    skip: input.offset,
-    take: input.limit,
-    searchTerm: input.searchTerm,
-    filters: input.filters,
-  });
-
-  return result;
-};
-
-export default listBookingReportsHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts b/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
deleted file mode 100644
index 843561fc84af7d..00000000000000
--- a/packages/trpc/server/routers/viewer/organizations/listBookingReports.schema.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { z } from "zod";
-
-import { BookingReportReason } from "@calcom/prisma/enums";
-
-export const ZListBookingReportsInputSchema = z.object({
-  limit: z.number().min(1).max(100).optional(),
-  offset: z.number().min(0).optional(),
-  searchTerm: z.string().optional(),
-  filters: z
-    .object({
-      reason: z.array(z.nativeEnum(BookingReportReason)).optional(),
-      cancelled: z.boolean().optional(),
-      hasWatchlist: z.boolean().optional(),
-      dateRange: z
-        .object({
-          from: z.coerce.date().optional(),
-          to: z.coerce.date().optional(),
-        })
-        .optional(),
-    })
-    .optional(),
-});
-
-export type TListBookingReportsInputSchema = z.infer<typeof ZListBookingReportsInputSchema>;