feat: [Booking Audit Stack - 3] Integrate Booking Audit Action services

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts

@@ -275,6 +275,7 @@ export class BookingsController_2024_04_15 {
           platformCancelUrl: bookingRequest.platformCancelUrl,
           platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
           platformBookingUrl: bookingRequest.platformBookingUrl,
+          actionSource: "API_V2" as const,
         });
         if (!res.onlyRemovedAttendee) {
           void (await this.billingService.cancelUsageByBookingUid(res.bookingUid));
@@ -311,6 +312,7 @@ export class BookingsController_2024_04_15 {
         noShowHost: body.noShowHost,
         userId: user.id,
         userUuid: user.uuid,
+        actionSource: "API_V2" as const,
       });
 
       return { status: SUCCESS_STATUS, data: markNoShowResponse };

apps/api/v2/src/ee/bookings/2024-08-13/services/booking-guests.service.ts

@@ -15,7 +15,7 @@ export class BookingGuestsService_2024_08_13 {
     private readonly bookingsRepository: BookingsRepository_2024_08_13,
     private readonly bookingsService: BookingsService_2024_08_13,
     private readonly platformBookingsService: PlatformBookingsService
-  ) {}
+  ) { }
 
   async addGuests(bookingUid: string, input: AddGuestsInput_2024_08_13, user: ApiAuthGuardUser) {
     const booking = await this.bookingsRepository.getByUidWithAttendeesAndUserAndEvent(bookingUid);
@@ -33,6 +33,7 @@ export class BookingGuestsService_2024_08_13 {
       ctx: { user },
       input: { bookingId: booking.id, guests: input.guests },
       emailsEnabled,
+      actionSource: "API_V2",
     });
     if (res.message === "Guests added") {
       return await this.bookingsService.getBooking(bookingUid, user);

apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts

@@ -114,8 +114,9 @@ export class BookingsService_2024_08_13 {
     private readonly regularBookingService: RegularBookingService,
     private readonly recurringBookingService: RecurringBookingService,
     private readonly instantBookingCreateService: InstantBookingCreateService,
-    private readonly eventTypeAccessService: EventTypeAccessService
-  ) {}
+    private readonly eventTypeAccessService: EventTypeAccessService,
+    private readonly auditActorRepository: PrismaAuditActorRepository
+  ) { }
 
   async createBooking(request: Request, body: CreateBookingInput, authUser: AuthOptionalUser) {
     let bookingTeamEventType = false;
@@ -321,8 +322,7 @@ export class BookingsService_2024_08_13 {
               const allowedOptionValues = eventTypeBookingField.options.map((opt) => opt.value);
               if (!this.isValidSingleOptionValue(submittedValue, allowedOptionValues)) {
                 throw new BadRequestException(
-                  `Invalid option '${submittedValue}' for booking field '${
-                    eventTypeBookingField.name
+                  `Invalid option '${submittedValue}' for booking field '${eventTypeBookingField.name
                   }'. Allowed options are: ${allowedOptionValues.join(", ")}.`
                 );
               }
@@ -336,8 +336,7 @@ export class BookingsService_2024_08_13 {
               const allowedOptionValues = eventTypeBookingField.options.map((opt) => opt.value);
               if (!this.areValidMultipleOptionValues(submittedValues, allowedOptionValues)) {
                 throw new BadRequestException(
-                  `One or more invalid options for booking field '${
-                    eventTypeBookingField.name
+                  `One or more invalid options for booking field '${eventTypeBookingField.name
                   }'. Allowed options are: ${allowedOptionValues.join(", ")}.`
                 );
               }
@@ -351,8 +350,7 @@ export class BookingsService_2024_08_13 {
               const allowedOptionValues = eventTypeBookingField.options.map((opt) => opt.value);
               if (!this.areValidMultipleOptionValues(submittedValues, allowedOptionValues)) {
                 throw new BadRequestException(
-                  `One or more invalid options for booking field '${
-                    eventTypeBookingField.name
+                  `One or more invalid options for booking field '${eventTypeBookingField.name
                   }'. Allowed options are: ${allowedOptionValues.join(", ")}.`
                 );
               }
@@ -367,8 +365,7 @@ export class BookingsService_2024_08_13 {
               const allowedOptionValues = eventTypeBookingField.options.map((opt) => opt.value);
               if (!this.isValidSingleOptionValue(submittedValue, allowedOptionValues)) {
                 throw new BadRequestException(
-                  `Invalid option '${submittedValue}' for booking field '${
-                    eventTypeBookingField.name
+                  `Invalid option '${submittedValue}' for booking field '${eventTypeBookingField.name
                   }'. Allowed options are: ${allowedOptionValues.join(", ")}.`
                 );
               }
@@ -921,40 +918,41 @@ export class BookingsService_2024_08_13 {
     return await this.getBooking(recurringBookingUid, authUser);
   }
 
-    async markAbsent(
-      bookingUid: string,
-      bookingOwnerId: number,
-      body: MarkAbsentBookingInput_2024_08_13,
-      userUuid?: string
-    ) {
-      const bodyTransformed = this.inputService.transformInputMarkAbsentBooking(body);
-      const bookingBefore = await this.bookingsRepository.getByUid(bookingUid);
-
-      if (!bookingBefore) {
-        throw new NotFoundException(`Booking with uid=${bookingUid} not found.`);
-      }
+  async markAbsent(
+    bookingUid: string,
+    bookingOwnerId: number,
+    body: MarkAbsentBookingInput_2024_08_13,
+    userUuid?: string
+  ) {
+    const bodyTransformed = this.inputService.transformInputMarkAbsentBooking(body);
+    const bookingBefore = await this.bookingsRepository.getByUid(bookingUid);
 
-      const nowUtc = DateTime.utc();
-      const bookingStartTimeUtc = DateTime.fromJSDate(bookingBefore.startTime, { zone: "utc" });
+    if (!bookingBefore) {
+      throw new NotFoundException(`Booking with uid=${bookingUid} not found.`);
+    }
 
-      if (nowUtc < bookingStartTimeUtc) {
-        throw new BadRequestException(
-          `Bookings can only be marked as absent after their scheduled start time. Current time in UTC+0: ${nowUtc.toISO()}, Booking start time in UTC+0: ${bookingStartTimeUtc.toISO()}`
-        );
-      }
+    const nowUtc = DateTime.utc();
+    const bookingStartTimeUtc = DateTime.fromJSDate(bookingBefore.startTime, { zone: "utc" });
 
-      const platformClientParams = bookingBefore?.eventTypeId
-        ? await this.platformBookingsService.getOAuthClientParams(bookingBefore.eventTypeId)
-        : undefined;
+    if (nowUtc < bookingStartTimeUtc) {
+      throw new BadRequestException(
+        `Bookings can only be marked as absent after their scheduled start time. Current time in UTC+0: ${nowUtc.toISO()}, Booking start time in UTC+0: ${bookingStartTimeUtc.toISO()}`
+      );
+    }
 
-      await handleMarkNoShow({
-        bookingUid,
-        attendees: bodyTransformed.attendees,
-        noShowHost: bodyTransformed.noShowHost,
-        userId: bookingOwnerId,
-        userUuid,
-        platformClientParams,
-      });
+    const platformClientParams = bookingBefore?.eventTypeId
+      ? await this.platformBookingsService.getOAuthClientParams(bookingBefore.eventTypeId)
+      : undefined;
+
+    await handleMarkNoShow({
+      bookingUid,
+      attendees: bodyTransformed.attendees,
+      noShowHost: bodyTransformed.noShowHost,
+      userId: bookingOwnerId,
+      userUuid,
+      platformClientParams,
+      actionSource: "API_V2",
+    });
 
     const booking = await this.bookingsRepository.getByUidWithAttendeesAndUserAndEvent(bookingUid);
 
@@ -1038,6 +1036,8 @@ export class BookingsService_2024_08_13 {
         emailsEnabled,
         platformClientParams,
         reassignedById: reassignedByUser.id,
+        reassignedByUuid: reassignedByUser.uuid,
+        actionSource: "API_V2",
       });
     } catch (error) {
       if (error instanceof Error) {
@@ -1103,8 +1103,10 @@ export class BookingsService_2024_08_13 {
         orgId: profile?.organizationId || null,
         reassignReason: body.reason,
         reassignedById: reassignedByUser.id,
+        reassignedByUuid: reassignedByUser.uuid,
         emailsEnabled,
         platformClientParams,
+        actionSource: "API_V2",
       });
 
       return this.outputService.getOutputReassignedBooking(reassigned);

apps/api/v2/src/lib/services/recurring-booking.service.ts

@@ -1,13 +1,18 @@
 import { RegularBookingService } from "@/lib/services/regular-booking.service";
+import { BookingEventHandlerService } from "@/lib/services/booking-event-handler.service";
 import { Injectable } from "@nestjs/common";
 
 import { RecurringBookingService as BaseRecurringBookingService } from "@calcom/platform-libraries/bookings";
 
 @Injectable()
 export class RecurringBookingService extends BaseRecurringBookingService {
-  constructor(regularBookingService: RegularBookingService) {
+  constructor(
+    regularBookingService: RegularBookingService,
+    bookingEventHandler: BookingEventHandlerService
+  ) {
     super({
       regularBookingService,
+      bookingEventHandler,
     });
   }
 }

apps/web/pages/api/book/event.ts

@@ -54,28 +54,12 @@ async function handler(req: NextApiRequest & { userId?: number; traceContext: Tr
       hostname: req.headers.host || "",
       forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
       traceContext: req.traceContext,
+      userUuid: session?.user?.uuid || undefined,
       impersonatedByUserUuid: session?.user?.impersonatedBy?.uuid,
     },
   });
 
-  // const booking = await createBookingThroughFactory();
   return booking;
-
-  //  To be added in the follow-up PR
-  // async function createBookingThroughFactory() {
-  //   console.log("Creating booking through factory");
-  //   const regularBookingService = getRegularBookingService();
-
-  //   const booking = await regularBookingService.createBooking({
-  //     bookingData: req.body,
-  //     bookingMeta: {
-  //       userId: session?.user?.id || -1,
-  //       hostname: req.headers.host || "",
-  //       forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
-  //     },
-  //   });
-  //   return booking;
-  // }
 }
 
 export default defaultResponder(handler, "/api/book/event");

apps/web/pages/api/book/recurring-event.ts

@@ -1,5 +1,5 @@
 import type { NextApiRequest } from "next";
-
+import { CreationSource } from "@calcom/prisma/enums";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getRecurringBookingService } from "@calcom/features/bookings/di/RecurringBookingService.container";
 import type { BookingResponse } from "@calcom/features/bookings/types";
