Fix the volunteer log bug and add better error

handling
ChangePlusPlusVandy · Apr 16, 2024 · 53eacd2 · 53eacd2
1 parent 9f64c99
commit 53eacd2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/api/admin/index.ts b/pages/api/admin/index.ts
@@ -33,11 +33,10 @@ export default async function handler(
     case 'POST':
       try {
         if (session.user.status !== 'superadmin') {
-          res.status(200).json({
+          return res.status(200).json({
             message: 'Sorry, only super admin is allowed to create new admins',
             status: 'error',
           });
-          throw new Error('Only super admin is allowed to create new admins');
         }
         // start a try catch block to catch any errors in parsing the request body
         const admin = req.body as QueriedAdminData;
@@ -47,7 +46,7 @@ export default async function handler(
 
         // Check if the user's email and password are valid
         if (!email || !email.includes('@') || !password) {
-          res
+          return res
             .status(200)
             .json({ message: 'Invalid email or password', status: 'error' });
         }
@@ -62,10 +61,9 @@ export default async function handler(
 
         // If the user already exists, return an error
         if (checkExisting) {
-          res
+          return res
             .status(200)
             .json({ message: 'Admin email already exists', status: 'error' });
-          throw new Error('Admin email already exists');
         }
 
         // Hash the user's password

diff --git a/pages/api/volunteer-logs/approved.ts b/pages/api/volunteer-logs/approved.ts
@@ -1,4 +1,6 @@
 import dbConnect from '@/lib/dbConnect';
+import Users from 'bookem-shared/src/models/Users';
+import VolunteerEvents from 'bookem-shared/src/models/VolunteerEvents';
 import VolunteerLogs from 'bookem-shared/src/models/VolunteerLogs';
 import { QueriedVolunteerLogDTO } from 'bookem-shared/src/types/database';
 import { NextApiRequest, NextApiResponse } from 'next';
@@ -14,6 +16,8 @@ export default async function handler(
         await dbConnect();
 
         // TODO: remove this after development
+        await Users.find();
+        await VolunteerEvents.find();
 
         const logs = (await VolunteerLogs.find({ status: 'approved' })
           .populate({ path: 'user' })

diff --git a/pages/api/volunteer-logs/index.ts b/pages/api/volunteer-logs/index.ts
@@ -18,6 +18,8 @@ export default async function handler(
         await dbConnect();
 
         // TODO: remove this after development
+        await Users.find();
+        await VolunteerEvents.find();
 
         const logs = (await VolunteerLogs.find()
           .populate({ path: 'user' })

diff --git a/pages/api/volunteer-logs/pending.ts b/pages/api/volunteer-logs/pending.ts
@@ -1,4 +1,6 @@
 import dbConnect from '@/lib/dbConnect';
+import Users from 'bookem-shared/src/models/Users';
+import VolunteerEvents from 'bookem-shared/src/models/VolunteerEvents';
 import VolunteerLogs from 'bookem-shared/src/models/VolunteerLogs';
 import { QueriedVolunteerLogDTO } from 'bookem-shared/src/types/database';
 import { NextApiRequest, NextApiResponse } from 'next';
@@ -14,6 +16,8 @@ export default async function handler(
         await dbConnect();
 
         // TODO: remove this after development
+        await Users.find();
+        await VolunteerEvents.find();
 
         const logs = (await VolunteerLogs.find({ status: 'pending' })
           .populate({ path: 'user' })

diff --git a/pages/api/volunteer-logs/rejected.ts b/pages/api/volunteer-logs/rejected.ts
@@ -1,4 +1,6 @@
 import dbConnect from '@/lib/dbConnect';
+import Users from 'bookem-shared/src/models/Users';
+import VolunteerEvents from 'bookem-shared/src/models/VolunteerEvents';
 import VolunteerLogs from 'bookem-shared/src/models/VolunteerLogs';
 import { QueriedVolunteerLogDTO } from 'bookem-shared/src/types/database';
 import { NextApiRequest, NextApiResponse } from 'next';
@@ -14,6 +16,8 @@ export default async function handler(
         await dbConnect();
 
         // TODO: remove this after development
+        await Users.find();
+        await VolunteerEvents.find();
 
         const logs = (await VolunteerLogs.find({ status: 'rejected' })
           .populate({ path: 'user' })