Refactors user data queries

apps/bot/bot.ts

@@ -15,7 +15,8 @@ import { serve } from "bun";
 import c from "config";
 import { db } from "db";
 import { eq } from "db/drizzle";
-import { discordVerification, userCommonData } from "db/schema";
+import { discordVerification } from "db/schema";
+import { getHacker } from "db/functions";
 import { nanoid } from "nanoid";
 
 /* DISCORD BOT */
@@ -198,10 +199,8 @@ app.post("/api/checkDiscordVerification", async (h) => {
 		return h.json({ success: false });
 	}
 	console.log("got here 2");
-	const user = await db.query.userCommonData.findFirst({
-		where: eq(userCommonData.clerkID, verification.clerkID),
-		with: { hackerData: true },
-	});
+
+	const user = await getHacker(verification.clerkID, false);
 	console.log("got here 2 with user", user);
 	if (!user) {
 		console.log("failed cause of no user in db");

apps/web/src/actions/rsvp.ts

@@ -5,14 +5,14 @@ import { z } from "zod";
 import { db } from "db";
 import { eq } from "db/drizzle";
 import { userCommonData } from "db/schema";
+import { getUser } from "db/functions";
 
 export const rsvpMyself = authenticatedAction(
 	z.any(),
 	async (_, { userId }) => {
-		const user = await db.query.userCommonData.findFirst({
-			where: eq(userCommonData.clerkID, userId),
-		});
+		const user = await getUser(userId);
 		if (!user) throw new Error("User not found");
+
 		await db
 			.update(userCommonData)
 			.set({ isRSVPed: true })

apps/web/src/actions/teams.ts

@@ -5,21 +5,16 @@
 import { authenticatedAction } from "@/lib/safe-action";
 import { z } from "zod";
 import { db } from "db";
-import { userCommonData, userHackerData, teams, invites } from "db/schema";
+import { userHackerData, teams, invites } from "db/schema";
 import { eq } from "db/drizzle";
 import { revalidatePath } from "next/cache";
+import { getHacker } from "db/functions";
 
 export const leaveTeam = authenticatedAction(
 	z.null(),
 	async (_, { userId }) => {
-		const user = await db.query.userCommonData.findFirst({
-			where: eq(userCommonData.clerkID, userId),
-			with: { hackerData: true },
-		});
-
-		if (!user) {
-			throw new Error("User not found");
-		}
+		const user = await getHacker(userId, false);
+		if (!user) throw new Error("User not found");
 
 		if (!user.hackerData.teamID) {
 			revalidatePath("/dash/team");

apps/web/src/actions/user-profile-mod.ts

@@ -8,6 +8,7 @@ import { eq } from "db/drizzle";
 import { put } from "@vercel/blob";
 import { decodeBase64AsFile } from "@/lib/utils/shared/files";
 import { revalidatePath } from "next/cache";
+import { getUser } from "db/functions";
 
 // TODO: Add skill updating
 export const modifyRegistrationData = authenticatedAction(
@@ -16,10 +17,9 @@ export const modifyRegistrationData = authenticatedAction(
 		skills: z.string().max(100),
 	}),
 	async ({ bio, skills }, { userId }) => {
-		const user = await db.query.userCommonData.findFirst({
-			where: eq(userCommonData.clerkID, userId),
-		});
+		const user = await getUser(userId);
 		if (!user) throw new Error("User not found");
+
 		await db
 			.update(userCommonData)
 			.set({ bio })
@@ -34,10 +34,9 @@ export const modifyAccountSettings = authenticatedAction(
 		lastName: z.string().min(1).max(50),
 	}),
 	async ({ firstName, lastName }, { userId }) => {
-		const user = await db.query.userCommonData.findFirst({
-			where: eq(userCommonData.clerkID, userId),
-		});
+		const user = await getUser(userId);
 		if (!user) throw new Error("User not found");
+
 		await db
 			.update(userCommonData)
 			.set({ firstName, lastName })
@@ -54,9 +53,7 @@ export const updateProfileImage = authenticatedAction(
 	z.object({ fileBase64: z.string(), fileName: z.string() }),
 	async ({ fileBase64, fileName }, { userId }) => {
 		const image = await decodeBase64AsFile(fileBase64, fileName);
-		const user = await db.query.userCommonData.findFirst({
-			where: eq(userCommonData.clerkID, userId),
-		});
+		const user = await getUser(userId);
 		if (!user) throw new Error("User not found");
 
 		const blobUpload = await put(image.name, image, { access: "public" });

apps/web/src/app/admin/check-in/page.tsx

@@ -1,15 +1,12 @@
 import CheckinScanner from "@/components/admin/scanner/CheckinScanner";
-import { db } from "db";
-import { eq } from "db/drizzle";
-import { userCommonData } from "db/schema";
+import { getUser } from "db/functions";
 
 export default async function Page({
 	searchParams,
 }: {
 	searchParams: { [key: string]: string | undefined };
 }) {
-	// Check for missing searchParams
-	if (!searchParams.user) {
+	if (!searchParams.user)
 		return (
 			<div>
 				<CheckinScanner
@@ -20,45 +17,27 @@ export default async function Page({
 				/>
 			</div>
 		);
-	}
 
-	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];
-			}
-		},
-	);
+	const scanUser = await getUser(searchParams.user);
+	if (!scanUser)
+		return (
+			<div>
+				<CheckinScanner
+					hasScanned={true}
+					checkedIn={null}
+					scanUser={null}
+					hasRSVP={null}
+				/>
+			</div>
+		);
 
 	return (
 		<div>
 			<CheckinScanner
-				checkedIn={isChecked}
 				hasScanned={true}
+				checkedIn={scanUser.checkinTimestamp != null}
 				scanUser={scanUser}
-				hasRSVP={hasRSVPed}
+				hasRSVP={scanUser.isRSVPed}
 			/>
 		</div>
 	);

apps/web/src/app/admin/layout.tsx

@@ -1,17 +1,15 @@
 import c from "config";
 import Image from "next/image";
-import { db } from "db";
 import { auth } from "@clerk/nextjs";
 import Link from "next/link";
 import { Button } from "@/components/shadcn/ui/button";
 import DashNavItem from "@/components/dash/shared/DashNavItem";
-import { eq } from "db/drizzle";
-import { userCommonData } from "db/schema";
 import FullScreenMessage from "@/components/shared/FullScreenMessage";
 import ProfileButton from "@/components/shared/ProfileButton";
 import { Suspense } from "react";
 import ClientToast from "@/components/shared/ClientToast";
 import { redirect } from "next/navigation";
+import { getUser } from "db/functions";
 
 interface AdminLayoutProps {
 	children: React.ReactNode;
@@ -24,9 +22,7 @@ export default async function AdminLayout({ children }: AdminLayoutProps) {
 		return redirect("/sign-in");
 	}
 
-	const user = await db.query.userCommonData.findFirst({
-		where: eq(userCommonData.clerkID, userId),
-	});
+	const user = await getUser(userId);
 
 	if (!user || (user.role !== "admin" && user.role !== "super_admin")) {
 		console.log("Denying admin access to user", user);

apps/web/src/app/admin/page.tsx

@@ -6,36 +6,25 @@ import {
 	CardTitle,
 	CardDescription,
 } from "@/components/shadcn/ui/card";
-import { db } from "db";
-import { eq, desc } from "db/drizzle";
-import { userCommonData } from "db/schema";
 import { Users, UserCheck, User2, TimerReset, MailCheck } from "lucide-react";
-import type { userType } from "@/lib/utils/shared/types";
+import type { User } from "db/types";
 import { auth } from "@clerk/nextjs";
 import { notFound } from "next/navigation";
+import { getAllUsers, getUser } from "db/functions";
 
 export default async function Page() {
-	// const getCachedUsers = unstable_cache(getUsers, [`global_users_${env.INTERNAL_AUTH_KEY}`], {
-	// 	revalidate: 30,
-	// });
-
 	const { userId } = auth();
-
 	if (!userId) return notFound();
 
-	const adminUser = await db.query.userCommonData.findFirst({
-		where: eq(userCommonData.clerkID, userId),
-		orderBy: desc(userCommonData.signupTime),
-	});
-
+	const adminUser = await getUser(userId);
 	if (
 		!adminUser ||
 		(adminUser.role !== "admin" && adminUser.role !== "super_admin")
 	) {
 		return notFound();
 	}
 
-	const allUsers = await getUsers();
+	const allUsers = (await getAllUsers()) ?? [];
 
 	const { rsvpCount, checkinCount, recentSignupCount } =
 		getRecentRegistrationData(allUsers);
@@ -140,7 +129,7 @@ export default async function Page() {
 	);
 }
 
-function getRecentRegistrationData(users: userType[]) {
+function getRecentRegistrationData(users: User[]) {
 	type DateNumberMap = { [key: string]: number };
 
 	let rsvpCount = 0;
@@ -171,9 +160,4 @@ function getRecentRegistrationData(users: userType[]) {
 	return { rsvpCount, checkinCount, recentSignupCount };
 }
 
-async function getUsers() {
-	const usersReq = await db.query.userCommonData.findMany();
-	return usersReq;
-}
-
 export const runtime = "edge";

apps/web/src/app/admin/scanner/[id]/page.tsx

@@ -2,6 +2,7 @@ import PassScanner from "@/components/admin/scanner/PassScanner";
 import FullScreenMessage from "@/components/shared/FullScreenMessage";
 import { db } from "db";
 import { eq, and } from "db/drizzle";
+import { getHacker } from "db/functions";
 import { events, userCommonData, scans } from "db/schema";
 
 export default async function Page({
@@ -48,40 +49,24 @@ export default async function Page({
 		);
 	}
 
-	const [scan, scanUser] = await db.transaction(async (tx) => {
-		const scanUser = await tx.query.userCommonData.findFirst({
-			where: eq(userCommonData.clerkID, searchParams.user!),
-			with: {
-				hackerData: {
-					with: {
-						team: true,
-					},
-				},
-			},
-		});
-		if (!scanUser) {
-			return [null, null];
-		}
-		const scan = await tx.query.scans.findFirst({
-			where: and(
-				eq(scans.eventID, event.id),
-				eq(scans.userID, scanUser.clerkID),
-			),
-		});
-		if (scan) {
-			return [scan, scanUser];
-		} else {
-			return [null, scanUser];
-		}
-	});
+	const scanUser = await getHacker(searchParams.user, false);
+
+	const scan = !scanUser
+		? null
+		: await db.query.scans.findFirst({
+				where: and(
+					eq(scans.eventID, event.id),
+					eq(scans.userID, scanUser.clerkID),
+				),
+			});
 
 	return (
 		<div>
 			<PassScanner
 				event={event}
 				hasScanned={true}
-				scan={scan}
-				scanUser={scanUser}
+				scan={scan ?? null}
+				scanUser={scanUser ?? null}
 			/>
 		</div>
 	);

apps/web/src/app/admin/users/[slug]/page.tsx

@@ -1,11 +1,7 @@
-import { db } from "db";
-import { userCommonData } from "db/schema";
-import { eq } from "db/drizzle";
 import Image from "next/image";
 import { Button } from "@/components/shadcn/ui/button";
 import { Badge } from "@/components/shadcn/ui/badge";
 import { Info } from "lucide-react";
-
 import Link from "next/link";
 import UpdateRoleDialog from "@/components/admin/users/UpdateRoleDialog";
 import {
@@ -19,22 +15,17 @@ import { notFound } from "next/navigation";
 import { isUserAdmin } from "@/lib/utils/server/admin";
 import ApproveUserButton from "@/components/admin/users/ApproveUserButton";
 import c from "config";
+import { getHacker, getUser } from "db/functions";
 
 export default async function Page({ params }: { params: { slug: string } }) {
 	const { userId } = auth();
 
 	if (!userId) return notFound();
 
-	const admin = await db.query.userCommonData.findFirst({
-		where: eq(userCommonData.clerkID, userId),
-	});
-
+	const admin = await getUser(userId);
 	if (!admin || !isUserAdmin(admin)) return notFound();
 
-	const user = await db.query.userCommonData.findFirst({
-		where: eq(userCommonData.clerkID, params.slug),
-		with: { hackerData: { with: { team: true } } },
-	});
+	const user = await getHacker(params.slug, true);
 
 	if (!user) {
 		return <p className="text-center font-bold">User Not Found</p>;