fixed formatting of cs and game-dev JSON and added more conditions wh…

…en calling getRequiredCourses
sandboxnu · Nov 18, 2024 · 0dcd9c5 · 0dcd9c5
1 parent 8572da4
commit 0dcd9c5
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 47 deletions.
diff --git a/...computer-information-science/Computer_Science_and_Game_Development_BS/parsed.initial.json b/...computer-information-science/Computer_Science_and_Game_Development_BS/parsed.initial.json
@@ -285,50 +285,48 @@
           "type": "XOM",
           "numCreditsMin": 12,
           "courses": [
-            [
-              {
-                "type": "RANGE",
-                "subject": "ARTD",
-                "idRangeStart": 0,
-                "idRangeEnd": 9999,
-                "exceptions": []
-              },
-              {
-                "type": "RANGE",
-                "subject": "ARTE",
-                "idRangeStart": 0,
-                "idRangeEnd": 9999,
-                "exceptions": []
-              },
-              {
-                "type": "RANGE",
-                "subject": "ARTF",
-                "idRangeStart": 0,
-                "idRangeEnd": 9999,
-                "exceptions": []
-              },
-              {
-                "type": "RANGE",
-                "subject": "ARTG",
-                "idRangeStart": 0,
-                "idRangeEnd": 9999,
-                "exceptions": []
-              },
-              {
-                "type": "RANGE",
-                "subject": "ARTH",
-                "idRangeStart": 0,
-                "idRangeEnd": 9999,
-                "exceptions": []
-              },
-              {
-                "type": "RANGE",
-                "subject": "GAME",
-                "idRangeStart": 0,
-                "idRangeEnd": 9999,
-                "exceptions": []
-              }
-            ],
+            {
+              "type": "RANGE",
+              "subject": "ARTD",
+              "idRangeStart": 0,
+              "idRangeEnd": 9999,
+              "exceptions": []
+            },
+            {
+              "type": "RANGE",
+              "subject": "ARTE",
+              "idRangeStart": 0,
+              "idRangeEnd": 9999,
+              "exceptions": []
+            },
+            {
+              "type": "RANGE",
+              "subject": "ARTF",
+              "idRangeStart": 0,
+              "idRangeEnd": 9999,
+              "exceptions": []
+            },
+            {
+              "type": "RANGE",
+              "subject": "ARTG",
+              "idRangeStart": 0,
+              "idRangeEnd": 9999,
+              "exceptions": []
+            },
+            {
+              "type": "RANGE",
+              "subject": "ARTH",
+              "idRangeStart": 0,
+              "idRangeEnd": 9999,
+              "exceptions": []
+            },
+            {
+              "type": "RANGE",
+              "subject": "GAME",
+              "idRangeStart": 0,
+              "idRangeEnd": 9999,
+              "exceptions": []
+            },
             {
               "type": "RANGE",
               "subject": "CS",

diff --git a/packages/frontend/utils/plan/getAllCoursesInMajor.ts b/packages/frontend/utils/plan/getAllCoursesInMajor.ts
@@ -22,7 +22,7 @@ export const getAllCoursesInMajor = (
   const majorRequirements = major.requirementSections.reduce(
     (courses: IRequiredCourse[], section: Section) => {
       const requiredCourses: IRequiredCourse[] = [];
-      getRequiredCourses(section.requirements, requiredCourses);
+      getRequiredCourses(section.requirements ?? [], requiredCourses);
       return courses.concat(requiredCourses);
     },
     []
@@ -54,9 +54,9 @@ const getRequiredCourses = (
     } else if (requirement.type === "COURSE") {
       requiredCourses.push(requirement);
     } else if (requirement.type === "SECTION") {
-      getRequiredCourses(requirement.requirements, requiredCourses);
+      getRequiredCourses(requirement.requirements ?? [], requiredCourses);
     } else {
-      getRequiredCourses(requirement.courses, requiredCourses);
+      getRequiredCourses(requirement.courses ?? [], requiredCourses);
     }
   }
 };