From 24a4646fdc33e2117f8a0639d9d28a6c1a6ffc17 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Wed, 24 Jan 2024 12:05:25 -0300 Subject: [PATCH] fix: sync/async calls in getSchedule (#13387) * Fixed the sync/async calls * fixing type errors * fixing more type errors --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> --- packages/core/getUserAvailability.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts index e955531ae5..097189d7e9 100644 --- a/packages/core/getUserAvailability.ts +++ b/packages/core/getUserAvailability.ts @@ -94,12 +94,12 @@ const _getEventType = async (id: number) => { type EventType = Awaited>; -const getUser = (...args: Parameters): ReturnType => { - return monitorCallbackSync(_getUser, ...args); +const getUser = async (...args: Parameters): Promise> => { + return monitorCallbackAsync(_getUser, ...args); }; -const _getUser = (where: Prisma.UserWhereInput) => - prisma.user.findFirst({ +const _getUser = async (where: Prisma.UserWhereInput) => { + return await prisma.user.findFirst({ where, select: { ...availabilityUserSelect, @@ -108,17 +108,18 @@ const _getUser = (where: Prisma.UserWhereInput) => }, }, }); +}; type User = Awaited>; -export const getCurrentSeats = ( +export const getCurrentSeats = async ( ...args: Parameters -): ReturnType => { - return monitorCallbackSync(_getCurrentSeats, ...args); +): Promise> => { + return monitorCallbackAsync(_getCurrentSeats, ...args); }; -const _getCurrentSeats = (eventTypeId: number, dateFrom: Dayjs, dateTo: Dayjs) => - prisma.booking.findMany({ +const _getCurrentSeats = async (eventTypeId: number, dateFrom: Dayjs, dateTo: Dayjs) => { + return await prisma.booking.findMany({ where: { eventTypeId, startTime: { @@ -137,6 +138,7 @@ const _getCurrentSeats = (eventTypeId: number, dateFrom: Dayjs, dateTo: Dayjs) = }, }, }); +}; export type CurrentSeats = Awaited>;