From a579328b865ef4d5b318404277a706dfbe028477 Mon Sep 17 00:00:00 2001
From: Jacqueline <jacqueline.cai2004@gmail.com>
Date: Sat, 25 May 2024 12:08:26 -0700
Subject: [PATCH 1/6] Added button for updating subjects

---
 client/src/modules/Admin/Components/Admin.tsx | 38 ++++++++-
 server/scripts/populate-subjects.ts           | 82 ++++++++++---------
 server/src/admin/admin.controller.ts          | 22 ++++-
 server/src/admin/admin.data-access.ts         | 18 ++--
 server/src/admin/admin.router.ts              | 40 ++++++---
 5 files changed, 134 insertions(+), 66 deletions(-)

diff --git a/client/src/modules/Admin/Components/Admin.tsx b/client/src/modules/Admin/Components/Admin.tsx
index ff76f116..d6a5497b 100644
--- a/client/src/modules/Admin/Components/Admin.tsx
+++ b/client/src/modules/Admin/Components/Admin.tsx
@@ -27,6 +27,7 @@ export const Admin = () => {
   const [loadingSemester, setLoadingSemester] = useState<number>(0)
   const [loadingProfs, setLoadingProfs] = useState<number>(0)
   const [resettingProfs, setResettingProfs] = useState<number>(0)
+  const [updatingSubjects, setUpdatingSubjects] = useState<number>(0)
   const [addSemester, setAddSemester] = useState('')
   const [isAdminModalOpen, setIsAdminModalOpen] = useState<boolean>(false)
 
@@ -53,7 +54,7 @@ export const Admin = () => {
   // splits the reviews into three categories: approved (visible on the website),
   // pending (awaiting approval), and reported (hidden and awaiting approval)
   useEffect(() => {
-    async function loadReviews() { 
+    async function loadReviews() {
       const pending = await axios.post('/api/admin/reviews/get/pending', {
         token: token,
       })
@@ -107,7 +108,7 @@ export const Admin = () => {
             review,
             pendingReviews
           )
-        setPendingReviews(updatedUnapprovedReviews)
+          setPendingReviews(updatedUnapprovedReviews)
         } else {
           const updatedReportedReviews = removeReviewFromList(
             review,
@@ -123,7 +124,7 @@ export const Admin = () => {
 
   // Call when admin would like to mass-approve all of the currently pending reviews.
   async function approveAllReviews(reviews: Review[]) {
-    const response = await axios.post('/api/admin/reviews/approve/all', {token: token})
+    const response = await axios.post('/api/admin/reviews/approve/all', { token: token })
     if (response.status === 200) {
       setPendingReviews([])
     } else {
@@ -235,6 +236,20 @@ export const Admin = () => {
     })
   }
 
+  function updateSubjects() {
+    setDisableInit(true);
+    setUpdatingSubjects(1);
+    axios.post('/api/admin/subjects/update', { token: token }).then((response) => {
+      if (response.status === 200) {
+        console.log('Updated all subject names');
+        setDisableInit(false);
+        setUpdatingSubjects(2);
+      } else {
+        console.log('Error at updateSubjects');
+      }
+    })
+  }
+
   // handle the first click to the "Initialize Database" button. Show an alert
   // and update state to remember the next click will be a double click.
   function firstClickHandler() {
@@ -319,6 +334,14 @@ export const Admin = () => {
               >
                 Reset Professors
               </button>
+              <button
+                disabled={disableInit}
+                type="button"
+                className={styles.adminButtons}
+                onClick={() => updateSubjects()}
+              >
+                Update Subjects
+              </button>
               {renderInitButton(doubleClick)}
             </div>
           </div>
@@ -357,6 +380,15 @@ export const Admin = () => {
             <p>Professor data import to Classes is complete!</p>
           </div>
 
+          <div hidden={!(updatingSubjects === 1)} className="">
+            <p>Updating subject data to Classes.</p>
+            <p>This process can take up to 15 minutes.</p>
+          </div>
+
+          <div hidden={!(updatingSubjects === 2)} className="">
+            <p>Subject data import to Classes is complete!</p>
+          </div>
+
           <div hidden={!(loadingInit === 1)} className="">
             <p>
               Database Initializing. This process can take up to 15 minutes.
diff --git a/server/scripts/populate-subjects.ts b/server/scripts/populate-subjects.ts
index 320247b1..1f608f50 100644
--- a/server/scripts/populate-subjects.ts
+++ b/server/scripts/populate-subjects.ts
@@ -41,56 +41,58 @@ export const fetchSubjects = async (
  * Updates existing Subject in collection with new semester
  *
  * @param {string} endpoint: base url for fetching courses in a particular subject from Course API
- * @param {string} semester: course roster semester for (i.e FA23)
+ * @param {string[]} semesters: all available course roster semesters
  * @returns subject on success, null if there was an error
  */
 export const fetchAddSubjects = async (
   endpoint: string,
-  semester: string,
+  semesters: string[],
 ): Promise<boolean> => {
-  const subjects = await fetchSubjects(endpoint, semester);
-
-  if (subjects === null) {
-    return false;
-  }
+  for (const semester in semesters) {
+    const subjects = await fetchSubjects(endpoint, semester);
 
-  await Promise.all(
-    subjects.map(async (subject) => {
-      const subjectExists = await Subjects.findOne({
-        subShort: subject.value.toLowerCase(),
-      }).exec();
+    if (subjects === null) {
+      return false;
+    }
 
-      if (!subjectExists) {
-        const res = await new Subjects({
-          _id: shortid.generate(),
+    await Promise.all(
+      subjects.map(async (subject) => {
+        const subjectExists = await Subjects.findOne({
           subShort: subject.value.toLowerCase(),
-          subFull: subject.descrformal,
-        })
-          .save()
-          .catch((err) => {
-            console.log(err);
+        }).exec();
+
+        if (!subjectExists) {
+          const res = await new Subjects({
+            _id: shortid.generate(),
+            subShort: subject.value.toLowerCase(),
+            subFull: subject.descrformal,
+          })
+            .save()
+            .catch((err) => {
+              console.log(err);
+              return false;
+            });
+
+          if (!res) {
+            return false;
+          }
+        } else {
+          // Update with descrformal name
+          await Subjects.updateOne(
+            { subShort: subject.value.toLowerCase() },
+            {
+              $set: {
+                subFull: subject.descrformal
+              }
+            }
+          ).catch((err) => {
+            console.log(`Error updating subject ${subject.value}: ${err}`);
             return false;
           });
-
-        if (!res) {
-          return false;
         }
-      } else {
-        // Update with descrformal name
-        await Subjects.updateOne(
-          { subShort: subject.value.toLowerCase() },
-          {
-            $set: {
-              subFull: subject.descrformal
-            }
-          }
-        ).catch((err) => {
-          console.log(`Error updating subject ${subject.value}: ${err}`);
-          return false;
-        });
-      }
-    }),
-  );
+      }),
+    );
 
-  return true;
+    return true;
+  }
 };
diff --git a/server/src/admin/admin.controller.ts b/server/src/admin/admin.controller.ts
index 0dda893f..71161e3b 100644
--- a/server/src/admin/admin.controller.ts
+++ b/server/src/admin/admin.controller.ts
@@ -42,6 +42,7 @@ import {
   addCrossList,
   addNewSemester,
 } from '../../scripts';
+import { fetchAddSubjects } from '../../scripts/populate-subjects';
 
 /**
  * Reports a review by setting its visibility to only admin and updating reported count.
@@ -221,7 +222,7 @@ export const getAdminUsers = async ({ auth }: VerifyAdminType) => {
  * @param {string} id: String identifying the user in the database
  * @returns all admin users if operation was successful, null otherwise
  */
-export const removeAdmin = async ({auth, id}: VerifyManageAdminType) => {
+export const removeAdmin = async ({ auth, id }: VerifyManageAdminType) => {
   const userIsAdmin = await verifyTokenAdmin({ auth });
   if (userIsAdmin) {
     const res = await removeAdminPrivilege(id);
@@ -237,7 +238,7 @@ export const removeAdmin = async ({auth, id}: VerifyManageAdminType) => {
  * @param {string} id: String identifying the user by netid
  * @returns The user with updated admin privilege if operation was successful, null otherwise
  */
-export const addOrUpdateAdmin = async ({auth, id}: VerifyManageAdminType) => {
+export const addOrUpdateAdmin = async ({ auth, id }: VerifyManageAdminType) => {
   const userIsAdmin = await verifyTokenAdmin({ auth });
   if (userIsAdmin) {
     let res = await grantAdminPrivilege(id);
@@ -278,6 +279,23 @@ export const resetAllProfessorsDb = async ({ auth }: VerifyAdminType) => {
   return result;
 };
 
+/**
+ * Updates all subjects in the database to represent their full subject names
+ * @param {Auth} auth: Object that represents the authentication of a request being passed in.
+ * @returns true if operation was successful, false if operations was not successful, null if token not admin
+ */
+export const updateSubjectsDb = async ({ auth }: VerifyAdminType) => {
+  const userIsAdmin = verifyTokenAdmin({ auth });
+  if (!userIsAdmin) {
+    return null;
+  }
+
+  const semesters = await findAllSemesters();
+  const result = await fetchAddSubjects(COURSE_API_BASE_URL, semesters);
+
+  return result;
+}
+
 /**
  * Helper function to get metrics associated with a course
  *
diff --git a/server/src/admin/admin.data-access.ts b/server/src/admin/admin.data-access.ts
index a6062860..48834814 100644
--- a/server/src/admin/admin.data-access.ts
+++ b/server/src/admin/admin.data-access.ts
@@ -36,7 +36,7 @@ export const updateCourseMetrics = async (
  */
 export const findPendingReviews = async () =>
   await Reviews.find(
-    { visible: 0, reported: 0},
+    { visible: 0, reported: 0 },
     {},
     { sort: { date: -1 }, limit: 700 },
   ).exec();
@@ -46,7 +46,7 @@ export const findPendingReviews = async () =>
  */
 export const findReportedReviews = async () =>
   await Reviews.find(
-    { visible: 0, reported: 1},
+    { visible: 0, reported: 1 },
     {},
     { sort: { date: -1 }, limit: 700 },
   ).exec();
@@ -55,9 +55,9 @@ export const findReportedReviews = async () =>
  * Function to count reviews by approved, pending, and reported and return the values.
  */
 export const findReviewCounts = async () => {
-  const approvedCount = await Reviews.countDocuments({ visible : 1}).exec()
-  const pendingCount = await Reviews.countDocuments({ visible: 0, reported: 0}).exec()
-  const reportedCount = await Reviews.countDocuments({ visible: 0, reported: 1}).exec()
+  const approvedCount = await Reviews.countDocuments({ visible: 1 }).exec()
+  const pendingCount = await Reviews.countDocuments({ visible: 0, reported: 0 }).exec()
+  const reportedCount = await Reviews.countDocuments({ visible: 0, reported: 1 }).exec()
   const result = {
     approved: approvedCount,
     pending: pendingCount,
@@ -71,7 +71,7 @@ export const findReviewCounts = async () => {
  * Count per class is mapped to a CSV string format.
  */
 export const createCourseCSV = async () => {
-  const approvedReviews = await Reviews.find({ visible: 1}).exec()
+  const approvedReviews = await Reviews.find({ visible: 1 }).exec()
   let csv = 'Class,Number of Reviews\n'
 
   const revsPerCourse: Map<string, number> = new Map()
@@ -126,12 +126,12 @@ export const findAdminUsers = async () => {
 }
 
 export const removeAdminPrivilege = async (id: string) => {
-  const res = await Students.updateOne({ netId: id }, { $set: {privilege: 'regular'} }).exec()
+  const res = await Students.updateOne({ netId: id }, { $set: { privilege: 'regular' } }).exec()
   return res
 }
 
 export const grantAdminPrivilege = async (id: string) => {
-  const res = await Students.updateOne({ netId: id }, { $set: {privilege: "admin"} }).exec()
+  const res = await Students.updateOne({ netId: id }, { $set: { privilege: "admin" } }).exec()
   return res
 }
 
@@ -151,7 +151,7 @@ export const createNewAdminUser = async (id: string) => {
     token: '',
     privilege: 'admin',
   };
-  
+
   const newAdmin = new Students(admin);
   const res = await newAdmin.save();
 
diff --git a/server/src/admin/admin.router.ts b/server/src/admin/admin.router.ts
index c7fda141..e3ef2210 100644
--- a/server/src/admin/admin.router.ts
+++ b/server/src/admin/admin.router.ts
@@ -5,7 +5,6 @@ import {
   AdminReviewRequestType,
   AdminRequestType,
   AdminUserRequestType,
-  RaffleWinnerRequestType,
   AdminAddSemesterRequestType,
   ReportReviewRequestType,
 } from './admin.type';
@@ -18,6 +17,7 @@ import {
   removePendingReview,
   updateAllProfessorsDb,
   resetAllProfessorsDb,
+  updateSubjectsDb,
   initAllDb,
   addNewSemDb,
   verifyTokenAdmin,
@@ -104,7 +104,7 @@ adminRouter.post('/reviews/approve/all', async (req, res) => {
     const { token }: AdminReviewRequestType = req.body;
     const auth = new Auth({ token });
 
-    const response = await approveReviews({auth: auth})
+    const response = await approveReviews({ auth: auth })
     if (response !== null) {
       return res.status(200).json({
         message: `All pending reviews have been approved`
@@ -169,14 +169,14 @@ adminRouter.post('/reviews/count', async (req, res) => {
         error: `User is not an admin.`
       });
     }
-    
+
     return res.status(200).json({
       message: 'Retrieved review counts',
       result: counts,
     })
 
   } catch (err) {
-      return res.status(500).json({ error: `Internal Server Error: ${err}`});
+    return res.status(500).json({ error: `Internal Server Error: ${err}` });
   }
 })
 
@@ -197,7 +197,7 @@ adminRouter.post('/reviews/csv', async (req, res) => {
     })
 
   } catch (err) {
-    return res.status(500).json({ error: `Internal Server Error: ${err}`});
+    return res.status(500).json({ error: `Internal Server Error: ${err}` });
   }
 })
 
@@ -218,16 +218,16 @@ adminRouter.post('/users/get', async (req, res) => {
     })
 
   } catch (err) {
-    return res.status(500).json({ error: `Internal Server Error: ${err}`});
+    return res.status(500).json({ error: `Internal Server Error: ${err}` });
   }
 })
 
 adminRouter.post('/users/remove', async (req, res) => {
-  const {token, userId}: AdminUserRequestType = req.body;
+  const { token, userId }: AdminUserRequestType = req.body;
 
   try {
     const auth = new Auth({ token });
-    const result = await removeAdmin({ auth: auth, id: userId})
+    const result = await removeAdmin({ auth: auth, id: userId })
 
     if (result) {
       return res.status(200).json({
@@ -239,16 +239,16 @@ adminRouter.post('/users/remove', async (req, res) => {
       error: 'User is not an admin.'
     })
   } catch (err) {
-    return res.status(500).json({ error: `Internal Server Error: ${err}`})
+    return res.status(500).json({ error: `Internal Server Error: ${err}` })
   }
 })
 
 adminRouter.post('/users/add', async (req, res) => {
-  const {token, userId}: AdminUserRequestType = req.body;
+  const { token, userId }: AdminUserRequestType = req.body;
 
   try {
     const auth = new Auth({ token });
-    const result = await addOrUpdateAdmin({ auth: auth, id: userId})
+    const result = await addOrUpdateAdmin({ auth: auth, id: userId })
 
     if (result) {
       return res.status(200).json({
@@ -260,7 +260,7 @@ adminRouter.post('/users/add', async (req, res) => {
       error: 'User is not an admin.'
     })
   } catch (err) {
-    return res.status(500).json({ error: `Internal Server Error: ${err}`})
+    return res.status(500).json({ error: `Internal Server Error: ${err}` })
   }
 })
 
@@ -376,6 +376,22 @@ adminRouter.post('/professors/reset', async (req, res) => {
   }
 });
 
+adminRouter.post('/subjects/update', async (req, res) => {
+  const { token }: AdminRequestType = req.body;
+  try {
+    const auth = new Auth({ token });
+    const result = await updateSubjectsDb({ auth });
+
+    if (result) {
+      return res.status(200).json({ result: true });
+    }
+
+    return res.status(400).json({ result: false });
+  } catch (err) {
+    return res.status(500).json({ error: `Internal Server Error: ${err}` });
+  }
+});
+
 adminRouter.post('/db/initialize', async (req, res) => {
   const { token }: AdminRequestType = req.body;
   try {

From c91de912fcbabca6c165613d58cf9278835bd9fc Mon Sep 17 00:00:00 2001
From: Jacqueline <jacqueline.cai2004@gmail.com>
Date: Sat, 21 Sep 2024 14:50:04 -0400
Subject: [PATCH 2/6] Fixed get semester bug

---
 server/scripts/populate-subjects.ts | 3 ++-
 server/src/admin/admin.router.ts    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/scripts/populate-subjects.ts b/server/scripts/populate-subjects.ts
index 1f608f50..7a27c4d4 100644
--- a/server/scripts/populate-subjects.ts
+++ b/server/scripts/populate-subjects.ts
@@ -32,6 +32,7 @@ export const fetchSubjects = async (
     const { subjects } = result.data.data;
     return subjects;
   } catch (err) {
+    console.log(err)
     return null;
   }
 };
@@ -48,7 +49,7 @@ export const fetchAddSubjects = async (
   endpoint: string,
   semesters: string[],
 ): Promise<boolean> => {
-  for (const semester in semesters) {
+  for (const semester of semesters) {
     const subjects = await fetchSubjects(endpoint, semester);
 
     if (subjects === null) {
diff --git a/server/src/admin/admin.router.ts b/server/src/admin/admin.router.ts
index e3ef2210..58cee3a3 100644
--- a/server/src/admin/admin.router.ts
+++ b/server/src/admin/admin.router.ts
@@ -385,7 +385,6 @@ adminRouter.post('/subjects/update', async (req, res) => {
     if (result) {
       return res.status(200).json({ result: true });
     }
-
     return res.status(400).json({ result: false });
   } catch (err) {
     return res.status(500).json({ error: `Internal Server Error: ${err}` });

From b2e4f98f1892f40b6a2142f9f7879ebf67477df2 Mon Sep 17 00:00:00 2001
From: Jacqueline <jacqueline.cai2004@gmail.com>
Date: Sat, 21 Sep 2024 18:26:52 -0400
Subject: [PATCH 3/6] Added documentation

---
 client/src/modules/Admin/Components/Admin.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/client/src/modules/Admin/Components/Admin.tsx b/client/src/modules/Admin/Components/Admin.tsx
index d6a5497b..6767b006 100644
--- a/client/src/modules/Admin/Components/Admin.tsx
+++ b/client/src/modules/Admin/Components/Admin.tsx
@@ -203,6 +203,10 @@ export const Admin = () => {
     })
   }
 
+  /**
+   * Call when admin wants to update professors for users to search through
+   * when clicking the "Update Professors" button
+   */
   function updateProfessors() {
     console.log('Updating professors')
     setDisableInit(true)
@@ -220,6 +224,10 @@ export const Admin = () => {
     })
   }
 
+  /**
+   * Call when admin wants to reset all professors in classes when clicking the 
+   * "Reset Professors" button
+   */
   function resetProfessors() {
     console.log('Setting the professors to an empty array')
     setDisableInit(true)
@@ -236,6 +244,10 @@ export const Admin = () => {
     })
   }
 
+  /**
+   * Call when admin wants to update the list of subjects users can search through
+   * when clicking the "Update Subjects" button
+   */
   function updateSubjects() {
     setDisableInit(true);
     setUpdatingSubjects(1);

From 995f4c5a670573989f7012bf74e21cccf3865f52 Mon Sep 17 00:00:00 2001
From: Jacqueline <jacqueline.cai2004@gmail.com>
Date: Tue, 1 Oct 2024 20:10:05 -0400
Subject: [PATCH 4/6] Refactored admin button states

---
 client/src/modules/Admin/Components/Admin.tsx | 127 +++++++++---------
 1 file changed, 66 insertions(+), 61 deletions(-)

diff --git a/client/src/modules/Admin/Components/Admin.tsx b/client/src/modules/Admin/Components/Admin.tsx
index 6767b006..e819bfb9 100644
--- a/client/src/modules/Admin/Components/Admin.tsx
+++ b/client/src/modules/Admin/Components/Admin.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Redirect } from 'react-router-dom'
+import { Redirect, useParams } from 'react-router-dom'
 
 import axios from 'axios'
 
@@ -22,12 +22,19 @@ export const Admin = () => {
   const [reportedReviews, setReportedReviews] = useState<Review[]>([])
   const [disableInit, setDisableInit] = useState<boolean>(false)
   const [disableNewSem, setDisableNewSem] = useState<boolean>(false)
+  const [disableUpdateProfs, setDisableUpdateProfs] = useState<boolean>(false)
+  const [disableResetProfs, setDisableResetProfs] = useState<boolean>(false)
+  const [disableUpdateSubjects, setDisableUpdateSubjects] = useState<boolean>(false)
   const [doubleClick, setDoubleClick] = useState<boolean>(false)
-  const [loadingInit, setLoadingInit] = useState<number>(0)
-  const [loadingSemester, setLoadingSemester] = useState<number>(0)
-  const [loadingProfs, setLoadingProfs] = useState<number>(0)
-  const [resettingProfs, setResettingProfs] = useState<number>(0)
-  const [updatingSubjects, setUpdatingSubjects] = useState<number>(0)
+
+  const [updating, setUpdating] = useState<boolean>(false);
+  const [semAdded, setSemAdded] = useState<boolean>(false);
+  const [profsReset, setProfsReset] = useState<boolean>(false)
+  const [profsUpdated, setProfsUpdated] = useState<boolean>(false);
+  const [subjectsUpdated, setSubjectsUpdated] = useState<boolean>(false);
+  const [databaseLoaded, setDatabaseLoaded] = useState<boolean>(false);
+  const [updatingField, setUpdatingField] = useState<string>("");
+
   const [addSemester, setAddSemester] = useState('')
   const [isAdminModalOpen, setIsAdminModalOpen] = useState<boolean>(false)
 
@@ -71,6 +78,23 @@ export const Admin = () => {
     loadReviews()
   }, [token, isAuthenticating])
 
+  // Disables the database update buttons when an update is occurring
+  useEffect(() => {
+    if (updating) {
+      setDisableInit(true)
+      setDisableNewSem(true)
+      setDisableUpdateProfs(true)
+      setDisableResetProfs(true)
+      setDisableUpdateSubjects(true)
+    } else {
+      setDisableInit(false)
+      setDisableNewSem(false)
+      setDisableUpdateProfs(false)
+      setDisableResetProfs(false)
+      setDisableUpdateSubjects(false)
+    }
+  }, [updating])
+
   // Helper function to remove a review from a list of reviews and
   // return the updated list
   function removeReviewFromList(reviewToRemove: Review, reviews: Review[]) {
@@ -158,9 +182,9 @@ export const Admin = () => {
   // Should run once a semester, when new classes are added to the roster.
   function addNewSem(semester: string) {
     console.log('Adding new semester...')
-    setDisableNewSem(true)
-    setDisableInit(true)
-    setLoadingSemester(1)
+    setUpdating(true)
+    setSemAdded(false)
+    setUpdatingField("new semester")
     //wz
     axios
       .post('/api/admin/semester/add', {
@@ -171,9 +195,8 @@ export const Admin = () => {
         const result = response.data.result
         if (result === true) {
           console.log('New Semester Added')
-          setDisableNewSem(false)
-          setDisableInit(false)
-          setLoadingSemester(2)
+          setUpdating(false)
+          setSemAdded(true)
         } else {
           console.log('Unable to add new semester!')
         }
@@ -185,18 +208,18 @@ export const Admin = () => {
   // Then, runs code to store id's of cross-listed classes against each class.
   // Should only be run ONCE when the app is initialzied.
   //
-  // NOTE: requries an initialize flag to ensure the function is only run on
+  // NOTE: requires an initialize flag to ensure the function is only run on
   // a button click without this, it will run every time this component is created.
   function addAllCourses() {
     console.log('Initializing database')
-
-    setDisableInit(true)
-    setLoadingInit(1)
+    setUpdating(true)
+    setDatabaseLoaded(false)
+    setUpdatingField("all database")
     //wz
     axios.post('/api/admin/db/initialize', { token: token }).then((response) => {
       if (response.status === 200) {
-        setDisableInit(false)
-        setLoadingInit(2)
+        setUpdating(false)
+        setDatabaseLoaded(true)
       } else {
         console.log('Error at dbInit')
       }
@@ -209,15 +232,16 @@ export const Admin = () => {
    */
   function updateProfessors() {
     console.log('Updating professors')
-    setDisableInit(true)
-    setLoadingProfs(1)
+    setUpdating(true)
+    setProfsUpdated(false)
+    setUpdatingField("professors")
     //wz
 
     axios.post('/api/admin/professors/add', { token: token }).then((response) => {
       if (response.status === 200) {
         console.log('Updated the professors')
-        setDisableInit(false)
-        setLoadingProfs(2)
+        setUpdating(false)
+        setProfsUpdated(true)
       } else {
         console.log('Error at setProfessors')
       }
@@ -230,14 +254,15 @@ export const Admin = () => {
    */
   function resetProfessors() {
     console.log('Setting the professors to an empty array')
-    setDisableInit(true)
-    setResettingProfs(1)
+    setUpdating(true)
+    setProfsReset(false)
+    setUpdatingField("professors to empty arrays")
     // wz
     axios.post('/api/admin/professors/reset', { token: token }).then((response) => {
       if (response.status === 200) {
         console.log('Reset all the professors to empty arrays')
-        setDisableInit(false)
-        setResettingProfs(2)
+        setUpdating(false)
+        setProfsReset(true)
       } else {
         console.log('Error at resetProfessors')
       }
@@ -249,13 +274,15 @@ export const Admin = () => {
    * when clicking the "Update Subjects" button
    */
   function updateSubjects() {
-    setDisableInit(true);
-    setUpdatingSubjects(1);
+    setUpdating(true);
+    setSubjectsUpdated(false);
+    setUpdatingField("subjects");
     axios.post('/api/admin/subjects/update', { token: token }).then((response) => {
       if (response.status === 200) {
         console.log('Updated all subject names');
         setDisableInit(false);
-        setUpdatingSubjects(2);
+        setUpdating(false);
+        setSubjectsUpdated(true);
       } else {
         console.log('Error at updateSubjects');
       }
@@ -331,7 +358,7 @@ export const Admin = () => {
                 Add New Semester
               </button>
               <button
-                disabled={disableInit}
+                disabled={disableUpdateProfs}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => updateProfessors()}
@@ -339,7 +366,7 @@ export const Admin = () => {
                 Update Professors
               </button>
               <button
-                disabled={disableInit}
+                disabled={disableResetProfs}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => resetProfessors()}
@@ -347,7 +374,7 @@ export const Admin = () => {
                 Reset Professors
               </button>
               <button
-                disabled={disableInit}
+                disabled={disableUpdateSubjects}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => updateSubjects()}
@@ -364,50 +391,28 @@ export const Admin = () => {
             token={token}
           />
 
-          <div hidden={!(loadingSemester === 1)} className="">
-            <p>
-              Adding New Semester Data. This process can take up to 15 minutes.
-            </p>
-          </div>
-
-          <div hidden={!(loadingSemester === 2)} className="">
+          <div hidden={!semAdded} className="">
             <p>New Semester Data import is complete!</p>
           </div>
 
-          <div hidden={!(resettingProfs === 1)} className="">
-            <p>Clearing all associated professors from Classes.</p>
-            <p>This process can take up to 15 minutes.</p>
-          </div>
-
-          <div hidden={!(resettingProfs === 2)} className="">
+          <div hidden={!profsReset} className="">
             <p>All professor arrays in Classes reset to empty!</p>
           </div>
 
-          <div hidden={!(loadingProfs === 1)} className="">
-            <p>Updating professor data to Classes.</p>
-            <p>This process can take up to 15 minutes.</p>
-          </div>
-
-          <div hidden={!(loadingProfs === 2)} className="">
+          <div hidden={!profsUpdated} className="">
             <p>Professor data import to Classes is complete!</p>
           </div>
 
-          <div hidden={!(updatingSubjects === 1)} className="">
-            <p>Updating subject data to Classes.</p>
+          <div hidden={!updating} className="">
+            <p>Updating {updatingField} in the Course database.</p>
             <p>This process can take up to 15 minutes.</p>
           </div>
 
-          <div hidden={!(updatingSubjects === 2)} className="">
+          <div hidden={!subjectsUpdated} className="">
             <p>Subject data import to Classes is complete!</p>
           </div>
 
-          <div hidden={!(loadingInit === 1)} className="">
-            <p>
-              Database Initializing. This process can take up to 15 minutes.
-            </p>
-          </div>
-
-          <div hidden={!(loadingInit === 2)} className="">
+          <div hidden={!databaseLoaded} className="">
             <p>Database initialization is complete!</p>
           </div>
         </div>

From 833ee6fc9f6cb4361c9a9d33168a812a5088e3e8 Mon Sep 17 00:00:00 2001
From: Jacqueline <jacqueline.cai2004@gmail.com>
Date: Wed, 23 Oct 2024 14:49:30 -0400
Subject: [PATCH 5/6] Fix PR comments

---
 client/src/modules/Admin/Components/Admin.tsx | 175 +++++++-----------
 server/src/admin/admin.controller.ts          |   2 +-
 server/src/admin/admin.router.ts              |   4 +-
 3 files changed, 67 insertions(+), 114 deletions(-)

diff --git a/client/src/modules/Admin/Components/Admin.tsx b/client/src/modules/Admin/Components/Admin.tsx
index cc9adfc4..a31fce94 100644
--- a/client/src/modules/Admin/Components/Admin.tsx
+++ b/client/src/modules/Admin/Components/Admin.tsx
@@ -20,19 +20,19 @@ import Loading from '../../Globals/Loading'
 export const Admin = () => {
   const [pendingReviews, setPendingReviews] = useState<Review[]>([])
   const [reportedReviews, setReportedReviews] = useState<Review[]>([])
-  const [disableInit, setDisableInit] = useState<boolean>(false)
-  const [disableNewSem, setDisableNewSem] = useState<boolean>(false)
-  const [disableUpdateProfs, setDisableUpdateProfs] = useState<boolean>(false)
-  const [disableResetProfs, setDisableResetProfs] = useState<boolean>(false)
-  const [disableUpdateSubjects, setDisableUpdateSubjects] = useState<boolean>(false)
   const [doubleClick, setDoubleClick] = useState<boolean>(false)
 
   const [updating, setUpdating] = useState<boolean>(false);
-  const [semAdded, setSemAdded] = useState<boolean>(false);
-  const [profsReset, setProfsReset] = useState<boolean>(false)
-  const [profsUpdated, setProfsUpdated] = useState<boolean>(false);
-  const [subjectsUpdated, setSubjectsUpdated] = useState<boolean>(false);
-  const [databaseLoaded, setDatabaseLoaded] = useState<boolean>(false);
+  type updatedStates = 'empty' | 'semester' | 'profsReset' | 'profsUpdate' | 'subjects' | 'database';
+  const [updated, setUpdated] = useState<updatedStates>('empty');
+  const successMessages = {
+    'empty': '',
+    'semester': "New semester data successfully added",
+    'profsReset': "Professor data successfully reset to empty",
+    'profsUpdate': "Professor data successfully updated",
+    'subjects': "Subject full name data successfully updated",
+    'database': "Database successfully initialized",
+  };
   const [updatingField, setUpdatingField] = useState<string>("");
 
   const [addSemester, setAddSemester] = useState('')
@@ -80,23 +80,6 @@ export const Admin = () => {
     loadReviews()
   }, [token, isAuthenticating])
 
-  // Disables the database update buttons when an update is occurring
-  useEffect(() => {
-    if (updating) {
-      setDisableInit(true)
-      setDisableNewSem(true)
-      setDisableUpdateProfs(true)
-      setDisableResetProfs(true)
-      setDisableUpdateSubjects(true)
-    } else {
-      setDisableInit(false)
-      setDisableNewSem(false)
-      setDisableUpdateProfs(false)
-      setDisableResetProfs(false)
-      setDisableUpdateSubjects(false)
-    }
-  }, [updating])
-
   /**
    * Helper function to remove a review from a list of reviews and
    * return the updated list
@@ -190,24 +173,20 @@ export const Admin = () => {
   async function addNewSem(semester: string) {
     console.log('Adding new semester...')
     setUpdating(true)
-    setSemAdded(false)
     setUpdatingField("new semester")
     //wz
-    axios
-      .post('/api/admin/semester/add', {
-        semester,
-        token: token,
-      })
-      .then((response) => {
-        const result = response.data.result
-        if (result === true) {
-          console.log('New Semester Added')
-          setUpdating(false)
-          setSemAdded(true)
-        } else {
-          console.log('Unable to add new semester!')
-        }
-      })
+    const response = await axios.post('/api/admin/semester/add', {
+      semester,
+      token: token,
+    })
+    const result = response.data.result;
+    if (result === true) {
+      console.log('New Semester Added')
+      setUpdating(false)
+      setUpdated('semester')
+    } else {
+      console.log('Unable to add new semester!')
+    }
   }
 
   // Call when user selects "Initialize Database" button. Scrapes the Cornell
@@ -217,83 +196,73 @@ export const Admin = () => {
   //
   // NOTE: requires an initialize flag to ensure the function is only run on
   // a button click without this, it will run every time this component is created.
-  function addAllCourses() {
+  async function addAllCourses() {
     console.log('Initializing database')
     setUpdating(true)
-    setDatabaseLoaded(false)
     setUpdatingField("all database")
     //wz
-    axios.post('/api/admin/db/initialize', { token: token }).then((response) => {
-      if (response.status === 200) {
-        setUpdating(false)
-        setDatabaseLoaded(true)
-      } else {
-        console.log('Error at dbInit')
-      }
-    })
+    const response = await axios.post('/api/admin/db/initialize', { token: token });
+    if (response.status === 200) {
+      setUpdating(false)
+      setUpdated('database')
+    } else {
+      console.log('Error at dbInit')
+    }
   }
 
   /**
    * Call when admin wants to update professors for users to search through
    * when clicking the "Update Professors" button
    */
-  function updateProfessors() {
+  async function updateProfessors() {
     console.log('Updating professors')
     setUpdating(true)
-    setProfsUpdated(false)
     setUpdatingField("professors")
     //wz
-
-    axios.post('/api/admin/professors/add', { token: token }).then((response) => {
-      if (response.status === 200) {
-        console.log('Updated the professors')
-        setUpdating(false)
-        setProfsUpdated(true)
-      } else {
-        console.log('Error at setProfessors')
-      }
-    })
+    const response = await axios.post('/api/admin/professors/add', { token: token });
+    if (response.status === 200) {
+      console.log('Updated the professors')
+      setUpdating(false)
+      setUpdated('profsUpdate')
+    } else {
+      console.log('Error at setProfessors')
+    }
   }
 
   /**
    * Call when admin wants to reset all professors in classes when clicking the 
    * "Reset Professors" button
    */
-  function resetProfessors() {
+  async function resetProfessors() {
     console.log('Setting the professors to an empty array')
     setUpdating(true)
-    setProfsReset(false)
     setUpdatingField("professors to empty arrays")
     // wz
-    axios.post('/api/admin/professors/reset', { token: token }).then((response) => {
-      if (response.status === 200) {
-        console.log('Reset all the professors to empty arrays')
-        setUpdating(false)
-        setProfsReset(true)
-      } else {
-        console.log('Error at resetProfessors')
-      }
-    })
+    const response = await axios.post('/api/admin/professors/reset', { token: token });
+    if (response.status === 200) {
+      console.log('Reset all the professors to empty arrays')
+      setUpdating(false)
+      setUpdated('profsReset')
+    } else {
+      console.log('Error at resetProfessors')
+    }
   }
 
   /**
    * Call when admin wants to update the list of subjects users can search through
    * when clicking the "Update Subjects" button
    */
-  function updateSubjects() {
+  async function updateSubjects() {
     setUpdating(true);
-    setSubjectsUpdated(false);
     setUpdatingField("subjects");
-    axios.post('/api/admin/subjects/update', { token: token }).then((response) => {
-      if (response.status === 200) {
-        console.log('Updated all subject names');
-        setDisableInit(false);
-        setUpdating(false);
-        setSubjectsUpdated(true);
-      } else {
-        console.log('Error at updateSubjects');
-      }
-    })
+    const response = await axios.post('/api/admin/subjects/update', { token: token });
+    if (response.status === 200) {
+      console.log('Updated all subject names');
+      setUpdating(false);
+      setUpdated('subjects');
+    } else {
+      console.log('Error at updateSubjects');
+    }
   }
 
   /**
@@ -319,7 +288,7 @@ export const Admin = () => {
       return (
         <div className="">
           <button
-            disabled={disableInit}
+            disabled={updating}
             type="button"
             className={styles.adminButtons}
             onClick={() => addAllCourses()}
@@ -361,7 +330,7 @@ export const Admin = () => {
                 Manage Administrators
               </button>
               <button
-                disabled={disableNewSem}
+                disabled={updating}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => addNewSem(addSemester)}
@@ -369,7 +338,7 @@ export const Admin = () => {
                 Add New Semester
               </button>
               <button
-                disabled={disableUpdateProfs}
+                disabled={updating}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => updateProfessors()}
@@ -377,7 +346,7 @@ export const Admin = () => {
                 Update Professors
               </button>
               <button
-                disabled={disableResetProfs}
+                disabled={updating}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => resetProfessors()}
@@ -385,7 +354,7 @@ export const Admin = () => {
                 Reset Professors
               </button>
               <button
-                disabled={disableUpdateSubjects}
+                disabled={updating}
                 type="button"
                 className={styles.adminButtons}
                 onClick={() => updateSubjects()}
@@ -402,30 +371,14 @@ export const Admin = () => {
             token={token}
           />
 
-          <div hidden={!semAdded} className="">
-            <p>New Semester Data import is complete!</p>
-          </div>
-
-          <div hidden={!profsReset} className="">
-            <p>All professor arrays in Classes reset to empty!</p>
-          </div>
-
-          <div hidden={!profsUpdated} className="">
-            <p>Professor data import to Classes is complete!</p>
+          <div hidden={updated === 'empty'}>
+            {successMessages[updated]}
           </div>
 
           <div hidden={!updating} className="">
             <p>Updating {updatingField} in the Course database.</p>
             <p>This process can take up to 15 minutes.</p>
           </div>
-
-          <div hidden={!subjectsUpdated} className="">
-            <p>Subject data import to Classes is complete!</p>
-          </div>
-
-          <div hidden={!databaseLoaded} className="">
-            <p>Database initialization is complete!</p>
-          </div>
         </div>
 
         <div className="StagedReviews">
diff --git a/server/src/admin/admin.controller.ts b/server/src/admin/admin.controller.ts
index 25032138..08acdf31 100644
--- a/server/src/admin/admin.controller.ts
+++ b/server/src/admin/admin.controller.ts
@@ -279,7 +279,7 @@ export const resetAllProfessorsDb = async ({ auth }: VerifyAdminType) => {
  * @param {Auth} auth: Object that represents the authentication of a request being passed in.
  * @returns true if operation was successful, false if operations was not successful, null if token not admin
  */
-export const updateSubjectsDb = async ({ auth }: VerifyAdminType) => {
+export const updateDatabaseCourseFullSubjectName = async ({ auth }: VerifyAdminType) => {
   const userIsAdmin = verifyTokenAdmin({ auth });
   if (!userIsAdmin) {
     return null;
diff --git a/server/src/admin/admin.router.ts b/server/src/admin/admin.router.ts
index 31ee9294..c30356f1 100644
--- a/server/src/admin/admin.router.ts
+++ b/server/src/admin/admin.router.ts
@@ -17,7 +17,7 @@ import {
   removePendingReview,
   updateAllProfessorsDb,
   resetAllProfessorsDb,
-  updateSubjectsDb,
+  updateDatabaseCourseFullSubjectName,
   initAllDb,
   addNewSemDb,
   verifyTokenAdmin,
@@ -448,7 +448,7 @@ adminRouter.post('/subjects/update', async (req, res) => {
   const { token }: AdminRequestType = req.body;
   try {
     const auth = new Auth({ token });
-    const result = await updateSubjectsDb({ auth });
+    const result = await updateDatabaseCourseFullSubjectName({ auth });
 
     if (result) {
       return res.status(200).json({ result: true });

From 3eb752d4771d5cf33369cbab9ca945b41e5a03ff Mon Sep 17 00:00:00 2001
From: Jacqueline <jacqueline.cai2004@gmail.com>
Date: Wed, 23 Oct 2024 14:50:41 -0400
Subject: [PATCH 6/6] Small change

---
 client/src/modules/Admin/Components/Admin.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/modules/Admin/Components/Admin.tsx b/client/src/modules/Admin/Components/Admin.tsx
index a31fce94..aae3a641 100644
--- a/client/src/modules/Admin/Components/Admin.tsx
+++ b/client/src/modules/Admin/Components/Admin.tsx
@@ -371,7 +371,7 @@ export const Admin = () => {
             token={token}
           />
 
-          <div hidden={updated === 'empty'}>
+          <div>
             {successMessages[updated]}
           </div>