Small Bug Fixes

prisma/schema.prisma

@@ -35,8 +35,6 @@ model User {
   organizationId     String?            @db.ObjectId
   organization       Organization?      @relation(fields: [organizationId], references: [id])
   code               Code?
-  eventIds           String[]           @db.ObjectId
-  events             Event[]            @relation(fields: [eventIds], references: [id])
   timeSlots          TimeSlot[]
   volunteerSessions   VolunteerSession[]
 }
@@ -82,16 +80,6 @@ model Code {
   userId             String             @unique @db.ObjectId
 }
 
-model Event {
-  id                 String             @id @default(auto()) @map("_id") @db.ObjectId
-  userIds            String[]           @db.ObjectId
-  users              User[]             @relation(fields: [userIds], references: [id])
-  eventName          String             @default("")
-  dateTime           DateTime           @default(now())
-  description        String             @default("")
-  maxPeople          Int                @default(0)
-}
-
 model Organization {
   id                 String             @id @default(auto()) @map("_id") @db.ObjectId
   name               String             @unique

src/app/api/organization/route.client.ts

@@ -39,3 +39,8 @@ export const getOrganizations = async () => {
   const url = `/api/organization`;
   return fetchApi(url, "GET");
 };
+
+export const deleteOrganization = async (organizationId: string) => {
+  const url = `/api/organization?id=${organizationId}`;
+  return fetchApi(url, "DELETE");
+};

src/app/api/organization/route.ts

@@ -107,3 +107,53 @@ export const GET = async (request: NextRequest) => {
     );
   }
 };
+
+export const DELETE = async (request: NextRequest) => {
+  const { searchParams } = new URL(request.url);
+  const id = searchParams.get("id");
+
+  if (!id) {
+    return NextResponse.json(
+      { code: "BAD_REQUEST", message: "Organization ID is required." },
+      { status: 400 }
+    );
+  }
+
+  try {
+    await prisma.$transaction(async (tx) => {
+      // Nullify organizationId for Users
+      await tx.user.updateMany({
+        where: { organizationId: id },
+        data: { organizationId: null },
+      });
+
+      // Nullify organizationId for TimeSlots
+      await tx.timeSlot.updateMany({
+        where: { organizationId: id },
+        data: { organizationId: null },
+      });
+
+      // Nullify organizationId for VolunteerSessions
+      await tx.volunteerSession.updateMany({
+        where: { organizationId: id },
+        data: { organizationId: null },
+      });
+
+      // Delete the Organization
+      await tx.organization.delete({
+        where: { id },
+      });
+    });
+
+    return NextResponse.json(
+      { code: "SUCCESS", message: "Organization deleted successfully." },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error("Error deleting organization:", error);
+    return NextResponse.json(
+      { code: "ERROR", message: "Failed to delete organization." },
+      { status: 500 }
+    );
+  }
+};

src/app/api/user/route.ts

@@ -95,24 +95,79 @@ export const DELETE = async (request: NextRequest) => {
     );
   }
 
+  // @TODO: If there is time figure out the logic for removing user while preserving previous time slots/sessions
   try {
-    await prisma.code.delete({
-      where: { userId: id },
-    });
+    await prisma.$transaction(async (tx) => {
+      // Delete TimeSlots where organizationId is null
+      // await tx.timeSlot.deleteMany({
+      //   where: {
+      //     userId: id,
+      //     organizationId: null,
+      //   },
+      // });
+
+      // Delete VolunteerSessions where organizationId is null
+      // await tx.volunteerSession.deleteMany({
+      //   where: {
+      //     userId: id,
+      //     organizationId: null,
+      //   },
+      // });
+
+      // For TimeSlots with organizationId, nullify userId
+      // await tx.timeSlot.updateMany({
+      //   where: {
+      //     userId: id,
+      //     NOT: {
+      //       organizationId: null,
+      //     },
+      //   },
+      //   data: {
+      //     userId: undefined, // nullify userId
+      //   },
+      // });
+
+      // For VolunteerSessions with organizationId, nullify userId
+      // await tx.volunteerSession.updateMany({
+      //   where: {
+      //     userId: id,
+      //     NOT: {
+      //       organizationId: null,
+      //     },
+      //   },
+      //   data: {
+      //     userId: undefined, // nullify userId
+      //   },
+      // });
+
+      await tx.timeSlot.deleteMany({
+        where: { userId: id },
+      });
 
-    await prisma.volunteerDetails.delete({
-      where: { userId: id },
-    });
+      await tx.volunteerSession.deleteMany({
+        where: { userId: id },
+      });
 
-    const deletedUser = await prisma.user.delete({
-      where: { id },
+      // Delete related Code
+      await tx.code.deleteMany({
+        where: { userId: id },
+      });
+
+      // Delete related VolunteerDetails
+      await tx.volunteerDetails.deleteMany({
+        where: { userId: id },
+      });
+
+      // Delete the User
+      await tx.user.delete({
+        where: { id },
+      });
     });
 
     return NextResponse.json(
       {
         code: "SUCCESS",
         message: "User deleted successfully",
-        data: deletedUser,
       },
       { status: 200 }
     );