@@ -45,7 +45,10 @@ async function handler(req: NextApiRequest & RequestMeta) {
 
   const recurringBookingService = getRecurringBookingService();
   const createdBookings: BookingResponse[] = await recurringBookingService.createBooking({
-    bookingData: req.body,
+    bookingData: {
+      ...req.body,
+      creationSource: CreationSource.WEBAPP,
+    },
     bookingMeta: {
       userId: session?.user?.id || -1,
       platformClientId: req.platformClientId,
@@ -54,6 +57,7 @@ async function handler(req: NextApiRequest & RequestMeta) {
       platformRescheduleUrl: req.platformRescheduleUrl,
       platformBookingLocation: req.platformBookingLocation,
       noEmail: req.noEmail,
+      userUuid: session?.user?.uuid || undefined,
     },
   });
 

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

@@ -3238,7 +3238,7 @@
   "only_if_field_is_empty": "Only if field is empty",
   "booking_start_date": "Booking start date",
   "booking_created_date": "Booking created date",
-  "booking_reassigned_to_host": "Booking reassigned to {{host}}",
+  "booking_reassigned_to_host": "Reassigned to {{host}}",
   "no_contact_owner": "No contact owner",
   "routing_forms_created": "Routing Forms Created",
   "routing_forms_total_responses": "Total Responses",
@@ -3642,6 +3642,8 @@
   "pbac_action_read_team_bookings": "View Team Bookings",
   "pbac_action_read_org_bookings": "View Organization Bookings",
   "pbac_action_read_recordings": "View Recordings",
+  "pbac_action_read_team_audit_logs": "View team audit logs",
+  "pbac_action_read_org_audit_logs": "View organization audit logs",
   "pbac_action_impersonate": "Impersonate",
   "pbac_action_edit_users": "Edit Users",
   "role_created_successfully": "Role created successfully",
@@ -3712,6 +3714,8 @@
   "pbac_desc_view_team_bookings": "View team bookings",
   "pbac_desc_view_organization_bookings": "View organization bookings",
   "pbac_desc_view_booking_recordings": "View booking recordings",
+  "pbac_desc_view_team_audit_logs": "View audit logs for team bookings",
+  "pbac_desc_view_org_audit_logs": "View audit logs for organization bookings",
   "pbac_desc_update_bookings": "Update bookings",
   "pbac_desc_manage_bookings": "All actions on bookings",
   "pbac_desc_view_team_insights": "View team insights",
@@ -4180,7 +4184,7 @@
   "booking_history": "Booking History",
   "booking_history_description": "View the history of actions performed on this booking",
   "booking_audit_action": {
-    "created": "Created",
+    "created": "Booked with {{host}}",
     "cancelled": "Cancelled",
     "rescheduled": "Rescheduled {{oldDate}} -> <0>{{newDate}}</0>",
     "rescheduled_from": "Rescheduled <0>{{oldDate}}</0> -> {{newDate}}",
@@ -4195,9 +4199,11 @@
     "location_changed": "Location Changed",
     "location_changed_from_to": "Location changed from {{fromLocation}} to {{toLocation}}",
     "attendee_no_show_updated": "Attendee No-Show Updated",
-    "type": "Assignment Type",
-    "assignmentType_manual": "Manual Assignment",
-    "assignmentType_roundRobin": "Round Robin Assignment",
+    "seat_booked": "Seat Booked",
+    "seat_rescheduled": "Seat Rescheduled {{oldDate}} -> <0>{{newDate}}</0>",
+    "assignment_type": "Assignment",
+    "assignmentType_manual": "Manual",
+    "assignmentType_roundRobin": "Round Robin",
     "actor_impersonated_by": "Impersonator",
     "source": "Source"
   },

packages/app-store/_utils/payments/handlePaymentSuccess.ts

@@ -6,6 +6,8 @@ import { getAllCredentialsIncludeServiceAccountKey } from "@calcom/features/book
 import { handleBookingRequested } from "@calcom/features/bookings/lib/handleBookingRequested";
 import { handleConfirmation } from "@calcom/features/bookings/lib/handleConfirmation";
 import { getBooking } from "@calcom/features/bookings/lib/payment/getBooking";
+import type { Actor } from "@calcom/features/booking-audit/lib/dto/types";
+import { makeAppActor, makeAppActorUsingSlug } from "@calcom/features/booking-audit/lib/makeActor";
 import { CreditService } from "@calcom/features/ee/billing/credit-service";
 import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { getAllWorkflowsFromEventType } from "@calcom/features/ee/workflows/lib/getAllWorkflowsFromEventType";
@@ -28,16 +30,37 @@ import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { BookingStatus, WebhookTriggerEvents, WorkflowTriggerEvents } from "@calcom/prisma/enums";
 import type { EventTypeMetadata } from "@calcom/prisma/zod-utils";
+import { getAppNameFromSlug } from "@calcom/features/booking-audit/lib/getAppNameFromSlug";
 
 const log = logger.getSubLogger({ prefix: ["[handlePaymentSuccess]"] });
-export async function handlePaymentSuccess(paymentId: number, bookingId: number, traceContext: TraceContext) {
+
+export async function handlePaymentSuccess(params: { paymentId: number; appSlug: string; bookingId: number; traceContext: TraceContext }) {
+  const { paymentId, bookingId, appSlug, traceContext } = params;
   const updatedTraceContext = distributedTracing.updateTrace(traceContext, {
     bookingId,
     paymentId,
   });
   log.debug(`handling payment success for bookingId ${bookingId}`);
   const { booking, user: userWithCredentials, evt, eventType } = await getBooking(bookingId);
 
+  const apps = eventTypeAppMetadataOptionalSchema.parse(eventType?.metadata?.apps);
+
+  let actor: Actor;
+  const appData = apps?.[appSlug as keyof typeof apps];
+  if (appData?.credentialId) {
+    actor = makeAppActor({ credentialId: appData.credentialId });
+  } else {
+    log.warn(`Missing credentialId for payment app, using appSlug fallback`, {
+      bookingId,
+      eventTypeId: eventType?.id,
+      appSlug,
+    });
+    actor = makeAppActorUsingSlug({
+      appSlug,
+      name: getAppNameFromSlug({ appSlug }),
+    });
+  }
+
   try {
     await tasker.cancelWithReference(booking.uid, "sendAwaitingPaymentEmail");
     log.debug(`Cancelled scheduled awaiting payment email for booking ${bookingId}`);
@@ -70,7 +93,6 @@ export async function handlePaymentSuccess(paymentId: number, bookingId: number,
   const areEmailsEnabled = platformOAuthClient?.areEmailsEnabled ?? true;
 
   if (isConfirmed) {
-    const apps = eventTypeAppMetadataOptionalSchema.parse(eventType?.metadata?.apps);
     const eventManager = new EventManager({ ...userWithCredentials, credentials: allCredentials }, apps);
     const scheduleResult = areCalendarEventsEnabled
       ? await eventManager.create(evt)
@@ -237,6 +259,8 @@ export async function handlePaymentSuccess(paymentId: number, bookingId: number,
         booking,
         paid: true,
         platformClientParams,
+        source: "WEBHOOK",
+        actor,
         traceContext: updatedTraceContext,
       });
     } else {

packages/app-store/alby/api/webhook.ts

@@ -92,7 +92,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const traceContext = distributedTracing.createTrace("alby_webhook", {
       meta: { paymentId: payment.id, bookingId: payment.bookingId },
     });
-    return await handlePaymentSuccess(payment.id, payment.bookingId, traceContext);
+    return await handlePaymentSuccess({
+      paymentId: payment.id,
+      bookingId: payment.bookingId,
+      appSlug: "alby",
+      traceContext,
+    });
   } catch (_err) {
     const err = getServerErrorFromUnknown(_err);
     console.error(`Webhook Error: ${err.message}`);

packages/app-store/btcpayserver/api/webhook.ts

@@ -91,7 +91,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const traceContext = distributedTracing.createTrace("btcpayserver_webhook", {
       meta: { paymentId: payment.id, bookingId: payment.bookingId },
     });
-    await handlePaymentSuccess(payment.id, payment.bookingId, traceContext);
+    await handlePaymentSuccess({
+      paymentId: payment.id,
+      bookingId: payment.bookingId,
+      appSlug: "btcpayserver",
+      traceContext,
+    });
     return res.status(200).json({ success: true });
   } catch (_err) {
     const err = getServerErrorFromUnknown(_err);