refactor(db): typed query helpers, shared test FormData helper
Replace raw db.execute tuple casts with queryRows/rowsFrom/execResult/ affectedRows helpers from lib/db, drop redundant mysql2 casts on typed query builders, and centralize per-test fakeForm into test/fake-form. Update db mocks in tests so helpers resolve against mocked execute.
This commit is contained in:
1 parent
2e25b39364
commit
8638e81444
116 files changed
+866
-897
No files matched your search
@@ -3,7 +3,7 @@ import { getTranslations } from "next-intl/server";
|
||||
import Link from "@/components/link";
|
||||
import { ContentCard, EmptyState, RankBadge } from "@/components/public/ui";
|
||||
import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
|
||||
import { db } from "@/lib/db";
|
||||
import { queryRows } from "@/lib/db";
|
||||
|
||||
type LeaderRow = {
|
||||
username: string;
|
||||
@@ -15,13 +15,13 @@ async function loadRows(): Promise<
|
||||
{ username: string; look: string; points: number }[]
|
||||
> {
|
||||
try {
|
||||
const [rows] = (await db.execute(sql`
|
||||
const rows = await queryRows<LeaderRow>(sql`
|
||||
SELECT u.username AS username, u.look AS look, p.points AS points
|
||||
FROM radio_listener_points p
|
||||
INNER JOIN users u ON u.id = p.user_id
|
||||
ORDER BY p.points DESC
|
||||
LIMIT 50
|
||||
`)) as unknown as [LeaderRow[], unknown];
|
||||
`);
|
||||
return (rows ?? []).map((r) => ({
|
||||
username: r.username,
|
||||
look: r.look,
|
||||
|
||||
@@ -4,7 +4,7 @@ import { getTranslations } from "next-intl/server";
|
||||
import { signOutEverywhere } from "@/actions/sessions";
|
||||
import { ContentCard, EmptyState } from "@/components/public/ui";
|
||||
import { auth } from "@/lib/auth";
|
||||
import { db, WebsiteLoginLogs } from "@/lib/db";
|
||||
import { db, queryRows, WebsiteLoginLogs } from "@/lib/db";
|
||||
import { formatDate } from "@/lib/format-date";
|
||||
|
||||
type SearchParams = Promise<{ signedOutAll?: string }>;
|
||||
@@ -69,11 +69,10 @@ export default async function SessionsPage({
|
||||
type Failed = { id: number; ip_address: string; attempted_at: Date | string };
|
||||
let failed: Failed[] = [];
|
||||
try {
|
||||
const [rows] = (await db.execute(sql`
|
||||
failed = await queryRows<Failed>(sql`
|
||||
SELECT id, ip_address, attempted_at FROM failed_logins
|
||||
WHERE username = ${session.user.name} ORDER BY id DESC LIMIT 15
|
||||
`)) as unknown as [Failed[], unknown];
|
||||
failed = rows ?? [];
|
||||
`);
|
||||
} catch {
|
||||
failed = [];
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user