feat: migrate to API rewrite

api/package.json

@@ -12,7 +12,6 @@
     "connect-mongodb-session": "^3.1.1",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
-    "dayjs": "^1.11.7",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.2.0",
     "ejs": "^3.1.5",

api/src/controllers/courses.ts

@@ -22,7 +22,7 @@ router.get('/api', (req: Request<{}, {}, {}, { courseID: string }>, res) => {
   console.log(req.query.courseID)
 
   r.then((response) => response.json())
-    .then((data) => res.send(data))
+    .then((data) => res.send(data.payload))
 });
 
 /**
@@ -44,7 +44,11 @@ router.post('/api/batch', (req: Request<{}, {}, { courses: string[] }>, res) =>
     });
 
     r.then((response) => response.json())
-      .then((data) => res.json(data.data))
+        .then((data) => res.json(
+            Object.fromEntries(
+                Object.entries(data.data).filter(([_, x]) => x !== null).map(([_, x]) => [(x as { id: string }).id, x])
+            )
+        ))
   }
 });
 
@@ -53,10 +57,12 @@ router.post('/api/batch', (req: Request<{}, {}, { courses: string[] }>, res) =>
  */
 router.get('/api/grades',
   (req: Request<{}, {}, {}, { department: string; number: string; }>, res) => {
-    let r = fetch(process.env.PUBLIC_API_URL + 'grades/raw?department=' + encodeURIComponent(req.query.department) + '&number=' + req.query.number);
+    let r = fetch(process.env.PUBLIC_API_URL + 'grades/raw?department=' + encodeURIComponent(req.query.department) + '&courseNumber=' + req.query.number);
 
     r.then((response) => response.json())
-      .then((data) => res.send(data))
+      .then((data) => {
+        res.send(data.payload)
+      })
   });
 
 export default router;

api/src/controllers/professors.ts

@@ -54,7 +54,7 @@ router.get('/api/grades/:name', function (req, res, next) {
   r.then((response) => {
     status = response.status;
     return response.json();
-  }).then((data) => res.status(status).send(data))
+  }).then((data) => res.status(status).send(data.payload))
 });
 
 export default router;

api/src/controllers/reviews.ts

