REFACTORED - migrate the data layer from Prisma to Drizzle (unify the stack)

- Add lib/db (Drizzle schema: 7 tables + 6 enums + relations, postgres.js client), drizzle.config.ts, lib/db/enums.ts (Prisma-compatible enum objects) - Rewrite all 14 app consumers + 4 admin components to Drizzle - Move the test DB layer to Drizzle + in-process PGlite; convert all 8 integration test files + factories (371 tests green) - Remove Prisma: deps, prisma/ schema+migrations, lib/prisma.ts, Dockerfile prisma generate; wire db:generate/migrate/push/studio to drizzle-kit; update Makefile - Preserve the old seed as scripts/legacy-prisma-seed.cjs (needs a Drizzle rewrite)
2026-08-07 14:18:41 +02:00
parent e377877e7e
commit 0a5f77d8de
48 changed files with 3765 additions and 1358 deletions
@@ -1,6 +1,6 @@
 "use server";

-import { MediaKind } from "@prisma/client";
+import { MediaKind } from "@/lib/db/enums";
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { isRedirectError } from "next/dist/client/components/redirect-error";
@@ -11,7 +11,10 @@ import { withFlash } from "@/lib/admin-feedback";
 import { countMediaUsageReferences, getMediaAssetById } from "@/lib/media";
 import { createStandaloneMediaAsset, deleteMediaAssetAndFile } from "@/lib/media-service";
 import { isManagedMediaFilePath } from "@/lib/media-storage";
