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,11 +1,12 @@
|
||||
import { asc, eq, inArray } from "drizzle-orm";
|
||||
import { CalendarDays, Gift, Trophy, Users } from "lucide-react";
|
||||
import { notFound, redirect } from "next/navigation";
|
||||
import { getTranslations } from "next-intl/server";
|
||||
import { AdminBreadcrumb } from "@/components/admin/admin-breadcrumb";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { db, User, WebsiteEvent, WebsiteEventType } from "@/lib/db";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { EventForm } from "../event-form";
|
||||
import { EventPrizesManager } from "./event-prizes";
|
||||
import { EventRegistrations } from "./event-registrations";
|
||||
@@ -28,22 +29,23 @@ export default async function EventDetailPage({
|
||||
const t = await getTranslations("pages.admin.events");
|
||||
const tHubs = await getTranslations("pages.admin.hubs");
|
||||
|
||||
const event = await prisma.websiteEvent.findUnique({
|
||||
where: { id: eventId },
|
||||
include: {
|
||||
const event = await db.query.WebsiteEvent.findFirst({
|
||||
where: eq(WebsiteEvent.id, eventId),
|
||||
with: {
|
||||
type: true,
|
||||
prizes: { orderBy: { position: "asc" } },
|
||||
winners: { orderBy: { position: "asc" } },
|
||||
registrations: { orderBy: { createdAt: "desc" } },
|
||||
prizes: { orderBy: (p, { asc: a }) => [a(p.position)] },
|
||||
winners: { orderBy: (w, { asc: a }) => [a(w.position)] },
|
||||
registrations: { orderBy: (r, { desc: d }) => [d(r.createdAt)] },
|
||||
},
|
||||
});
|
||||
|
||||
if (!event) notFound();
|
||||
|
||||
const eventTypes = await prisma.websiteEventType.findMany({
|
||||
where: { isActive: 1 },
|
||||
orderBy: { name: "asc" },
|
||||
});
|
||||
const eventTypes = await db
|
||||
.select()
|
||||
.from(WebsiteEventType)
|
||||
.where(eq(WebsiteEventType.isActive, 1))
|
||||
.orderBy(asc(WebsiteEventType.name));
|
||||
|
||||
// Fetch usernames for registrations and winners
|
||||
const userIds = [
|
||||
@@ -52,10 +54,10 @@ export default async function EventDetailPage({
|
||||
];
|
||||
const users =
|
||||
userIds.length > 0
|
||||
? await prisma.user.findMany({
|
||||
where: { id: { in: [...new Set(userIds)] } },
|
||||
select: { id: true, username: true },
|
||||
})
|
||||
? await db
|
||||
.select({ id: User.id, username: User.username })
|
||||
.from(User)
|
||||
.where(inArray(User.id, [...new Set(userIds)]))
|
||||
: [];
|
||||
const userMap = new Map(users.map((u) => [u.id, u.username]));
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { asc, eq } from "drizzle-orm";
|
||||
import { redirect } from "next/navigation";
|
||||
import { getTranslations } from "next-intl/server";
|
||||
import { db, WebsiteEventType } from "@/lib/db";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { EventForm } from "../event-form";
|
||||
|
||||
export default async function CreateEventPage() {
|
||||
@@ -11,10 +12,11 @@ export default async function CreateEventPage() {
|
||||
}
|
||||
|
||||
const t = await getTranslations("pages.admin.events");
|
||||
const eventTypes = await prisma.websiteEventType.findMany({
|
||||
where: { isActive: 1 },
|
||||
orderBy: { name: "asc" },
|
||||
});
|
||||
const eventTypes = await db
|
||||
.select()
|
||||
.from(WebsiteEventType)
|
||||
.where(eq(WebsiteEventType.isActive, 1))
|
||||
.orderBy(asc(WebsiteEventType.name));
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { asc } from "drizzle-orm";
|
||||
import { redirect } from "next/navigation";
|
||||
import { db, WebsiteEventType } from "@/lib/db";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { EventTypesManager } from "./event-types-manager";
|
||||
|
||||
export default async function EventTypesPage() {
|
||||
@@ -9,9 +10,10 @@ export default async function EventTypesPage() {
|
||||
redirect("/admin/events");
|
||||
}
|
||||
|
||||
const eventTypes = await prisma.websiteEventType.findMany({
|
||||
orderBy: { name: "asc" },
|
||||
});
|
||||
const eventTypes = await db
|
||||
.select()
|
||||
.from(WebsiteEventType)
|
||||
.orderBy(asc(WebsiteEventType.name));
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
|
||||
Reference in new issue
Block a user