commonscomputer/cal.diy
5
0 Fork 0
Code Issues Pull Requests Actions 1.9k Packages Projects Releases Wiki Activity

Applying feedback from a merged PR (#4887)

Browse Source
This commit is contained in:
Leo Giovanetti authored and GitHub committed 2022-10-06 17:38:50 -03:00
1 parent 41c1e960f8
commit 0098591a56
2 files changed
+16 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/trpc/server/routers/viewer.tsx
+6 -18
View File
@@ -454,20 +454,12 @@ const loggedInViewerRouter = createProtectedRouter()
// handled separately for each occurrence
OR: [
{
AND: [
{ NOT: { recurringEventId: { equals: null } } },
{
status: {
notIn: [BookingStatus.PENDING, BookingStatus.CANCELLED, BookingStatus.REJECTED],
},
},
],
recurringEventId: { not: null },
status: { notIn: [BookingStatus.PENDING, BookingStatus.CANCELLED, BookingStatus.REJECTED] },
},
{
AND: [
{ recurringEventId: { equals: null } },
{ status: { notIn: [BookingStatus.CANCELLED, BookingStatus.REJECTED] } },
],
recurringEventId: { equals: null },
status: { notIn: [BookingStatus.CANCELLED, BookingStatus.REJECTED] },
},
],
},
@@ -495,12 +487,8 @@ const loggedInViewerRouter = createProtectedRouter()
endTime: { gte: new Date() },
OR: [
{
AND: [
{ NOT: { recurringEventId: { equals: null } } },
{
status: { equals: BookingStatus.PENDING },
},
],
recurringEventId: { not: null },
status: { equals: BookingStatus.PENDING },
},
{
status: { equals: BookingStatus.PENDING },