Merge branch 'main' of https://github.com/UTDallasEPICS/Kids-U-Donor-…

…Volunteer-Database
UTDallasEPICS · Dec 13, 2024 · 9da05a9 · 9da05a9
2 parents c18b7c3 + 52ba777
commit 9da05a9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/app/(pages)/Donations/page.tsx b/app/(pages)/Donations/page.tsx
@@ -62,6 +62,13 @@ export default function DonationsList() {
       const response = await fetch("/api/donations", {
         method: "GET",
       });
+
+      if (!response.ok) {
+        const errorData = await response.json();
+        const message = errorData?.message || "Something went wrong";
+        throw new Error(message);
+      }
+
       const result = await response.json();
 
       setData(result.data);

diff --git a/app/(pages)/Donors/page.tsx b/app/(pages)/Donors/page.tsx
@@ -52,6 +52,13 @@ export default function DonorsList() {
       const response = await fetch("/api/donors", {
         method: "GET",
       });
+
+      if (!response.ok) {
+        const errorData = await response.json();
+        const message = errorData?.message || "Something went wrong";
+        throw new Error(message);
+      }
+
       const result = await response.json();
 
       setData(result.data);

diff --git a/app/api/donations/route.ts b/app/api/donations/route.ts
@@ -107,7 +107,12 @@ export async function POST(req: NextRequest) {
 
 // Read
 export async function GET() {
-  const data = await prisma.donation.findMany();
+  try {
+    const data = await prisma.donation.findMany();
 
-  return NextResponse.json({ message: "Successful fetch", data: data }, { status: 200 });
+    return NextResponse.json({ message: "Successful fetch", data: data }, { status: 200 });
+  } catch (error) {
+    console.error("Error fetching donations:", error);
+    return NextResponse.json({ message: "Failed to fetch donations", error: error }, { status: 500 });
+  }
 }
diff --git a/app/api/donors/route.ts b/app/api/donors/route.ts
@@ -81,7 +81,12 @@ export async function POST(req: NextRequest) {
 
 // Read
 export async function GET() {
-  const data = await prisma.donor.findMany();
+  try {
+    const data = await prisma.donor.findMany();
 
-  return NextResponse.json({ message: "GET REQUEST", data: data }, { status: 200 });
+    return NextResponse.json({ message: "Successful fetch", data: data }, { status: 200 });
+  } catch (error) {
+    console.error("Error fetching donations:", error);
+    return NextResponse.json({ message: "Failed to fetch donors", error: error }, { status: 500 });
+  }
 }