refactor(db): migrate app pages and APIs from Prisma facade to Drizzle (2)

Co-authored-by: Cursor <[email protected]>

src/app/admin/analytics/activity/page.tsx

@@ -1,10 +1,11 @@
+import { count, gte, inArray, sql } from "drizzle-orm";
 import { MessageSquare, Shield, Terminal, Users } from "lucide-react";
 import { redirect } from "next/navigation";
 import { getLocale, getTranslations } from "next-intl/server";
 import { StatsCard } from "@/components/admin/stats-card";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Ban, db, User } from "@/lib/db";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
-import { prisma } from "@/lib/prisma";
 import { redisCache } from "@/lib/redis-cache";
 
 type DayRow = {
@@ -34,11 +35,16 @@ async function safeCount(
 	}
 }
 
+async function rawRows<T>(query: ReturnType<typeof sql>): Promise<T[]> {
+	const [rows] = (await db.execute(query)) as unknown as [T[], unknown];
+	return rows ?? [];
+}
+
 async function safeRawCount(
-	sql: Promise<{ count: bigint }[]>,
+	query: ReturnType<typeof sql>,
 ): Promise<{ value: number; ok: boolean }> {
 	try {
-		const rows = await sql;
+		const rows = await rawRows<{ count: bigint }>(query);
 		return { value: Number(rows[0]?.count ?? 0), ok: true };
 	} catch {
 		return { value: 0, ok: false };
@@ -81,24 +87,24 @@ async function getActivityData(
 
 	try {
 		const [chatRows, cmdRows, banRows, regRows] = await Promise.all([
-			prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
+			rawRows<{ day_bucket: bigint; count: bigint }>(sql`
         SELECT FLOOR(timestamp / 86400) AS day_bucket, COUNT(*) AS count
-        FROM chatlogs_room WHERE timestamp >= ${rangeStart} GROUP BY day_bucket`.catch(
+        FROM chatlogs_room WHERE timestamp >= ${rangeStart} GROUP BY day_bucket`).catch(
 				() => [],
 			),
-			prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
+			rawRows<{ day_bucket: bigint; count: bigint }>(sql`
         SELECT FLOOR(timestamp / 86400) AS day_bucket, COUNT(*) AS count
-        FROM commandlogs WHERE timestamp >= ${rangeStart} GROUP BY day_bucket`.catch(
+        FROM commandlogs WHERE timestamp >= ${rangeStart} GROUP BY day_bucket`).catch(
 				() => [],
 			),
-			prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
+			rawRows<{ day_bucket: bigint; count: bigint }>(sql`
         SELECT FLOOR(timestamp / 86400) AS day_bucket, COUNT(*) AS count
-        FROM bans WHERE timestamp >= ${rangeStart} GROUP BY day_bucket`.catch(
+        FROM bans WHERE timestamp >= ${rangeStart} GROUP BY day_bucket`).catch(
 				() => [],
 			),
-			prisma.$queryRaw<{ day_bucket: bigint; count: bigint }[]>`
+			rawRows<{ day_bucket: bigint; count: bigint }>(sql`
         SELECT FLOOR(account_created / 86400) AS day_bucket, COUNT(*) AS count
-        FROM users WHERE account_created >= ${rangeStart} GROUP BY day_bucket`.catch(
+        FROM users WHERE account_created >= ${rangeStart} GROUP BY day_bucket`).catch(
 				() => [],
 			),
 		]);
@@ -124,19 +130,29 @@ async function getActivityData(
 
 	const [weekChats, weekCommands, weekBans, weekRegistrations] =
 		await Promise.all([
-			safeRawCount(
-				prisma.$queryRaw<{ count: bigint }[]>`
-          SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`,
+			safeRawCount(sql`
+          SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`),
+			safeRawCount(sql`
+          SELECT COUNT(*) AS count FROM commandlogs WHERE timestamp >= ${weekAgo}`),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(Ban)
+							.where(gte(Ban.timestamp, weekAgo))
+					)[0]?.total ?? 0,
+				),
 			),
-			safeRawCount(
-				prisma.$queryRaw<{ count: bigint }[]>`
-          SELECT COUNT(*) AS count FROM commandlogs WHERE timestamp >= ${weekAgo}`,
-			),
-			safeCount(() =>
-				prisma.ban.count({ where: { timestamp: { gte: weekAgo } } }),
-			),
-			safeCount(() =>
-				prisma.user.count({ where: { accountCreated: { gte: weekAgo } } }),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(User)
+							.where(gte(User.accountCreated, weekAgo))
+					)[0]?.total ?? 0,
+				),
 			),
 		]);
 
@@ -146,18 +162,18 @@ async function getActivityData(
 
 	let topChatters: ActivityData["topChatters"] = [];
 	try {
-		const rows = await prisma.$queryRaw<{ userId: number; messages: bigint }[]>`
+		const rows = await rawRows<{ userId: number; messages: bigint }>(sql`
       SELECT user_from_id AS userId, COUNT(*) AS messages
       FROM chatlogs_room WHERE timestamp >= ${weekAgo}
       GROUP BY user_from_id ORDER BY messages DESC LIMIT 10
-    `;
+    `);
 		const userIds = rows.map((c) => Number(c.userId)).filter((n) => n > 0);
 		const users =
 			userIds.length > 0
-				? await prisma.user.findMany({
-						where: { id: { in: userIds } },
-						select: { id: true, username: true },
-					})
+				? await db
+						.select({ id: User.id, username: User.username })
+						.from(User)
+						.where(inArray(User.id, userIds))
 				: [];
 		const userMap = new Map(users.map((u) => [u.id, u.username]));
 		topChatters = rows.map((c) => {

src/app/admin/analytics/economy/page.tsx

@@ -1,3 +1,4 @@
+import { and, count, eq, gte, sql, sum } from "drizzle-orm";
 import { ArrowLeftRight } from "lucide-react";
 import { redirect } from "next/navigation";
 import { getLocale, getTranslations } from "next-intl/server";
@@ -5,8 +6,14 @@ import { RevenueChart } from "@/components/admin/revenue-chart";
 import { StatsCard } from "@/components/admin/stats-card";
 import { CurrencyIcon } from "@/components/shared/currency-icon";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+	db,
+	LogsShopPurchases,
+	MarketplaceItems,
+	RoomTradeLog,
+	User,
+} from "@/lib/db";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
-import { prisma } from "@/lib/prisma";
 import { redisCache } from "@/lib/redis-cache";
 
 type EconomyData = {
@@ -43,6 +50,11 @@ async function safeCount(fn: () => Promise<number>): Promise<number> {
 	}
 }
 
+async function rawRows<T>(query: ReturnType<typeof sql>): Promise<T[]> {
+	const [rows] = (await db.execute(query)) as unknown as [T[], unknown];
+	return rows ?? [];
+}
+
 async function getEconomyData(
 	locale: string,
 ): Promise<{ data: EconomyData; degraded: boolean }> {
@@ -54,49 +66,86 @@ async function getEconomyData(
 
 	try {
 		const [creditsAgg, pixelsAgg, pointsAgg] = await Promise.all([
-			prisma.user.aggregate({ _sum: { credits: true } }).catch(() => {
-				degraded = true;
-				return null;
-			}),
-			prisma.user.aggregate({ _sum: { pixels: true } }).catch(() => {
-				degraded = true;
-				return null;
-			}),
-			prisma.user.aggregate({ _sum: { points: true } }).catch(() => {
-				degraded = true;
-				return null;
-			}),
+			db
+				.select({ total: sum(User.credits) })
+				.from(User)
+				.catch(() => {
+					degraded = true;
+					return [{ total: null }];
+				}),
+			db
+				.select({ total: sum(User.pixels) })
+				.from(User)
+				.catch(() => {
+					degraded = true;
+					return [{ total: null }];
+				}),
+			db
+				.select({ total: sum(User.points) })
+				.from(User)
+				.catch(() => {
+					degraded = true;
+					return [{ total: null }];
+				}),
 		]);
-		const totalCredits = creditsAgg?._sum.credits ?? 0;
-		const totalPixels = pixelsAgg?._sum.pixels ?? 0;
-		const totalPoints = pointsAgg?._sum.points ?? 0;
+		const totalCredits = Number(creditsAgg[0]?.total ?? 0);
+		const totalPixels = Number(pixelsAgg[0]?.total ?? 0);
+		const totalPoints = Number(pointsAgg[0]?.total ?? 0);
 
 		let shopPurchases = 0;
 		let shopCreditsSpent = 0;
 		let shopPointsSpent = 0;
 		try {
-			const shopRevenue = await prisma.logsShopPurchases.aggregate({
-				where: { timestamp: { gte: weekAgo } },
-				_sum: { costCredits: true, costPoints: true },
-				_count: true,
-			});
-			shopPurchases =
-				typeof shopRevenue._count === "number" ? shopRevenue._count : 0;
-			shopCreditsSpent = shopRevenue._sum?.costCredits ?? 0;
-			shopPointsSpent = shopRevenue._sum?.costPoints ?? 0;
+			const [shopRevenue] = await db
+				.select({
+					purchases: count(),
+					credits: sum(LogsShopPurchases.costCredits),
+					points: sum(LogsShopPurchases.costPoints),
+				})
+				.from(LogsShopPurchases)
+				.where(gte(LogsShopPurchases.timestamp, weekAgo));
+			shopPurchases = Number(shopRevenue?.purchases ?? 0);
+			shopCreditsSpent = Number(shopRevenue?.credits ?? 0);
+			shopPointsSpent = Number(shopRevenue?.points ?? 0);
 		} catch {
 			degraded = true;
 		}
 
 		const [marketplaceActive, marketplaceSold, weekTrades] = await Promise.all([
-			safeCount(() => prisma.marketplaceItems.count({ where: { state: 1 } })),
-			safeCount(() =>
-				prisma.marketplaceItems.count({
-					where: { state: 2, soldTimestamp: { gte: weekAgo } },
-				}),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(MarketplaceItems)
+							.where(eq(MarketplaceItems.state, 1))
+					)[0]?.total ?? 0,
+				),
 			),
-			safeCount(() =>
-				prisma.roomTradeLog.count({ where: { timestamp: { gte: weekAgo } } }),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(MarketplaceItems)
+							.where(
+								and(
+									eq(MarketplaceItems.state, 2),
+									gte(MarketplaceItems.soldTimestamp, weekAgo),
+								),
+							)
+					)[0]?.total ?? 0,
+				),
+			),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(RoomTradeLog)
+							.where(gte(RoomTradeLog.timestamp, weekAgo))
+					)[0]?.total ?? 0,
+				),
 			),
 		]);
 
@@ -112,20 +161,18 @@ async function getEconomyData(
 		}
 
 		try {
-			const revRows = await prisma.$queryRaw<
-				{
-					day_bucket: bigint;
-					credits: number | bigint;
-					points: number | bigint;
-				}[]
-			>`
+			const revRows = await rawRows<{
+				day_bucket: bigint;
+				credits: number | bigint;
+				points: number | bigint;
+			}>(sql`
         SELECT FLOOR(timestamp / 86400) AS day_bucket,
                COALESCE(SUM(cost_credits), 0) AS credits,
                COALESCE(SUM(cost_points), 0) AS points
         FROM logs_shop_purchases
         WHERE timestamp >= ${rangeStart}
         GROUP BY day_bucket ORDER BY day_bucket
-      `;
+      `);
 			const revMap = new Map(
 				revRows.map((r) => [
 					Number(r.day_bucket),

src/app/admin/analytics/page.tsx

@@ -1,3 +1,4 @@
+import { count, eq, gt, gte, sql } from "drizzle-orm";
 import {
 	ArrowLeftRight,
 	Clock,
@@ -12,8 +13,8 @@ import { DashboardChart } from "@/components/admin/dashboard-chart";
 import { PeakHoursHeatmap } from "@/components/admin/peak-hours-heatmap";
 import { StatsCard } from "@/components/admin/stats-card";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Ban, db, Rooms, RoomTradeLog, User } from "@/lib/db";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
-import { prisma } from "@/lib/prisma";
 import { redisCache } from "@/lib/redis-cache";
 
 type AnalyticsData = {
@@ -57,6 +58,11 @@ async function safeCount(
 	}
 }
 
+async function rawRows<T>(query: ReturnType<typeof sql>): Promise<T[]> {
+	const [rows] = (await db.execute(query)) as unknown as [T[], unknown];
+	return rows ?? [];
+}
+
 async function getAnalyticsData(
 	locale: string,
 ): Promise<{ data: AnalyticsData; degraded: boolean }> {
@@ -78,30 +84,82 @@ async function getAnalyticsData(
 			weekTrades,
 			weekBans,
 		] = await Promise.all([
-			safeCount(() => prisma.user.count()),
-			safeCount(() => prisma.user.count({ where: { online: "1" } })),
-			safeCount(() =>
-				prisma.user.count({ where: { accountCreated: { gte: weekAgo } } }),
+			safeCount(async () =>
+				Number((await db.select({ total: count() }).from(User))[0]?.total ?? 0),
 			),
-			safeCount(() =>
-				prisma.user.count({ where: { accountCreated: { gte: monthAgo } } }),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(User)
+							.where(eq(User.online, "1"))
+					)[0]?.total ?? 0,
+				),
+			),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(User)
+							.where(gte(User.accountCreated, weekAgo))
+					)[0]?.total ?? 0,
+				),
+			),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(User)
+							.where(gte(User.accountCreated, monthAgo))
+					)[0]?.total ?? 0,
+				),
+			),
+			safeCount(async () =>
+				Number(
+					(await db.select({ total: count() }).from(Rooms))[0]?.total ?? 0,
+				),
+			),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(Rooms)
+							.where(gt(Rooms.users, 0))
+					)[0]?.total ?? 0,
+				),
 			),
-			safeCount(() => prisma.rooms.count()),
-			safeCount(() => prisma.rooms.count({ where: { users: { gt: 0 } } })),
 			(async () => {
 				try {
-					const rows = await prisma.$queryRaw<{ count: bigint }[]>`
-            SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`;
+					const rows = await rawRows<{ count: bigint }>(sql`
+            SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`);
 					return { value: Number(rows[0]?.count ?? 0), ok: true };
 				} catch {
 					return { value: 0, ok: false };
 				}
 			})(),
-			safeCount(() =>
-				prisma.roomTradeLog.count({ where: { timestamp: { gte: weekAgo } } }),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(RoomTradeLog)
+							.where(gte(RoomTradeLog.timestamp, weekAgo))
+					)[0]?.total ?? 0,
+				),
 			),
-			safeCount(() =>
-				prisma.ban.count({ where: { timestamp: { gte: weekAgo } } }),
+			safeCount(async () =>
+				Number(
+					(
+						await db
+							.select({ total: count() })
+							.from(Ban)
+							.where(gte(Ban.timestamp, weekAgo))
+					)[0]?.total ?? 0,
+				),
 			),
 		]);
 
@@ -121,14 +179,12 @@ async function getAnalyticsData(
 
 		let registrationChart: { label: string; value: number }[] = [];
 		try {
-			const regRows = await prisma.$queryRaw<
-				{ day_bucket: bigint; count: bigint }[]
-			>`
+			const regRows = await rawRows<{ day_bucket: bigint; count: bigint }>(sql`
         SELECT FLOOR(account_created / 86400) AS day_bucket, COUNT(*) AS count
         FROM users
         WHERE account_created >= ${monthAgo}
         GROUP BY day_bucket ORDER BY day_bucket
-      `;
+      `);
 			const regCountMap = new Map(
 				regRows.map((r) => [Number(r.day_bucket), Number(r.count)]),
 			);
@@ -152,23 +208,21 @@ async function getAnalyticsData(
 		const grid: number[][] = Array.from({ length: 7 }, () => Array(24).fill(0));
 		let max = 0;
 		try {
-			const peakRows = await prisma.$queryRaw<
-				{ d: number; h: number; c: bigint }[]
-			>`
+			const peakRows = await rawRows<{ d: number; h: number; c: bigint }>(sql`
         SELECT ((DAYOFWEEK(FROM_UNIXTIME(last_online)) + 5) % 7) AS d,
                HOUR(FROM_UNIXTIME(last_online)) AS h,
                COUNT(*) AS c
         FROM users
         WHERE last_online >= ${weekAgo}
         GROUP BY d, h
-      `;
+      `);
 			for (const r of peakRows) {
 				const day = Number(r.d);
 				const hour = Number(r.h);
 				if (day < 0 || day > 6 || hour < 0 || hour > 23) continue;
-				const count = Number(r.c);
-				grid[day][hour] = count;
-				if (count > max) max = count;
+				const cnt = Number(r.c);
+				grid[day][hour] = cnt;
+				if (cnt > max) max = cnt;
 			}
 		} catch {
 			degraded = true;