feat(web): refine onboarding flow (#97)

Author: chenxin-yan

apps/web/src/app/onboarding/component/onboarding-form.tsx

@@ -1,5 +1,3 @@
-"use client";
-
 import type { Doc, Id } from "@albert-plus/server/convex/_generated/dataModel";
 import { CheckIcon, ChevronDownIcon } from "lucide-react";
 import { useId, useState } from "react";
@@ -35,7 +33,7 @@ export function SchoolCombobox({
   value,
   onValueChange,
   disabled = false,
-  placeholder = "Select your school or college",
+  placeholder = "Select your school",
   id: providedId,
 }: SchoolComboboxProps) {
   const generatedId = useId();

apps/web/src/app/onboarding/component/school-combobox.tsx

@@ -69,22 +69,23 @@ export default function DegreeProgreeUpload({
           removeFile(fileData.id);
           return;
         }
-
-        try {
-          const startingTerm = await extractStartingTerm(file);
-          console.log(startingTerm);
-
-          setStartingTerm(startingTerm);
-        } catch (e) {
-          console.warn("Could not find starting term:", e);
-        }
       } catch (err) {
         console.error("Error verifying PDF:", err);
         toast.error("Could not verify the PDF file.");
         removeFile(fileData.id);
         return;
       }
 
+      // try extract starting term
+      try {
+        const startingTerm = await extractStartingTerm(file);
+        console.log(startingTerm);
+
+        setStartingTerm(startingTerm);
+      } catch (e) {
+        console.warn("Could not find starting term:", e);
+      }
+
       // Extract and parse course history
       try {
         const historyText = await extractCourseHistory(file);
@@ -113,6 +114,7 @@ export default function DegreeProgreeUpload({
       // wait for modal close before clearing state
       // otherwise the modal will flicker with empty data
       setTimeout(() => {
+        setStartingTerm(null);
         setParsedCourses([]);
         setFileName(files[0].file.name);
         if (files[0]) {
@@ -129,6 +131,7 @@ export default function DegreeProgreeUpload({
 
   const handleCancel = () => {
     setIsModalOpen(false);
+    setStartingTerm(null);
     setParsedCourses([]);
     // Remove the uploaded file
     if (files[0]) {

apps/web/src/modules/report-parsing/components/degree-progress-upload.tsx

@@ -120,3 +120,14 @@ export function buildAcademicTimeline(
     totalYears: academicYear,
   };
 }
+
+export function getTermAfterSemesters(
+  start: TermYear,
+  semesters: number,
+): TermYear {
+  let current = start;
+  for (let i = 0; i < semesters; i++) {
+    current = getNextTerm(current);
+  }
+  return current;
+}

apps/web/src/utils/term.ts

@@ -48,5 +48,5 @@ export default defineSchema({
     "userId",
   ]),
   students: defineTable(students).index("by_user_id", ["userId"]),
-  schools: defineTable(schools),
+  schools: defineTable(schools).index("by_name_level", ["name", "level"]),
 });

packages/server/convex/schema.ts

@@ -1,17 +1,21 @@
 import { v } from "convex/values";
 
+const semester = v.object({
+  year: v.number(),
+  term: v.union(
+    v.literal("spring"),
+    v.literal("summer"),
+    v.literal("fall"),
+    v.literal("j-term"),
+  ),
+});
+
 const students = {
   userId: v.string(),
   programs: v.array(v.id("programs")),
   school: v.id("schools"),
-  startingDate: v.object({
-    year: v.number(),
-    term: v.union(v.literal("spring"), v.literal("fall")),
-  }),
-  expectedGraduationDate: v.object({
-    year: v.number(),
-    term: v.union(v.literal("spring"), v.literal("fall")),
-  }),
+  startingDate: semester,
+  expectedGraduationDate: semester,
 };
 
 export { students };

packages/server/convex/schemas/students.ts

@@ -1,8 +1,25 @@
+import { v } from "convex/values";
 import { query } from "./_generated/server";
+import { schoolName } from "./schemas/schools";
 
 export const getSchools = query({
   args: {},
   handler: async (ctx) => {
     return await ctx.db.query("schools").collect();
   },
 });
+
+export const getSchoolByNameAndLevel = query({
+  args: {
+    name: schoolName,
+    level: v.union(v.literal("undergraduate"), v.literal("graduate")),
+  },
+  handler: async (ctx, args) => {
+    return await ctx.db
+      .query("schools")
+      .withIndex("by_name_level", (q) =>
+        q.eq("name", args.name).eq("level", args.level),
+      )
+      .unique();
+  },
+});

packages/server/convex/schools.ts

@@ -73,6 +73,32 @@ export const seedAll = internalMutation({
         programUrl: v.string(),
       }),
     ),
+    students: v.array(
+      v.object({
+        userId: v.string(),
+        programs: v.array(v.string()),
+        school: schoolName,
+        schoolLevel: v.union(v.literal("undergraduate"), v.literal("graduate")),
+        startingDate: v.object({
+          year: v.number(),
+          term: v.union(
+            v.literal("spring"),
+            v.literal("summer"),
+            v.literal("fall"),
+            v.literal("j-term"),
+          ),
+        }),
+        expectedGraduationDate: v.object({
+          year: v.number(),
+          term: v.union(
+            v.literal("spring"),
+            v.literal("summer"),
+            v.literal("fall"),
+            v.literal("j-term"),
+          ),
+        }),
+      }),
+    ),
     courses: v.array(
       v.object({
         code: v.string(),
@@ -363,7 +389,55 @@ export const seedAll = internalMutation({
       }
     }
 
-    // 7. Seed user courses
+    // 7. Seed students
+    console.log("👨 Seeding students...");
+    for (const student of args.students) {
+      // Get school ID by both name and level
+      const school = await ctx.db
+        .query("schools")
+        .withIndex("by_name_level", (q) =>
+          q.eq("name", student.school).eq("level", student.schoolLevel),
+        )
+        .unique();
+      if (!school) {
+        console.warn(
+          `School not found: ${student.school} (${student.schoolLevel})`,
+        );
+        continue;
+      }
+
+      // Convert program names to IDs
+      const programIds: Id<"programs">[] = [];
+      for (const programName of student.programs) {
+        const programId = programMap.get(programName);
+        if (programId) {
+          programIds.push(programId);
+        } else {
+          console.warn(`Program not found: ${programName}`);
+        }
+      }
+
+      const existing = await ctx.db
+        .query("students")
+        .withIndex("by_user_id", (q) => q.eq("userId", student.userId))
+        .first();
+
+      const studentData = {
+        userId: student.userId,
+        programs: programIds,
+        school: school._id,
+        startingDate: student.startingDate,
+        expectedGraduationDate: student.expectedGraduationDate,
+      };
+
+      if (existing) {
+        await ctx.db.patch(existing._id, studentData);
+      } else {
+        await ctx.db.insert("students", studentData);
+      }
+    }
+
+    // 8. Seed user courses
     console.log("📚 Seeding user courses...");
     for (const userCourse of args.userCourses) {
       const existing = await ctx.db

packages/server/convex/seed.ts

@@ -35,9 +35,16 @@ async function seedDatabase() {
     const courseOfferings = await readJSON("courseOfferings.json");
     const prerequisites = await readJSON("prerequisites.json");
     const requirements = await readJSON("requirements.json");
+    const studentsData = await readJSON("students.json");
     const userCoursesData = await readJSON("userCourses.json");
     const userCourseOfferingsData = await readJSON("userCourseOfferings.json");
 
+    // biome-ignore lint/suspicious/noExplicitAny: JSON data doesn't have types
+    const students = studentsData.map((student: any) => ({
+      ...student,
+      userId: TEST_USER_ID,
+    }));
+
     // biome-ignore lint/suspicious/noExplicitAny: JSON data doesn't have types
     const userCourses = userCoursesData.map((course: any) => ({
       ...course,
@@ -60,6 +67,7 @@ async function seedDatabase() {
     console.log(`  - ${courseOfferings.length} course offerings`);
     console.log(`  - ${prerequisites.length} prerequisites`);
     console.log(`  - ${requirements.length} requirements`);
+    console.log(`  - ${students.length} students`);
     console.log(`  - ${userCourses.length} user courses`);
     console.log(`  - ${userCourseOfferings.length} user course offerings`);
     console.log(`\n🔑 Using TEST_USER_ID: ${TEST_USER_ID}\n`);
@@ -91,6 +99,7 @@ async function seedDatabase() {
       courseOfferings,
       prerequisites,
       requirements,
+      students,
       userCourses,
       userCourseOfferings,
     });

packages/server/seed/seed.ts

@@ -0,0 +1,16 @@
+[
+  {
+    "userId": "user_test_123",
+    "programs": ["Computer Science (BS)"],
+    "school": "College of Arts and Science",
+    "schoolLevel": "undergraduate",
+    "startingDate": {
+      "year": 2023,
+      "term": "fall"
+    },
+    "expectedGraduationDate": {
+      "year": 2027,
+      "term": "spring"
+    }
+  }
+]