refactor(db): migrate app pages and APIs from Prisma facade to Drizzle (2)
Co-authored-by: Cursor <[email protected]>
This commit is contained in:
1 parent
7c39aef5d9
commit
2cd0863cb8
40 files changed
+1069
-726
No files matched your search
@@ -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) => {
|
||||
|
||||
Reference in new issue
Block a user