remove redundant calculations in pdp transcript onboarding (#778)

Author: el-agua

backend/degree/views.py

@@ -395,13 +395,11 @@ def is_satisfied(rule):
                     legal=legal,
                 )
                 if just_created:
-                    f.save()
                     f.rules.set(selected_rules)
                     f.unselected_rules.set(unselected_rules)
                 else:
                     f.rules.add(selected_rules)
                     f.unselected_rules.add(unselected_rules)
-                f.save()
 
                 for rule in selected_rules:
                     satisfied_lookup[rule.id] += 1

frontend/degree-plan/components/OnboardingPanels/CreateWithTranscriptPanel.tsx

@@ -4,6 +4,7 @@ import {
   SetStateAction,
   useCallback,
   useEffect,
+  useMemo,
   useState,
 } from "react";
 import {
@@ -89,34 +90,29 @@ export default function CreateWithTranscriptPanel({
   // Will likely change in the future!
   useEffect(() => {
     if (degreeID) {
-      const courses = [];
-      for (let semester of scrapedCourses) {
-        const formattedSemester: { sem: String; courses: String[] } = {
-          sem: "",
-          courses: [],
-        };
-        let rawSem = semester.sem;
+      const courses = scrapedCourses.map((semester: any) => {
+        const rawSem = semester.sem;
+        let sem: string;
         if (rawSem === "_TRAN") {
-          formattedSemester.sem = "_TRAN";
+          sem = "_TRAN";
         } else {
-          let formattedSem = rawSem.match(/(\d+)/)[0];
-
-          if (rawSem.includes("spring")) formattedSem += "A";
-          else if (rawSem.includes("summer")) formattedSem += "B";
-          else formattedSem += "C";
-          formattedSemester.sem = formattedSem;
+          const year = rawSem.match(/(\d+)/)[0];
+          const suffix = rawSem.includes("spring") ? "A" : rawSem.includes("summer") ? "B" : "C";
+          sem = year + suffix;
         }
-        formattedSemester.courses = semester.courses.map((course: String) =>
-          course.replace(" ", "-").toUpperCase()
-        );
-        courses.push(formattedSemester);
-      }
+        return {
+          sem,
+          courses: semester.courses.map((course: string) =>
+            course.replace(" ", "-").toUpperCase()
+          ),
+        };
+      });
 
-      if (courses.length == 0) {
+      if (courses.length === 0) {
         setShowOnboardingModal(false);
       } else {
         postFetcher(`/api/degree/onboard-from-transcript/${degreeID}`, {
-          courses: courses,
+          courses,
         }).then((r) => setShowOnboardingModal(false));
       }
     }
@@ -152,7 +148,7 @@ export default function CreateWithTranscriptPanel({
             JSON.stringify(semesters)
           );
         }
-        postFetcher(`/api/degree/degreeplans/${_new.id}/degrees`, {
+        await postFetcher(`/api/degree/degreeplans/${_new.id}/degrees`, {
           degree_ids: majors.map((m) => m.value.id),
         }); // add degree
         setActiveDegreeplan(_new);
@@ -200,13 +196,12 @@ export default function CreateWithTranscriptPanel({
     };
   }, [options]);
 
-  const startingYearOptions = getYearOptions()?.startYears;
-  const graduationYearOptions = getYearOptions()?.gradYears;
+  const { startYears: startingYearOptions, gradYears: graduationYearOptions } = getYearOptions();
 
-  const majorOptionsCallback = useCallback(() => {
-    const majorOptions = getMajorOptions(degrees, schools, startingYear?.value ?? null);
-    return majorOptions;
-  }, [schools, startingYear]);
+  const majorOptions = useMemo(
+    () => getMajorOptions(degrees, schools, startingYear?.value ?? null),
+    [degrees, schools, startingYear]
+  );
 
   return (
     <CenteredFlexContainer>
@@ -285,7 +280,7 @@ export default function CreateWithTranscriptPanel({
             <FieldWrapper>
               <Label required>Major(s)</Label>
               <Select
-                options={majorOptionsCallback()}
+                options={majorOptions}
                 value={majors}
                 onChange={(selectedOptions) => setMajors([...selectedOptions])}
                 isClearable

frontend/degree-plan/pages/OnboardingPage.tsx

@@ -45,11 +45,9 @@ const OnboardingPage = ({
   >(`/api/degree/degrees`);
 
   // TRANSCRIPT PARSING
-  const total = useRef<Record<number, ParsedText[]>>({});
+  const total = useRef<Record<number, ParsedText>>({});
   const addText = (items: any[], index: number) => {
-    const parsed = parseItems(items);
-    total.current[index] = total.current[index] ?? [];
-    total.current[index].push(parsed);
+    total.current[index] = parseItems(items);
 
     // If all pages have been read, begin to parse text from transcript
     if (Object.keys(total.current).length === numPages) {
@@ -59,11 +57,9 @@ const OnboardingPage = ({
         .sort((a, b) => a - b);
 
       sortedPageIndexes.forEach((pageIndex) => {
-        const pageEntries = total.current[pageIndex];
-        if (!pageEntries) return;
-        pageEntries.forEach((pageText) => {
-          all = all.concat(flattenParsedText(pageText));
-        });
+        const pageEntry = total.current[pageIndex];
+        if (!pageEntry) return;
+        all = all.concat(flattenParsedText(pageEntry));
       });
 
       const {
@@ -73,7 +69,6 @@ const OnboardingPage = ({
         detectedMajorsOptions,
       } = parseTranscript(all, degrees);
       setScrapedCourses(scrapedCourses);
-      console.log(scrapedCourses);
       setStartingYear({
         value: startYear,
         label: startYear,

frontend/degree-plan/utils/parseUtils.ts

@@ -180,18 +180,14 @@ const detectMajors = (
   possibleDegrees: DegreeOption[] | undefined
 ) => {
   const detectedMajorsOptions = [];
+  const justMajorNames = possibleDegrees ? possibleDegrees.map((el) => el.label) : [];
   for (let i in detectedMajors) {
     let m =
       detectedMajors[i] +
       (detectedConcentrations.length > parseInt(i)
         ? detectedConcentrations[i]
         : "");
     if (!detectedMajors[i]?.includes("undeclared") && possibleDegrees) {
-      let justMajorNames = possibleDegrees.reduce((acc: any, el: any) => {
-        acc.push(el.label);
-        return acc;
-      }, []);
-
       let closestMajor =
         m == "computer science "
           ? "Computer Science - No Concentration (2024)"
@@ -246,31 +242,23 @@ export const parseTranscript = (
     }
   }
 
-  const separatedCourses = Object.entries(courseToSem).reduce(
-    (acc, [course, sem]) => {
-      const trimmedSem = sem.trim();
-      if (!acc[trimmedSem]) acc[trimmedSem] = [];
-      acc[trimmedSem].push(course);
-      return acc;
-    },
-    {} as { [key: string]: string[] }
-  );
-
-  const formattedSeparatedCourses = Object.entries(separatedCourses).map(
-    ([sem, courses]) => ({
-      sem,
-      courses,
-    })
+  const formattedSeparatedCourses = Object.values(
+    Object.entries(courseToSem).reduce(
+      (acc, [course, sem]) => {
+        const trimmedSem = sem.trim();
+        if (!acc[trimmedSem]) acc[trimmedSem] = { sem: trimmedSem, courses: [] };
+        acc[trimmedSem].courses.push(course);
+        return acc;
+      },
+      {} as { [key: string]: { sem: string; courses: string[] } }
+    )
   );
 
-  // Scrape start year and infer grad year
-  let years = formattedSeparatedCourses.map(
-    (e: { sem: string; courses: string[] }, i: number) => {
-      return parseInt(e.sem.replace(/\D/g, ""));
-    }
-  );
-  years.shift();
-  startYear = Math.min(...years);
+  // Scrape start year and infer grad year (skip _TRAN which yields NaN)
+  const years = formattedSeparatedCourses
+    .map(({ sem }) => parseInt(sem.replace(/\D/g, "")))
+    .filter((y) => !isNaN(y));
+  startYear = years.length ? Math.min(...years) : 0;
 
   let possibleDegrees = getMajorOptions(degrees, tempSchools, startYear);
   let detectedMajorsOptions = detectMajors(