Fix merge conflicts

JumboCode · Apr 28, 2024 · 4bdbdf7 · 4bdbdf7
1 parent 0ba3b61
commit 4bdbdf7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -99,7 +99,6 @@ model Senior {
   Files       File[]
   ChapterID   String   @db.ObjectId
   chapter     Chapter  @relation(fields: [ChapterID], references: [id], onDelete: Cascade)
-  chapter     Chapter  @relation(fields: [ChapterID], references: [id], onDelete: Cascade)
 }
 
 model File {
@@ -134,8 +133,6 @@ model ChapterRequest {
   questions            String
 
   chapter              Chapter?
-
-  chapter              Chapter?
 }
 
 model Chapter {

diff --git a/src/app/api/chapter/[chapterId]/route.ts b/src/app/api/chapter/[chapterId]/route.ts
@@ -14,10 +14,6 @@ export const DELETE = withSessionAndRole(["ADMIN"], async ({ params }) => {
       students: true,
       seniors: true,
     },
-    include: {
-      students: true,
-      seniors: true,
-    },
   });
 
   if (chapter == null) {
@@ -46,11 +42,11 @@ export const DELETE = withSessionAndRole(["ADMIN"], async ({ params }) => {
     },
     data: {
       SeniorIDs: {
-        set: []
+        set: [],
       },
       position: "",
-      role: "USER"
-    }
+      role: "USER",
+    },
   });
 
   await prisma.chapterRequest.delete({