From 252ce5dec848110e93f227cf31ad8ec628e09ae9 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Tue, 4 Feb 2025 11:03:43 +0000 Subject: [PATCH] fix: some modifications to logging event detail input (#19070) * some modifications to logging event detail input * add descriptive name --- .../handleNewBooking/ensureAvailableUsers.ts | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts index b2d7b11a7f..0169db4b1b 100644 --- a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts +++ b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts @@ -7,6 +7,7 @@ import type { Dayjs } from "@calcom/dayjs"; import { checkForConflicts } from "@calcom/features/bookings/lib/conflictChecker/checkForConflicts"; import { parseBookingLimit, parseDurationLimit } from "@calcom/lib"; import { ErrorCode } from "@calcom/lib/errorCodes"; +import { getPiiFreeUser } from "@calcom/lib/piiFreeData"; import { safeStringify } from "@calcom/lib/safeStringify"; import type { getEventTypeResponse } from "./getEventTypesFromDB"; @@ -101,6 +102,22 @@ export async function ensureAvailableUsers( }, }); + const piiFreeInputDataForLogging = safeStringify({ + startDateTimeUtc, + endDateTimeUtc, + ...{ + ...input, + originalRescheduledBooking: input.originalRescheduledBooking + ? { + ...input.originalRescheduledBooking, + user: input.originalRescheduledBooking?.user + ? getPiiFreeUser(input.originalRescheduledBooking.user) + : null, + } + : undefined, + }, + }); + usersAvailability.forEach(({ oooExcludedDateRanges: dateRanges, busy: bufferedBusyTimes }, index) => { const user = eventType.users[index]; @@ -112,25 +129,14 @@ export async function ensureAvailableUsers( if (!dateRanges.length) { loggerWithEventDetails.error( `User does not have availability at this time.`, - safeStringify({ - startDateTimeUtc, - endDateTimeUtc, - input, - }) + piiFreeInputDataForLogging ); return; } //check if event time is within the date range if (!hasDateRangeForBooking(dateRanges, startDateTimeUtc, endDateTimeUtc)) { - loggerWithEventDetails.error( - `No date range for booking.`, - safeStringify({ - startDateTimeUtc, - endDateTimeUtc, - input, - }) - ); + loggerWithEventDetails.error(`No date range for booking.`, piiFreeInputDataForLogging); return; } @@ -149,14 +155,7 @@ export async function ensureAvailableUsers( }); if (availableUsers.length === 0) { - loggerWithEventDetails.error( - `No available users found.`, - safeStringify({ - startDateTimeUtc, - endDateTimeUtc, - input, - }) - ); + loggerWithEventDetails.error(`No available users found.`, piiFreeInputDataForLogging); throw new Error(ErrorCode.NoAvailableUsersFound); } // make sure TypeScript understands availableUsers is at least one.