@@ -199,7 +199,7 @@ router.delete("/", async (req, res, next) => {
  * Upvote or downvote a review
  */
 router.patch("/vote", async function (req, res) {
-  if (req.session.passport != null) {
+  if (req.session?.passport != null) {
     //get id and delta score from initial vote
     let id = req.body["id"];
     let deltaScore = req.body["upvote"] ? 1 : -1;
@@ -249,7 +249,7 @@ router.patch("/vote", async function (req, res) {
  */
 router.patch("/getVoteColor", async function (req, res) {
   //make sure user is logged in
-  if (req.session.passport != null) {
+  if (req.session?.passport != null) {
     //query of the user's email and the review id
     let query = {
       userID: req.session.passport.user.email,
@@ -276,7 +276,7 @@ router.patch("/getVoteColor", async function (req, res) {
  * Get multiple review colors
  */
 router.patch("/getVoteColors", async function (req, res) {
-  if (req.session.passport != null) {
+  if (req.session?.passport != null) {
     //query of the user's email and the review id
     let ids = req.body["ids"];
     let colors = [];

api/src/controllers/schedule.ts

@@ -3,8 +3,6 @@
 */
 
 import express from 'express';
-import { getWeek } from '../helpers/week';
-import { getCurrentQuarter } from '../helpers/currentQuarter';
 import fetch from 'node-fetch';
 
 var router = express.Router();
@@ -30,24 +28,29 @@ router.get("/getTerms", function (req, res) {
 /**
  * Get the current week
  */
-router.get('/api/currentWeek', function (req, res, next) {
-  getWeek().then(week => res.send(week))
+router.get('/api/currentWeek', async function (_, res) {
+  const apiResp = await fetch(`${process.env.PUBLIC_API_URL}week`);
+  const json = await apiResp.json();
+  res.send(json.payload)
 });
 
 /**
  * Get the current quarter on websoc
  */
- router.get('/api/currentQuarter', function (req, res, next) {
-  getCurrentQuarter().then(currentQuarter => res.send(currentQuarter))
+router.get('/api/currentQuarter', async function (_, res) {
+  const apiResp = await fetch(`${process.env.PUBLIC_API_URL}websoc/terms`);
+  const json = await apiResp.json();
+  res.send(json.payload[0].longName)
 });
 
 
 /**
  * Proxy for WebSOC, using PeterPortal API
  */
 router.get('/api/:term/:department/:number', async function (req, res) {
+  const [year, quarter] = req.params.term.split(" ");
   const result = await callPPAPIWebSoc({
-    term: req.params.term,
+    year, quarter,
     department: req.params.department,
     courseNumber: req.params.number
   });
@@ -58,17 +61,18 @@ router.get('/api/:term/:department/:number', async function (req, res) {
  * Proxy for WebSOC, using PeterPortal API
  */
 router.get('/api/:term/:professor', async function (req, res) {
+  const [year, quarter] = req.params.term.split(" ");
   const result = await callPPAPIWebSoc({
-    term: req.params.term,
+    year, quarter,
     instructorName: req.params.professor
   });
   res.send(result);
 });
 
 async function callPPAPIWebSoc(params: Record<string, string>) {
-  const url: URL = new URL(process.env.PUBLIC_API_URL + 'schedule/soc?' + 
+  const url: URL = new URL(process.env.PUBLIC_API_URL + 'websoc?' +
     new URLSearchParams(params))
-  return await fetch(url).then(response => response.json());
+  return await fetch(url).then(response => response.json()).then(json => json.payload);
 }
 
 export default router;

api/src/controllers/users.ts

@@ -20,11 +20,11 @@ router.get('/', function (req, res, next) {
  */
 router.get('/isAdmin', function (req, res, next) {
   // not logged in
-  if (!req.session.passport) {
+  if (!req.session?.passport) {
     res.json({ admin: false });
   }
   else {
-    res.json({ admin: req.session.passport.admin ? true : false });
+    res.json({ admin: req.session.passport.admin });
   }
 });
 

api/src/helpers/gql.ts

@@ -1,86 +1,86 @@
 export function getCourseQuery(courseIDs: string[]) {
-    // start of query 
-    let result = 'query {';
-    
-    // request fields for each course
-    courseIDs.forEach((courseID, i) => {
-        // use number id here because cannot use special character names
-        result += `
-        ${'_' + i}: course(id: "${courseID}"){
+  // start of query
+  let result = 'query {';
+
+  // request fields for each course
+  courseIDs.forEach((courseID, i) => {
+    // use number id here because cannot use special character names
+    result += `
+        ${'_' + i}: course(courseId: "${courseID}") {
             id
             department
-            number
+            courseNumber
             school
             title
-            course_level
-            department_alias
-            units
+            courseLevel
+            minUnits
+            maxUnits
             description
-            department_name
-            instructor_history{
-                name
-                ucinetid
-                shortened_name
+            departmentName
+            instructors {
+              ucinetid
+              name
+              shortenedName
             }
-            prerequisite_tree
-            prerequisite_list {
-                id
-                department
-                number
-                title
+            prerequisiteTree
+            prerequisites {
+              id
+              department
+              courseNumber
+              title
             }
-            prerequisite_text
-            prerequisite_for {
-                id
-                department
-                number
-                title        
+            prerequisiteText
+            dependencies {
+              id
+              department
+              courseNumber
+              title
             }
             repeatability
             concurrent
-            same_as
+            sameAs
             restriction
             overlap
-            corequisite
-            ge_list
-            ge_text
+            corequisites
+            geList
+            geText
             terms
         },
-        `
-    })
-    
-    // close off query
-    result += '}';
-    return result;
+        `;
+  });
+
+  // close off query
+  result += '}';
+  return result;
 }
 
 export function getProfessorQuery(ucinetids: string[]) {
-    // start of query 
-    let result = 'query {';
-    
-    // request fields for each course
-    ucinetids.forEach((ucinetid, i) => {
-        // use number id here because cannot use special character names
-        result += `
+  // start of query
+  let result = 'query {';
+
+  // request fields for each course
+  ucinetids.forEach((ucinetid, i) => {
+    // use number id here because cannot use special character names
+    result += `
         ${'_' + i}: instructor(ucinetid: "${ucinetid}"){
             name
-            shortened_name
+            shortenedName
             ucinetid
             title
             department
             schools
-            related_departments
-            course_history {
-                id
-                department
-                number
-                title
+            relatedDepartments
+            courses {
+              id
+              department
+              courseNumber
+              title
             }
         },
-        `
-    })
-    
-    // close off query
-    result += '}';
-    return result;
-}
+        `;
+  });
+
+  // close off query
+  result += '}';
+  return result;
+}