Add DI for BookingAudit (calcom#25123)

hariombalhara · web-flow · commit cbc8d3d7a82e · 2025-11-28T09:14:48.000Z
diff --git a/apps/api/v2/src/lib/modules/regular-booking.module.ts b/apps/api/v2/src/lib/modules/regular-booking.module.ts
@@ -4,6 +4,8 @@ import { PrismaFeaturesRepository } from "@/lib/repositories/prisma-features.rep
 import { PrismaHostRepository } from "@/lib/repositories/prisma-host.repository";
 import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
 import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { Logger } from "@/lib/logger.bridge";
+import { BookingEventHandlerService } from "@/lib/services/booking-event-handler.service";
 import { CheckBookingAndDurationLimitsService } from "@/lib/services/check-booking-and-duration-limits.service";
 import { CheckBookingLimitsService } from "@/lib/services/check-booking-limits.service";
 import { HashedLinkService } from "@/lib/services/hashed-link.service";
@@ -21,6 +23,13 @@ import { Module } from "@nestjs/common";
     PrismaHostRepository,
     PrismaOOORepository,
     PrismaUserRepository,
+    {
+      provide: Logger,
+      useFactory: () => {
+        return new Logger();
+      },
+    },
+    BookingEventHandlerService,
     CheckBookingAndDurationLimitsService,
     CheckBookingLimitsService,
     HashedLinkService,
diff --git a/apps/api/v2/src/lib/services/booking-cancel.service.ts b/apps/api/v2/src/lib/services/booking-cancel.service.ts
@@ -1,7 +1,7 @@
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 
-import { BookingCancelService as BaseBookingCancelService } from "@calcom/features/bookings/lib/handleCancelBooking";
+import { BookingCancelService as BaseBookingCancelService } from "@calcom/platform-libraries/bookings";
 
 @Injectable()
 export class BookingCancelService extends BaseBookingCancelService {
diff --git a/apps/api/v2/src/lib/services/booking-event-handler.service.ts b/apps/api/v2/src/lib/services/booking-event-handler.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from "@nestjs/common";
+
+import { BookingEventHandlerService as BaseBookingEventHandlerService } from "@calcom/platform-libraries/bookings";
+
+import { Logger } from "@/lib/logger.bridge";
+
+import { HashedLinkService } from "./hashed-link.service";
+
+@Injectable()
+export class BookingEventHandlerService extends BaseBookingEventHandlerService {
+  constructor(hashedLinkService: HashedLinkService, bridgeLogger: Logger) {
+    super({
+      log: bridgeLogger,
+      hashedLinkService,
+    });
+  }
+}
+
diff --git a/apps/api/v2/src/lib/services/regular-booking.service.ts b/apps/api/v2/src/lib/services/regular-booking.service.ts
@@ -1,5 +1,6 @@
 import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
 import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { BookingEventHandlerService } from "@/lib/services/booking-event-handler.service";
 import { CheckBookingAndDurationLimitsService } from "@/lib/services/check-booking-and-duration-limits.service";
 import { HashedLinkService } from "@/lib/services/hashed-link.service";
 import { LuckyUserService } from "@/lib/services/lucky-user.service";
@@ -17,7 +18,8 @@ export class RegularBookingService extends BaseRegularBookingService {
     bookingRepository: PrismaBookingRepository,
     hashedLinkService: HashedLinkService,
     luckyUserService: LuckyUserService,
-    userRepository: PrismaUserRepository
+    userRepository: PrismaUserRepository,
+    bookingEventHandler: BookingEventHandlerService
   ) {
     super({
       checkBookingAndDurationLimitsService,
@@ -26,6 +28,7 @@ export class RegularBookingService extends BaseRegularBookingService {
       hashedLinkService,
       luckyUserService,
       userRepository,
+      bookingEventHandler,
     });
   }
 }
diff --git a/packages/features/booking-audit/di/ActorRepository.module.ts b/packages/features/booking-audit/di/ActorRepository.module.ts
@@ -0,0 +1,23 @@
+import { PrismaAuditActorRepository } from "@calcom/features/booking-audit/lib/repository/PrismaAuditActorRepository";
+import { BOOKING_AUDIT_DI_TOKENS } from "@calcom/features/booking-audit/di/tokens";
+import { bindModuleToClassOnToken } from "@calcom/features/di/di";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
+import { createModule } from "../../di/di";
+
+export const actorRepositoryModule = createModule();
+const token = BOOKING_AUDIT_DI_TOKENS.ACTOR_REPOSITORY;
+const moduleToken = BOOKING_AUDIT_DI_TOKENS.ACTOR_REPOSITORY_MODULE;
+const loadModule = bindModuleToClassOnToken({
+    module: actorRepositoryModule,
+    moduleToken,
+    token,
+    classs: PrismaAuditActorRepository,
+    depsMap: {
+        prismaClient: prismaModuleLoader,
+    },
+});
+
+export const moduleLoader = {
+    token,
+    loadModule,
+};
diff --git a/packages/features/booking-audit/di/BookingAuditRepository.module.ts b/packages/features/booking-audit/di/BookingAuditRepository.module.ts
@@ -0,0 +1,23 @@
+import { PrismaBookingAuditRepository } from "@calcom/features/booking-audit/lib/repository/PrismaBookingAuditRepository";
+import { BOOKING_AUDIT_DI_TOKENS } from "@calcom/features/booking-audit/di/tokens";
+import { bindModuleToClassOnToken } from "@calcom/features/di/di";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
+import { createModule } from "../../di/di";
+
+export const bookingAuditRepositoryModule = createModule();
+const token = BOOKING_AUDIT_DI_TOKENS.BOOKING_AUDIT_REPOSITORY;
+const moduleToken = BOOKING_AUDIT_DI_TOKENS.BOOKING_AUDIT_REPOSITORY_MODULE;
+const loadModule = bindModuleToClassOnToken({
+  module: bookingAuditRepositoryModule,
+  moduleToken,
+  token,
+  classs: PrismaBookingAuditRepository,
+  depsMap: {
+    prismaClient: prismaModuleLoader,
+  },
+});
+
+export const moduleLoader = {
+  token,
+  loadModule,
+};
diff --git a/packages/features/booking-audit/di/BookingAuditService.module.ts b/packages/features/booking-audit/di/BookingAuditService.module.ts
@@ -0,0 +1,26 @@
+import { BookingAuditService } from "@calcom/features/booking-audit/lib/service/BookingAuditService";
+import { BOOKING_AUDIT_DI_TOKENS } from "@calcom/features/booking-audit/di/tokens";
+import { moduleLoader as bookingAuditRepositoryModuleLoader } from "@calcom/features/booking-audit/di/BookingAuditRepository.module";
+import { moduleLoader as actorRepositoryModuleLoader } from "@calcom/features/booking-audit/di/ActorRepository.module";
+
+import { createModule, bindModuleToClassOnToken } from "../../di/di";
+
+export const bookingAuditServiceModule = createModule();
+const token = BOOKING_AUDIT_DI_TOKENS.BOOKING_AUDIT_SERVICE;
+const moduleToken = BOOKING_AUDIT_DI_TOKENS.BOOKING_AUDIT_SERVICE_MODULE;
+
+const loadModule = bindModuleToClassOnToken({
+  module: bookingAuditServiceModule,
+  moduleToken,
+  token,
+  classs: BookingAuditService,
+  depsMap: {
+    bookingAuditRepository: bookingAuditRepositoryModuleLoader,
+    actorRepository: actorRepositoryModuleLoader,
+  },
+});
+
+export const moduleLoader = {
+  token,
+  loadModule
+};
diff --git a/packages/features/booking-audit/di/tokens.ts b/packages/features/booking-audit/di/tokens.ts
@@ -0,0 +1,8 @@
+export const BOOKING_AUDIT_DI_TOKENS = {
+    BOOKING_AUDIT_SERVICE: Symbol("BookingAuditService"),
+    BOOKING_AUDIT_SERVICE_MODULE: Symbol("BookingAuditServiceModule"),
+    BOOKING_AUDIT_REPOSITORY: Symbol("BookingAuditRepository"),
+    BOOKING_AUDIT_REPOSITORY_MODULE: Symbol("BookingAuditRepositoryModule"),
+    ACTOR_REPOSITORY: Symbol("ActorRepository"),
+    ACTOR_REPOSITORY_MODULE: Symbol("ActorRepositoryModule"),
+};
diff --git a/packages/features/booking-audit/lib/repository/IAuditActorRepository.ts b/packages/features/booking-audit/lib/repository/IAuditActorRepository.ts
@@ -13,5 +13,9 @@ type AuditActor = {
 export interface IAuditActorRepository {
   findByUserUuid(userUuid: string): Promise<AuditActor | null>;
   findSystemActorOrThrow(): Promise<AuditActor>;
+  // TODO: To be implemented in followup PR
+  // upsertUserActor(userUuid: string): Promise<AuditActor>;
+  // upsertGuestActor(email: string, name?: string, phone?: string): Promise<AuditActor>;
+  // findByAttendeeId(attendeeId: number): Promise<AuditActor | null>;
 }
 
diff --git a/packages/features/booking-audit/lib/repository/IBookingAuditRepository.ts b/packages/features/booking-audit/lib/repository/IBookingAuditRepository.ts
@@ -1,11 +1,12 @@
+import type { JsonValue } from "@calcom/types/Json";
+
 export type BookingAuditType = "RECORD_CREATED" | "RECORD_UPDATED" | "RECORD_DELETED"
-export type BookingAuditAction = "CREATED" | "CANCELLED" | "ACCEPTED" | "REJECTED" | "PENDING" | "AWAITING_HOST" | "RESCHEDULED" | "ATTENDEE_ADDED" | "ATTENDEE_REMOVED" | "CANCELLATION_REASON_UPDATED" | "REJECTION_REASON_UPDATED" | "ASSIGNMENT_REASON_UPDATED" | "REASSIGNMENT_REASON_UPDATED" | "LOCATION_CHANGED" | "HOST_NO_SHOW_UPDATED" | "ATTENDEE_NO_SHOW_UPDATED" | "RESCHEDULE_REQUESTED"
+export type BookingAuditAction = "CREATED" | "CANCELLED" | "ACCEPTED" | "REJECTED" | "PENDING" | "AWAITING_HOST" | "RESCHEDULED" | "ATTENDEE_ADDED" | "ATTENDEE_REMOVED" | "REASSIGNMENT" | "LOCATION_CHANGED" | "HOST_NO_SHOW_UPDATED" | "ATTENDEE_NO_SHOW_UPDATED" | "RESCHEDULE_REQUESTED"
 export type BookingAuditCreateInput = {
     bookingUid: string;
     actorId: string;
     action: BookingAuditAction;
-    data: unknown;
-    createdAt: Date;
+    data: JsonValue;
     type: BookingAuditType;
     timestamp: Date;
 }
@@ -14,9 +15,12 @@ type BookingAudit = {
     id: string;
     bookingUid: string;
     actorId: string;
-    action: string;
-    data: unknown;
+    action: BookingAuditAction;
+    type: BookingAuditType;
+    timestamp: Date;
     createdAt: Date;
+    updatedAt: Date;
+    data: JsonValue;
 }
 
 export interface IBookingAuditRepository {
diff --git a/packages/features/booking-audit/lib/repository/PrismaBookingAuditRepository.ts b/packages/features/booking-audit/lib/repository/PrismaBookingAuditRepository.ts
@@ -10,7 +10,14 @@ export class PrismaBookingAuditRepository implements IBookingAuditRepository {
 
     async create(bookingAudit: BookingAuditCreateInput) {
         return this.deps.prismaClient.bookingAudit.create({
-            data: bookingAudit,
+            data: {
+                bookingUid: bookingAudit.bookingUid,
+                actorId: bookingAudit.actorId,
+                action: bookingAudit.action,
+                type: bookingAudit.type,
+                timestamp: bookingAudit.timestamp,
+                data: bookingAudit.data === null ? undefined : bookingAudit.data,
+            },
         });
     }
 }
diff --git a/packages/features/booking-audit/lib/service/BookingAuditService.ts b/packages/features/booking-audit/lib/service/BookingAuditService.ts
@@ -0,0 +1,67 @@
+import type { JsonValue } from "@calcom/types/Json";
+import logger from "@calcom/lib/logger";
+import type { IBookingAuditRepository, BookingAuditType, BookingAuditAction } from "../repository/IBookingAuditRepository";
+import type { IAuditActorRepository } from "../repository/IAuditActorRepository";
+import { safeStringify } from "@calcom/lib/safeStringify";
+
+interface BookingAuditServiceDeps {
+    bookingAuditRepository: IBookingAuditRepository;
+    actorRepository: IAuditActorRepository;
+}
+
+type CreateBookingAuditInput = {
+    bookingUid: string;
+    actorId: string;
+    type: BookingAuditType;
+    action: BookingAuditAction;
+    data: JsonValue;
+    timestamp: Date; // Required: actual time of the booking change (business event)
+};
+
+type BookingAudit = {
+    id: string;
+    bookingUid: string;
+    actorId: string;
+    type: BookingAuditType;
+    action: BookingAuditAction;
+    timestamp: Date;
+    createdAt: Date;
+    updatedAt: Date;
+    data: JsonValue;
+};
+
+/**
+ * BookingAuditService - Central service for all booking audit operations
+ * Handles both write (audit creation) and read (display) operations
+ * Each action service manages its own schema versioning
+ */
+export class BookingAuditService {
+    private readonly bookingAuditRepository: IBookingAuditRepository;
+
+    constructor(private readonly deps: BookingAuditServiceDeps) {
+        this.bookingAuditRepository = deps.bookingAuditRepository;
+    }
+
+    /**
+     * TODO: TO be integrated with public methods in followup PR
+     */
+    async createAuditRecord(input: CreateBookingAuditInput): Promise<BookingAudit> {
+        // Log only non-sensitive metadata, excluding the data field which may contain PII
+        logger.info("Creating audit record", safeStringify({
+            bookingUid: input.bookingUid,
+            actorId: input.actorId,
+            type: input.type,
+            action: input.action,
+            timestamp: input.timestamp,
+        }));
+
+        return this.bookingAuditRepository.create({
+            bookingUid: input.bookingUid,
+            actorId: input.actorId,
+            type: input.type,
+            action: input.action,
+            timestamp: input.timestamp,
+            data: input.data,
+        });
+    }
+}
diff --git a/packages/features/bookings/di/BookingEventHandlerService.container.ts b/packages/features/bookings/di/BookingEventHandlerService.container.ts
@@ -0,0 +1,15 @@
+import { createContainer } from "@calcom/features/di/di";
+
+import {
+  type BookingEventHandlerService,
+  moduleLoader as bookingEventHandlerServiceModule,
+} from "./BookingEventHandlerService.module";
+
+const container = createContainer();
+
+export function getBookingEventHandlerService() {
+  bookingEventHandlerServiceModule.loadModule(container);
+
+  return container.get<BookingEventHandlerService>(bookingEventHandlerServiceModule.token);
+}
+
diff --git a/packages/features/bookings/di/BookingEventHandlerService.module.ts b/packages/features/bookings/di/BookingEventHandlerService.module.ts
@@ -0,0 +1,30 @@
+import { BookingEventHandlerService } from "@calcom/features/bookings/lib/onBookingEvents/BookingEventHandlerService";
+import { bindModuleToClassOnToken, createModule } from "@calcom/features/di/di";
+import { DI_TOKENS } from "@calcom/features/di/tokens";
+import { moduleLoader as hashedLinkServiceModuleLoader } from "@calcom/features/hashedLink/di/HashedLinkService.module";
+import { moduleLoader as bookingAuditServiceModuleLoader } from "@calcom/features/booking-audit/di/BookingAuditService.module";
+import { moduleLoader as loggerModuleLoader } from "@calcom/features/di/shared/services/logger.service";
+
+const thisModule = createModule();
+const token = DI_TOKENS.BOOKING_EVENT_HANDLER_SERVICE;
+const moduleToken = DI_TOKENS.BOOKING_EVENT_HANDLER_SERVICE_MODULE;
+
+const loadModule = bindModuleToClassOnToken({
+  module: thisModule,
+  moduleToken,
+  token,
+  classs: BookingEventHandlerService,
+  depsMap: {
+    hashedLinkService: hashedLinkServiceModuleLoader,
+    bookingAuditService: bookingAuditServiceModuleLoader,
+    log: loggerModuleLoader,
+  },
+});
+
+export const moduleLoader = {
+  token,
+  loadModule,
+};
+
+export type { BookingEventHandlerService };
+
diff --git a/packages/features/bookings/di/RegularBookingService.module.ts b/packages/features/bookings/di/RegularBookingService.module.ts
@@ -1,3 +1,4 @@
+import { moduleLoader as bookingAuditServiceModuleLoader } from "@calcom/features/booking-audit/di/BookingAuditService.module";
 import { RegularBookingService } from "@calcom/features/bookings/lib/service/RegularBookingService";
 import { bindModuleToClassOnToken, createModule } from "@calcom/features/di/di";
 import { moduleLoader as bookingRepositoryModuleLoader } from "@calcom/features/di/modules/Booking";
@@ -7,6 +8,7 @@ import { moduleLoader as userRepositoryModuleLoader } from "@calcom/features/di/
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { moduleLoader as hashedLinkServiceModuleLoader } from "@calcom/features/hashedLink/di/HashedLinkService.module";
 import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
+import { moduleLoader as bookingEventHandlerModuleLoader } from "@calcom/features/bookings/di/BookingEventHandlerService.module";
 
 const thisModule = createModule();
 const token = DI_TOKENS.REGULAR_BOOKING_SERVICE;
@@ -24,6 +26,7 @@ const loadModule = bindModuleToClassOnToken({
     luckyUserService: luckyUserServiceModuleLoader,
     userRepository: userRepositoryModuleLoader,
     hashedLinkService: hashedLinkServiceModuleLoader,
+    bookingEventHandler: bookingEventHandlerModuleLoader,
   },
 });
 
diff --git a/packages/features/bookings/di/tokens.ts b/packages/features/bookings/di/tokens.ts
@@ -7,4 +7,6 @@ export const BOOKING_DI_TOKENS = {
   INSTANT_BOOKING_CREATE_SERVICE_MODULE: Symbol("InstantBookingCreateServiceModule"),
   BOOKING_CANCEL_SERVICE: Symbol("BookingCancelService"),
   BOOKING_CANCEL_SERVICE_MODULE: Symbol("BookingCancelServiceModule"),
+  BOOKING_EVENT_HANDLER_SERVICE: Symbol("BookingEventHandlerService"),
+  BOOKING_EVENT_HANDLER_SERVICE_MODULE: Symbol("BookingEventHandlerServiceModule"),
 };
diff --git a/packages/features/bookings/lib/onBookingEvents/BookingEventHandlerService.ts b/packages/features/bookings/lib/onBookingEvents/BookingEventHandlerService.ts
@@ -1,13 +1,15 @@
-import type { Logger } from "tslog";
-
+import type { BookingAuditService } from "@calcom/features/booking-audit/lib/service/BookingAuditService";
 import type { HashedLinkService } from "@calcom/features/hashedLink/lib/service/HashedLinkService";
+import type { ISimpleLogger } from "@calcom/features/di/shared/services/logger.service";
 import { safeStringify } from "@calcom/lib/safeStringify";
 
 import type { BookingCreatedPayload, BookingRescheduledPayload } from "./types";
 
 interface BookingEventHandlerDeps {
-  log: Logger<unknown>;
+  log: ISimpleLogger;
   hashedLinkService: HashedLinkService;
+  //TODO: To be made required in followup PR
+  bookingAuditService?: BookingAuditService;
 }
 
 export class BookingEventHandlerService {
diff --git a/packages/features/bookings/lib/service/RegularBookingService.ts b/packages/features/bookings/lib/service/RegularBookingService.ts
@@ -417,6 +417,7 @@ export interface IBookingServiceDependencies {
   luckyUserService: LuckyUserService;
   userRepository: UserRepository;
   hashedLinkService: HashedLinkService;
+  bookingEventHandler: BookingEventHandlerService;
 }
 
 /**
@@ -2259,10 +2260,7 @@ async function handler(
   // Add more fields here when needed
   const bookingRescheduledPayload = bookingCreatedPayload;
 
-  const bookingEventHandler = new BookingEventHandlerService({
-    log: tracingLogger,
-    hashedLinkService: deps.hashedLinkService,
-  });
+  const bookingEventHandler = deps.bookingEventHandler;
 
   // TODO: Incrementally move all stuff that happens after a booking is created to these handlers
   if (originalRescheduledBooking) {
diff --git a/packages/features/bookings/lib/types/actor.ts b/packages/features/bookings/lib/types/actor.ts
diff --git a/packages/features/di/shared/services/logger.service.ts b/packages/features/di/shared/services/logger.service.ts
diff --git a/packages/features/di/shared/shared.tokens.ts b/packages/features/di/shared/shared.tokens.ts
diff --git a/packages/features/di/tokens.ts b/packages/features/di/tokens.ts
diff --git a/packages/features/di/watchlist/containers/watchlist.ts b/packages/features/di/watchlist/containers/watchlist.ts
diff --git a/packages/features/di/webhooks/containers/webhook.ts b/packages/features/di/webhooks/containers/webhook.ts
diff --git a/packages/lib/logger.ts b/packages/lib/logger.ts
diff --git a/packages/platform/libraries/bookings.ts b/packages/platform/libraries/bookings.ts

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,9 @@ type AuditActor = {`
`13`	`13`	`export interface IAuditActorRepository {`
`14`	`14`	`findByUserUuid(userUuid: string): Promise<AuditActor \| null>;`
`15`	`15`	`findSystemActorOrThrow(): Promise<AuditActor>;`
	`16`	`+ // TODO: To be implemented in followup PR`
	`17`	`+ // upsertUserActor(userUuid: string): Promise<AuditActor>;`
	`18`	`+ // upsertGuestActor(email: string, name?: string, phone?: string): Promise<AuditActor>;`
	`19`	`+ // findByAttendeeId(attendeeId: number): Promise<AuditActor \| null>;`
`16`	`20`	`}`
`17`	`21`