🐛 Fix can’t delete user with deleted polls (#1405)

lukevella · Oct 20, 2024 · 82eb076 · 82eb076
1 parent 501cdd2
commit 82eb076
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
@@ -70,6 +70,7 @@ export const polls = router({
       return await prisma.poll.findMany({
         where: {
           userId: ctx.user.id,
+          deleted: false,
           status: input.status === "all" ? undefined : input.status,
         },
         orderBy: [
@@ -110,6 +111,7 @@ export const polls = router({
       const polls = await prisma.poll.findMany({
         where: {
           userId: ctx.user.id,
+          deleted: false,
           status: status === "all" ? undefined : status,
         },
         orderBy: [

diff --git a/apps/web/src/trpc/routers/user.ts b/apps/web/src/trpc/routers/user.ts
@@ -56,7 +56,9 @@ export const user = router({
     await prisma.$transaction(async (tx) => {
       const polls = await tx.poll.findMany({
         select: { id: true },
-        where: { userId: ctx.user.id },
+        where: {
+          userId: ctx.user.id,
+        },
       });
       const pollIds = polls.map((poll) => poll.id);
 

diff --git a/packages/database/index.ts b/packages/database/index.ts
@@ -3,19 +3,7 @@ import { PrismaClient } from "@prisma/client";
 export type * from "@prisma/client";
 
 const prismaClientSingleton = () => {
-  return new PrismaClient().$extends({
-    query: {
-      poll: {
-        findMany: ({ args, query }) => {
-          if (!args.where?.deleted) {
-            args.where = { ...args.where, deleted: false };
-          }
-
-          return query(args);
-        },
-      },
-    },
-  });
+  return new PrismaClient();
 };
 
 export type ExtendedPrismaClient = ReturnType<typeof prismaClientSingleton>;