fix(server)!: update convex schemas (#31)

Author: chenxin-yan

packages/server/convex/courseOfferings.ts

@@ -32,7 +32,7 @@ export const getCourseOfferingsByTerm = protectedQuery({
 
 export const getCourseOfferingsByCourseTerm = protectedQuery({
   args: {
-    courseId: v.id("courses"),
+    courseCode: v.string(),
     term: v.union(
       v.literal("spring"),
       v.literal("summer"),
@@ -46,7 +46,7 @@ export const getCourseOfferingsByCourseTerm = protectedQuery({
       .query("courseOfferings")
       .withIndex("by_course_term_section", (q) =>
         q
-          .eq("courseId", args.courseId)
+          .eq("courseCode", args.courseCode)
           .eq("term", args.term)
           .eq("year", args.year),
       )
@@ -68,7 +68,7 @@ export const upsertCourseOfferingInternal = internalMutation({
       .query("courseOfferings")
       .withIndex("by_course_term_section", (q) =>
         q
-          .eq("courseId", args.courseId)
+          .eq("courseCode", args.courseCode)
           .eq("term", args.term)
           .eq("year", args.year)
           .eq("section", args.section),

packages/server/convex/http.ts

@@ -114,10 +114,7 @@ export const ZDeletePrerequisites = z.object({
 });
 
 export const ZUpsertCourseOffering = z.object({
-  courseId: z.pipe(
-    z.string(),
-    z.transform((val) => val as Id<"courses">),
-  ),
+  courseCode: z.string(),
   title: z.string(),
   section: z.string(),
   year: z.number(),

packages/server/convex/schema.ts

@@ -15,9 +15,9 @@ export default defineSchema({
     .index("by_program_level", ["program", "level"]),
   prerequisites: defineTable(prerequisites).index("by_course", ["courseId"]),
   courseOfferings: defineTable(courseOfferings)
-    .index("by_course", ["courseId"])
+    .index("by_course_code", ["courseCode"])
     .index("by_term_year", ["term", "year"])
-    .index("by_course_term_section", ["courseId", "term", "year", "section"]),
+    .index("by_course_term_section", ["courseCode", "term", "year", "section"]),
   userCourses: defineTable(userCourses).index("by_user", ["userId"]),
   userCourseOfferings: defineTable(userCourseOfferings).index("by_user", [
     "userId",

packages/server/convex/schemas/courseOfferings.ts

@@ -1,7 +1,7 @@
 import { v } from "convex/values";
 
 const courseOfferings = {
-  courseId: v.id("courses"),
+  courseCode: v.string(), // course code
   title: v.string(),
   section: v.string(),
   year: v.number(), // 2025
@@ -31,12 +31,12 @@ const courseOfferings = {
     v.literal("closed"),
     v.literal("waitlist"),
   ),
-  waitlistNum: v.number(),
+  waitlistNum: v.optional(v.number()),
 };
 
 const userCourseOfferings = {
   userId: v.string(),
-  courseOffering: v.id("courseOfferings"),
+  courseOfferingId: v.id("courseOfferings"),
   alternativeOf: v.optional(v.id("userCourseOfferings")),
 };
 

packages/server/convex/schemas/courses.ts

@@ -40,20 +40,22 @@ const userCourses = {
     v.literal("fall"),
     v.literal("j-term"),
   ),
-  grade: v.union(
-    v.literal("a"),
-    v.literal("a-"),
-    v.literal("b+"),
-    v.literal("b"),
-    v.literal("b-"),
-    v.literal("c+"),
-    v.literal("c"),
-    v.literal("c-"),
-    v.literal("d+"),
-    v.literal("d"),
-    v.literal("p"),
-    v.literal("f"),
-    v.literal("w"),
+  grade: v.optional(
+    v.union(
+      v.literal("a"),
+      v.literal("a-"),
+      v.literal("b+"),
+      v.literal("b"),
+      v.literal("b-"),
+      v.literal("c+"),
+      v.literal("c"),
+      v.literal("c-"),
+      v.literal("d+"),
+      v.literal("d"),
+      v.literal("p"),
+      v.literal("f"),
+      v.literal("w"),
+    ),
   ),
 };
 

packages/server/convex/schemas/programs.ts

@@ -26,8 +26,8 @@ const requirements = v.union(
     courses: v.array(v.string()), // course code
     courseLevels: v.array(
       v.object({
-        program: v.string(),
-        level: v.number(),
+        program: v.string(), // CSCI-UA
+        level: v.number(), // 400
       }),
     ), // course levels
     creditsRequired: v.number(),

packages/server/convex/userCourseOfferings.ts

@@ -19,7 +19,7 @@ export const addUserCourseOffering = protectedMutation({
     const existing = await ctx.db
       .query("userCourseOfferings")
       .withIndex("by_user", (q) => q.eq("userId", ctx.user.subject))
-      .filter((q) => q.eq(q.field("courseOffering"), args.courseOffering))
+      .filter((q) => q.eq(q.field("courseOfferingId"), args.courseOfferingId))
       .unique();
 
     if (existing) {
@@ -28,7 +28,7 @@ export const addUserCourseOffering = protectedMutation({
 
     return await ctx.db.insert("userCourseOfferings", {
       userId: ctx.user.subject,
-      courseOffering: args.courseOffering,
+      courseOfferingId: args.courseOfferingId,
       alternativeOf: args.alternativeOf,
     });
   },