From 35dd3f088c0456944b6d22f97a1902de40c57757 Mon Sep 17 00:00:00 2001 From: Mihai C <34626017+mihaic195@users.noreply.github.com> Date: Fri, 8 Oct 2021 18:58:37 +0300 Subject: [PATCH] fix: move cancelled upcoming booking to cancelled tab (#883) * fix: move cancelled upcoming booking to cancelled tab * fix: lint * Update server/routers/viewer.tsx Co-authored-by: Mihai Colceriu * fix: also for past bookings Co-authored-by: Alex Johansson --- server/routers/viewer.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routers/viewer.tsx b/server/routers/viewer.tsx index 95154f1a77..bf9eb49db5 100644 --- a/server/routers/viewer.tsx +++ b/server/routers/viewer.tsx @@ -28,8 +28,8 @@ export const viewerRouter = createProtectedRouter() const { prisma, user } = ctx; const bookingListingByStatus = input.status; const bookingListingFilters: Record = { - upcoming: [{ endTime: { gte: new Date() } }], - past: [{ endTime: { lte: new Date() } }], + upcoming: [{ endTime: { gte: new Date() }, NOT: { status: { equals: BookingStatus.CANCELLED } } }], + past: [{ endTime: { lte: new Date() }, NOT: { status: { equals: BookingStatus.CANCELLED } } }], cancelled: [{ status: { equals: BookingStatus.CANCELLED } }], }; const bookingListingOrderby: Record = {