delete user and chapter request when accepted

JumboCode · Apr 11, 2024 · 3f8d1eb · 3f8d1eb
1 parent 820221b
commit 3f8d1eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/app/api/handle-chapter-request/route.ts b/src/app/api/handle-chapter-request/route.ts
@@ -62,13 +62,10 @@ export const POST = withSession(async ({ req, session }) => {
             location: chapterRequest.universityAddress,
           },
         });
-        await prisma.chapterRequest.update({
+        await prisma.chapterRequest.delete({
           where: {
             id: body.chapterRequestId,
           },
-          data: {
-            approved: "APPROVED",
-          },
         });
 
         const baseFolder = env.GOOGLE_BASEFOLDER; // TODO: make env variable

diff --git a/src/app/api/user-request/route.ts b/src/app/api/user-request/route.ts
@@ -157,6 +157,7 @@ export const DELETE = withSession(async ({ req, session }) => {
 
 export const PATCH = withSession(async ({ req, session }) => {
   try {
+    console.log("1");
     const approveChapterReq = ManageChapterRequest.safeParse(await req.json());
     if (!approveChapterReq.success) {
       return NextResponse.json(
@@ -168,12 +169,14 @@ export const PATCH = withSession(async ({ req, session }) => {
       );
     }
     const targetUID = approveChapterReq.data.userId;
+    console.log(targetUID);
     const target = await prisma.user.findFirst({
       where: {
         id: targetUID,
       },
     });
     if (target == null) {
+      console.log("2");
       return NextResponse.json(
         ManageChapterRequestResponse.parse({
           code: "INVALID_REQUEST",
@@ -188,6 +191,7 @@ export const PATCH = withSession(async ({ req, session }) => {
       },
     });
     if (approveChapterRequest == null) {
+      console.log("3");
       return NextResponse.json(
         ManageChapterRequestResponse.parse({
           code: "INVALID_REQUEST",
@@ -200,6 +204,7 @@ export const PATCH = withSession(async ({ req, session }) => {
       session.user.role === "ADMIN" ||
       (session.user.role === "CHAPTER_LEADER" &&
         session.user.ChapterID === approveChapterRequest.chapterId);
+    console.log(canApprove);
     if (!canApprove) {
       return NextResponse.json(
         ManageChapterRequestResponse.parse({
@@ -209,13 +214,10 @@ export const PATCH = withSession(async ({ req, session }) => {
         { status: 400 }
       );
     }
-    await prisma.userRequest.update({
+    await prisma.userRequest.delete({
       where: {
         uid: targetUID,
       },
-      data: {
-        approved: "APPROVED",
-      },
     });
     const user = await prisma.user.update({
       where: {

diff --git a/src/components/DisplayChapterInfo.tsx b/src/components/DisplayChapterInfo.tsx
@@ -119,7 +119,7 @@ const DisplayChapterInfo = ({
                     <PendingCard
                       key={user.id}
                       name={fullName(user.user)}
-                      uid={user.id}
+                      uid={user.uid}
                     />
                   );
                 })}