-import { prisma } from "@/lib/prisma";
+import { eq } from "drizzle-orm";
+
+import { db } from "@/lib/db";
+import { mediaAsset } from "@/lib/db/schema";

 async function ensureAdmin() {
  if (!(await isAdminAuthenticated())) {
@@ -71,11 +74,7 @@ export async function deleteMediaAssetAction(formData: FormData) {
      redirect(withFlash(getAdminAppPath("/media"), { error: "Datei wird noch verwendet." }));
    }

-    await prisma.mediaAsset.delete({
-      where: {
-        id: asset.id,
-      },
-    });
+    await db.delete(mediaAsset).where(eq(mediaAsset.id, asset.id));

    if (isManagedMediaFilePath(asset.url)) {
      await deleteMediaAssetAndFile({
@@ -1,6 +1,6 @@
 "use server";

-import { MediaUsageType, Prisma } from "@prisma/client";
+import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { isRedirectError } from "next/dist/client/components/redirect-error";
@@ -15,7 +15,16 @@ import { resolveMediaSelection } from "@/lib/media-service";
 import { getLocalizedPath } from "@/lib/locale";
 import { removeManagedMediaFile } from "@/lib/media-storage";
 import { mediaFieldInputSchema } from "@/lib/media-validation";
-import { prisma } from "@/lib/prisma";
+import { db } from "@/lib/db";
+import {
+  category,
+  mediaAsset,
+  mediaUsage,
+  portfolioAsset,
+  portfolioProject,
+  portfolioSection,
+} from "@/lib/db/schema";
+import { MediaUsageType } from "@/lib/db/enums";
 import { isCheckedFormValue } from "@/lib/form-data";
 import { getSiteSettings } from "@/lib/app-config";
 import {
@@ -81,6 +90,20 @@ function parseZodError(error: ZodError) {
  return error.issues[0]?.message ?? "Validierung fehlgeschlagen.";
 }

+// Postgres unique-violation (code 23505, was Prisma's "P2002"). The error shape
+// differs between drivers (postgres.js exposes `.code`; PGlite in tests nests it
+// or only in the message), so check code, cause.code, and the message text.
+function isUniqueViolation(error: unknown): boolean {
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+  const e = error as { code?: string; cause?: { code?: string }; message?: string };
+  if (e.code === "23505" || e.cause?.code === "23505") {
+    return true;
+  }
+  return typeof e.message === "string" && /23505|duplicate key|unique constraint/i.test(e.message);
+}
+
 async function revalidatePortfolioPages() {
  revalidatePath(toInternalAdminPath("/"));
  revalidatePath(toInternalAdminPath("/media"));
@@ -121,16 +144,9 @@ export async function upsertCategoryAction(formData: FormData) {
    });

    if (parsed.id) {
-      await prisma.category.update({
-        where: {
-          id: parsed.id,
-        },
-        data: parsed,
-      });
+      await db.update(category).set(parsed).where(eq(category.id, parsed.id));
    } else {
-      await prisma.category.create({
-        data: parsed,
-      });
+      await db.insert(category).values(parsed);
    }

    await revalidatePortfolioPages();
@@ -143,7 +159,7 @@ export async function upsertCategoryAction(formData: FormData) {
    const message =
      error instanceof ZodError
        ? parseZodError(error)
-        : error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2002"
+        : isUniqueViolation(error)
          ? "Kategorie Slug muss eindeutig sein."
          : "Kategorie konnte nicht gespeichert werden.";

@@ -158,21 +174,13 @@ export async function deleteCategoryAction(formData: FormData) {
  const id = String(formData.get("id") ?? "");

  try {
-    const projectCount = await prisma.portfolioProject.count({
-      where: {
-        categoryId: id,
-      },
-    });
+    const projectCount = await db.$count(portfolioProject, eq(portfolioProject.categoryId, id));

    if (projectCount > 0) {
      redirect(withFlash(redirectPath, { error: "Kategorie mit Projekten kann nicht geloescht werden." }));
    }

-    await prisma.category.delete({
-      where: {
-        id,
-      },
-    });
+    await db.delete(category).where(eq(category.id, id));

    await revalidatePortfolioPages();
    redirect(withFlash(redirectPath, { success: "Kategorie geloescht." }));
@@ -241,15 +249,16 @@ export async function saveProjectAction(formData: FormData) {
    });

    const existingProject = parsed.id
-      ? await prisma.portfolioProject.findUnique({
-          where: {
-            id: parsed.id,
-          },
-          select: {
-            isPublished: true,
-            publishedAt: true,
-          },
-        })
+      ? (
+          await db
+            .select({
+              isPublished: portfolioProject.isPublished,
+              publishedAt: portfolioProject.publishedAt,
+            })
+            .from(portfolioProject)
+            .where(eq(portfolioProject.id, parsed.id))
+            .limit(1)
+        )[0] ?? null
      : null;
    const shouldPublishNow = parsed.isPublished && !existingProject?.publishedAt;

@@ -359,81 +368,56 @@ export async function saveProjectAction(formData: FormData) {
      });
    }

-    const projectResult = await prisma.$transaction(async (tx) => {
-      const currentProject = parsed.id
-        ? await tx.portfolioProject.update({
-            where: {
-              id: parsed.id,
-            },
-            data: {
-              categoryId: parsed.categoryId,
-              slug: parsed.slug,
-              viewMode: parsed.viewMode,
-              titleAr: parsed.titleAr,
-              titleEn: parsed.titleEn,
-              titleDe: parsed.titleDe,
-              summaryAr: parsed.summaryAr,
-              summaryEn: parsed.summaryEn,
-              summaryDe: parsed.summaryDe,
-              clientName: parsed.clientName,
-              projectYear: parsed.projectYear,
-              serviceLabelAr: parsed.serviceLabelAr,
-              serviceLabelEn: parsed.serviceLabelEn,
-              serviceLabelDe: parsed.serviceLabelDe,
-              previewUrl: parsed.previewUrl || null,
-              coverImagePath: coverSelection.url || null,
-              isFeatured: parsed.isFeatured,
-              isPublished: parsed.isPublished,
+    const projectResult = await db.transaction(async (tx) => {
+      const projectValues = {
+        categoryId: parsed.categoryId,
+        slug: parsed.slug,
+        viewMode: parsed.viewMode,
+        titleAr: parsed.titleAr,
+        titleEn: parsed.titleEn,
+        titleDe: parsed.titleDe,
+        summaryAr: parsed.summaryAr,
+        summaryEn: parsed.summaryEn,
+        summaryDe: parsed.summaryDe,
+        clientName: parsed.clientName,
+        projectYear: parsed.projectYear,
+        serviceLabelAr: parsed.serviceLabelAr,
+        serviceLabelEn: parsed.serviceLabelEn,
+        serviceLabelDe: parsed.serviceLabelDe,
+        previewUrl: parsed.previewUrl || null,
+        coverImagePath: coverSelection.url || null,
+        isFeatured: parsed.isFeatured,
+        isPublished: parsed.isPublished,
+        sortOrder: parsed.sortOrder,
+      };
+
+      const [currentProject] = parsed.id
+        ? await tx
+            .update(portfolioProject)
+            .set({
+              ...projectValues,
              publishedAt: parsed.isPublished
                ? shouldPublishNow
                  ? new Date()
                  : existingProject?.publishedAt ?? new Date()
                : null,
-              sortOrder: parsed.sortOrder,
-            },
-          })
-        : await tx.portfolioProject.create({
-            data: {
-              categoryId: parsed.categoryId,
-              slug: parsed.slug,
-              viewMode: parsed.viewMode,
-              titleAr: parsed.titleAr,
-              titleEn: parsed.titleEn,
-              titleDe: parsed.titleDe,
-              summaryAr: parsed.summaryAr,
-              summaryEn: parsed.summaryEn,
-              summaryDe: parsed.summaryDe,
-              clientName: parsed.clientName,
-              projectYear: parsed.projectYear,
-              serviceLabelAr: parsed.serviceLabelAr,
-              serviceLabelEn: parsed.serviceLabelEn,
-              serviceLabelDe: parsed.serviceLabelDe,
-              previewUrl: parsed.previewUrl || null,
-              coverImagePath: coverSelection.url || null,
-              isFeatured: parsed.isFeatured,
-              isPublished: parsed.isPublished,
-              publishedAt: parsed.isPublished ? new Date() : null,
-              sortOrder: parsed.sortOrder,
-            },
-          });
+            })
+            .where(eq(portfolioProject.id, parsed.id))
+            .returning()
+        : await tx
+            .insert(portfolioProject)
+            .values({ ...projectValues, publishedAt: parsed.isPublished ? new Date() : null })
+            .returning();

-      await tx.portfolioSection.deleteMany({
-        where: {
-          projectId: currentProject.id,
-        },
-      });
-
-      await tx.portfolioAsset.deleteMany({
-        where: {
-          projectId: currentProject.id,
-        },
-      });
+      await tx.delete(portfolioSection).where(eq(portfolioSection.projectId, currentProject.id));
+      await tx.delete(portfolioAsset).where(eq(portfolioAsset.projectId, currentProject.id));

      const createdSections = [];

      for (const section of sectionRows) {
-        const createdSection = await tx.portfolioSection.create({
-          data: {
+        const [createdSection] = await tx
+          .insert(portfolioSection)
+          .values({
            projectId: currentProject.id,
            type: section.type,
            titleAr: section.titleAr,
@@ -445,8 +429,8 @@ export async function saveProjectAction(formData: FormData) {
            imagePath: section.imagePath || null,
            linkUrl: section.linkUrl || null,
            sortOrder: section.sortOrder,
-          },
-        });
+          })
+          .returning();

        createdSections.push(createdSection);
      }
@@ -454,8 +438,9 @@ export async function saveProjectAction(formData: FormData) {
      const createdAssets = [];

      for (const asset of assetRows) {
-        const createdAsset = await tx.portfolioAsset.create({
-          data: {
+        const [createdAsset] = await tx
+          .insert(portfolioAsset)
+          .values({
            projectId: currentProject.id,
            kind: asset.kind,
            filePath: asset.filePath,
@@ -463,8 +448,8 @@ export async function saveProjectAction(formData: FormData) {
            altEn: asset.altEn,
            altDe: asset.altDe,
            sortOrder: asset.sortOrder,
-          },
-        });
+          })
+          .returning();

        createdAssets.push(createdAsset);
      }
@@ -536,7 +521,7 @@ export async function saveProjectAction(formData: FormData) {
    const message =
      error instanceof ZodError
        ? parseZodError(error)
-        : error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2002"
+        : isUniqueViolation(error)
          ? "Projekt Slug muss eindeutig sein."
          : error instanceof Error
            ? error.message
@@ -544,20 +529,8 @@ export async function saveProjectAction(formData: FormData) {

    await removeManagedPaths(uploadedPaths);
    if (createdMediaAssetIds.length > 0) {
-      await prisma.mediaUsage.deleteMany({
-        where: {
-          assetId: {
-            in: createdMediaAssetIds,
-          },
-        },
-      });
-      await prisma.mediaAsset.deleteMany({
-        where: {
-          id: {
-            in: createdMediaAssetIds,
-          },
-        },
-      });
+      await db.delete(mediaUsage).where(inArray(mediaUsage.assetId, createdMediaAssetIds));
+      await db.delete(mediaAsset).where(inArray(mediaAsset.id, createdMediaAssetIds));
    }
    redirect(withFlash(redirectPath, { error: message }));
  }
@@ -569,24 +542,17 @@ export async function deleteProjectAction(formData: FormData) {
  const id = String(formData.get("id") ?? "");

  try {
-    const project = await prisma.portfolioProject.findUnique({
-      where: {
-        id,
-      },
-      select: {
-        slug: true,
-      },
-    });
+    const [project] = await db
+      .select({ slug: portfolioProject.slug })
+      .from(portfolioProject)
+      .where(eq(portfolioProject.id, id))
+      .limit(1);

    if (!project) {
      redirect(withFlash(getAdminAppPath("/portfolio"), { error: "Projekt nicht gefunden." }));
    }

-    await prisma.portfolioProject.delete({
-      where: {
-        id,
-      },
-    });
+    await db.delete(portfolioProject).where(eq(portfolioProject.id, id));
    await deleteEntityMediaUsages("portfolio-project", id);

    await revalidatePortfolioPages();
@@ -1,6 +1,6 @@
 "use server";

-import { MediaUsageType } from "@prisma/client";
+import { MediaUsageType } from "@/lib/db/enums";
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { isRedirectError } from "next/dist/client/components/redirect-error";
@@ -30,7 +30,10 @@ import { routing } from "@/i18n/routing";
 import { getLocalizedPath } from "@/lib/locale";
 import { removeManagedMediaFile } from "@/lib/media-storage";
 import { mediaFieldInputSchema } from "@/lib/media-validation";
-import { prisma } from "@/lib/prisma";
+import { inArray } from "drizzle-orm";
+
+import { db } from "@/lib/db";
+import { mediaAsset } from "@/lib/db/schema";

 async function ensureAdmin() {
  if (!(await isAdminAuthenticated())) {
@@ -60,13 +63,7 @@ function parseJsonObject(rawValue: FormDataEntryValue | null, key: string) {

 async function cleanupCreatedMedia(assetIds: string[], uploadedPaths: string[]) {
  if (assetIds.length > 0) {
-    await prisma.mediaAsset.deleteMany({
-      where: {
-        id: {
-          in: Array.from(new Set(assetIds)),
-        },
-      },
-    });
+    await db.delete(mediaAsset).where(inArray(mediaAsset.id, Array.from(new Set(assetIds))));
  }

  for (const filePath of Array.from(new Set(uploadedPaths.filter(Boolean)))) {
@@ -1,4 +1,4 @@
-import { MediaKind } from "@prisma/client";
+import { MediaKind } from "@/lib/db/enums";
 import { redirect } from "next/navigation";

 import { MotionFade } from "@/components/motion-fade";
@@ -1,6 +1,7 @@
+import { sql } from "drizzle-orm";
 import { NextResponse } from "next/server";

-import { prisma } from "@/lib/prisma";
+import { db } from "@/lib/db";

 export const dynamic = "force-dynamic";

@@ -8,7 +9,7 @@ export async function GET() {
  const timestamp = new Date().toISOString();

  try {
-    await prisma.$queryRaw`SELECT 1`;
+    await db.execute(sql`SELECT 1`);

    return NextResponse.json(
      {