add nupath types and to fetch course

sandboxnu · Nov 11, 2023 · 521681c · 521681c
1 parent 8a325e5
commit 521681c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/api-client/index.ts b/packages/api-client/index.ts
@@ -20,6 +20,7 @@ import {
   ForgotPasswordDto,
   ResetPasswordDto,
   courseToString,
+  NUPath,
 } from "@graduate/common";
 import { ClassConstructor, plainToInstance } from "class-transformer";
 
@@ -131,6 +132,7 @@ interface SearchClass {
   subject: string;
   prereqs?: INEUAndReq | INEUOrReq;
   coreqs?: INEUAndReq | INEUOrReq;
+  nupaths?: NUPath[];
   maxCredits: number;
   minCredits: number;
   termId: string;
@@ -188,6 +190,7 @@ function occurrenceToCourse(occurrence: SearchClass): ScheduleCourse2<null> {
     numCreditsMin: occurrence.minCredits,
     prereqs: occurrence.prereqs,
     coreqs: occurrence.coreqs,
+    nupaths: occurrence.nupaths,
     id: null,
   };
 }
@@ -228,13 +231,15 @@ class SearchAPIClient {
               minCredits
               prereqs
               coreqs
+              nupath
             }
           }
         }`,
       },
     });
 
     const courseData = await res.data.data;
+    console.log("test");
     if (courseData && courseData.class && courseData.class.allOccurrences) {
       return occurrencesToCourseByCatalogYear(
         courseData?.class?.allOccurrences,
@@ -268,6 +273,7 @@ class SearchAPIClient {
             maxCredits
             prereqs
             coreqs
+            nupath
             termId
           }
         }
@@ -352,7 +358,7 @@ class SearchAPIClient {
           search(termId:"${termId}", query: "${searchQuery}", classIdRange: {min: ${minIndex}, max: ${maxIndex}}) {
             totalCount 
             pageInfo { hasNextPage } 
-            nodes { ... on ClassOccurrence { name subject maxCredits minCredits prereqs coreqs classId
+            nodes { ... on ClassOccurrence { name subject maxCredits minCredits prereqs coreqs nupath classId
             } 
           } 
         } 
@@ -370,6 +376,7 @@ class SearchAPIClient {
         subject: result.subject,
         prereqs: result.prereqs,
         coreqs: result.coreqs,
+        nupaths: result.nupaths,
         numCreditsMin: result.minCredits,
         numCreditsMax: result.maxCredits,
       };

diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -12,8 +12,8 @@ export enum NUPathEnum {
   AD = "Analyzing/Using Data",
   DD = "Difference and Diversity",
   ER = "Ethical Reasoning",
-  WF = "First Year Writing",
-  WD = "Advanced Writing in the Disciplines",
+  WF = "1st Yr Writing",
+  WD = "Adv Writ Dscpl",
   WI = "Writing Intensive",
   EX = "Integration Experience",
   CE = "Capstone Experience",
@@ -170,7 +170,8 @@ export type Requirement2 =
   | IOrCourse2
   | ICourseRange2
   | IRequiredCourse
-  | Section;
+  | Section
+  | "nupath";
 
 /**
  * Represents a requirement where X number of credits need to be completed from
@@ -329,6 +330,7 @@ export interface ScheduleCourse2<T> {
   subject: string;
   prereqs?: INEUAndReq | INEUOrReq;
   coreqs?: INEUAndReq | INEUOrReq;
+  nupaths?: NUPath[];
   numCreditsMin: number;
   numCreditsMax: number;
   id: T;