From 82eb076c71450b0c0d3dc50906a3e1697cbf9ed7 Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Sun, 20 Oct 2024 21:00:59 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20can=E2=80=99t=20delete=20u?=
 =?UTF-8?q?ser=20with=20deleted=20polls=20(#1405)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/trpc/routers/polls.ts |  2 ++
 apps/web/src/trpc/routers/user.ts  |  4 +++-
 packages/database/index.ts         | 14 +-------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index d53f5ce6c..c6aa6b83f 100644
--- 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
index 1a3b426fc..cc34542b5 100644
--- 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
index a18895cbe..7ddafdec1 100644
--- 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>;