maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the commented selectedCalendars var, it is not necessary

This commit is contained in:
Efrain Rochin Aramburo 2023-02-09 13:04:26 -07:00
parent b572591259
commit d80f7fb9c3
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/getBusyTimes.ts
View File

@ -16,7 +16,6 @@ export async function getBusyTimes(params: {
beforeEventBuffer?: number; beforeEventBuffer?: number;
afterEventBuffer?: number; afterEventBuffer?: number;
endTime: string; endTime: string;
selectedCalendars: SelectedCalendar[];
}) { }) {
const { const {
credentials, credentials,
@ -25,7 +24,6 @@ export async function getBusyTimes(params: {
eventTypeId, eventTypeId,
startTime, startTime,
endTime, endTime,
//selectedCalendars,
beforeEventBuffer, beforeEventBuffer,
afterEventBuffer, afterEventBuffer,
} = params; } = params;
@ -77,13 +75,7 @@ export async function getBusyTimes(params: {
performance.mark("prismaBookingGetEnd"); performance.mark("prismaBookingGetEnd");
performance.measure(`prisma booking get took $1'`, "prismaBookingGetStart", "prismaBookingGetEnd"); performance.measure(`prisma booking get took $1'`, "prismaBookingGetStart", "prismaBookingGetEnd");
if (credentials?.length > 0) { if (credentials?.length > 0) {
const calendarBusyTimes = await getBusyCalendarTimes( const calendarBusyTimes = await getBusyCalendarTimes(username, credentials, startTime, endTime);
username,
credentials,
startTime,
endTime
// selectedCalendars
);
busyTimes.push( busyTimes.push(
...calendarBusyTimes.map((value) => ({ ...calendarBusyTimes.map((value) => ({
...value, ...value,

23
packages/core/getUserAvailability.ts
View File

@ -121,8 +121,7 @@ export async function getUserAvailability(
if (username) where.username = username; if (username) where.username = username;
if (userId) where.id = userId; if (userId) where.id = userId;
let user: User | null = initialData?.user || null; const user = initialData?.user || (await getUser(where));
if (!user) user = await getUser(where);
if (!user) throw new HttpError({ statusCode: 404, message: "No user found" }); if (!user) throw new HttpError({ statusCode: 404, message: "No user found" });
let eventType: EventType | null = initialData?.eventType || null; let eventType: EventType | null = initialData?.eventType || null;
@ -137,16 +136,13 @@ export async function getUserAvailability(
const bookingLimits = parseBookingLimit(eventType?.bookingLimits); const bookingLimits = parseBookingLimit(eventType?.bookingLimits);
const { selectedCalendars, ...currentUser } = user;
const busyTimes = await getBusyTimes({ const busyTimes = await getBusyTimes({
credentials: currentUser.credentials, credentials: user.credentials,
startTime: dateFrom.toISOString(), startTime: dateFrom.toISOString(),
endTime: dateTo.toISOString(), endTime: dateTo.toISOString(),
eventTypeId, eventTypeId,
userId: currentUser.id, userId: user.id,
username: `${currentUser.username}`, username: `${user.username}`,
selectedCalendars,
beforeEventBuffer, beforeEventBuffer,
afterEventBuffer, afterEventBuffer,
}); });
@ -223,8 +219,8 @@ export async function getUserAvailability(
} }
} }
const userSchedule = currentUser.schedules.filter( const userSchedule = user.schedules.filter(
(schedule) => !currentUser.defaultScheduleId || schedule.id === currentUser.defaultScheduleId (schedule) => !user?.defaultScheduleId || schedule.id === user?.defaultScheduleId
)[0]; )[0];
const schedule = const schedule =
@ -234,17 +230,16 @@ export async function getUserAvailability(
...userSchedule, ...userSchedule,
availability: userSchedule.availability.map((a) => ({ availability: userSchedule.availability.map((a) => ({
...a, ...a,
userId: currentUser.id, userId: user.id,
})), })),
}; };
const startGetWorkingHours = performance.now(); const startGetWorkingHours = performance.now();
const timeZone = schedule.timeZone || eventType?.timeZone || currentUser.timeZone; const timeZone = schedule.timeZone || eventType?.timeZone || user.timeZone;
const availability = const availability =
schedule.availability || schedule.availability || (eventType?.availability.length ? eventType.availability : user.availability);
(eventType?.availability.length ? eventType.availability : currentUser.availability);
const workingHours = getWorkingHours({ timeZone }, availability); const workingHours = getWorkingHours({ timeZone }, availability);