From d118050199103bc9dc2655be5b01773d6ef77912 Mon Sep 17 00:00:00 2001 From: xwilson03 Date: Mon, 5 Aug 2024 15:38:24 -0500 Subject: [PATCH] slightly refactors checkin --- apps/web/src/app/admin/check-in/page.tsx | 91 ++++++++++++------------ 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/apps/web/src/app/admin/check-in/page.tsx b/apps/web/src/app/admin/check-in/page.tsx index 517cd9fc..e67db052 100644 --- a/apps/web/src/app/admin/check-in/page.tsx +++ b/apps/web/src/app/admin/check-in/page.tsx @@ -8,54 +8,53 @@ export default async function Page({ }: { searchParams: { [key: string]: string | undefined }; }) { - // Returns only if search params exist - if (searchParams.user) { - const [isChecked, scanUser, hasRSVPed] = await db.transaction( - async (tx) => { - const scanUser = await tx.query.userCommonData.findFirst({ - where: eq(userCommonData.clerkID, searchParams.user ?? "unknown"), - }); - if (!scanUser) { - return [null, null, null]; - } - const scan = await tx - .select({ - checkinTimestamp: userCommonData.checkinTimestamp, - hasRSVPed: userCommonData.isRSVPed, - }) - .from(userCommonData) - .where(eq(userCommonData.clerkID, searchParams.user!)); - if (scan) { - return [scan[0].checkinTimestamp != null, scanUser, scan[0].hasRSVPed]; - } else { - return [null, scanUser, null]; - } - }, - ); - - return ( -
- -
- ); + // Check for missing searchParams + if (!searchParams.user) { + return ( +
+ +
+ ); } - // Fall through case - return ( -
- -
- ); + const [isChecked, scanUser, hasRSVPed] = await db.transaction( + async (tx) => { + const scanUser = await tx.query.userCommonData.findFirst({ + where: eq(userCommonData.clerkID, searchParams.user ?? "unknown"), + }); + if (!scanUser) { + return [null, null, null]; + } + const scan = await tx + .select({ + checkinTimestamp: userCommonData.checkinTimestamp, + hasRSVPed: userCommonData.isRSVPed, + }) + .from(userCommonData) + .where(eq(userCommonData.clerkID, searchParams.user!)); + if (scan) { + return [scan[0].checkinTimestamp != null, scanUser, scan[0].hasRSVPed]; + } else { + return [null, scanUser, null]; + } + }, + ); + + return ( +
+ +
+ ); } export const runtime = "edge";