Release/1.5 (#138)

Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>

Author: 7 people

.github/workflows/workflow.yml

@@ -320,27 +320,6 @@ describe("PUT /api/timetables/:id", () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
-  test("should return error code 400 and message 'New timetable title or semester or updated favorite status is required when updating a timetable' if request body is empty", async () => {
-    // Make sure the test user is authenticated
-    const user_id = "testuser04-f84fd0da-d775-4424-ad88-d9675282453c";
-    const timetableData = {};
-
-    // Mock authHandler to simulate the user being logged in
-    (
-      authHandler as jest.MockedFunction<typeof authHandler>
-    ).mockImplementationOnce(mockAuthHandler(user_id));
-
-    const response = await request(app)
-      .put("/api/timetables/1")
-      .send(timetableData);
-
-    // Check that the `update` method was called
-    expect(response.statusCode).toBe(400);
-    expect(response.body).toEqual({
-      error:
-        "New timetable title or semester or updated favorite status or email notifications enabled is required when updating a timetable",
-    });
-  });
 
   test("should update the timetable successfully", async () => {
     // Make sure the test user is authenticated
@@ -361,7 +340,7 @@ describe("PUT /api/timetables/:id", () => {
 
     // Check that the `update` method was called
     expect(response.statusCode).toBe(200);
-    expect(response.body).toEqual({
+    expect(response.body).toMatchObject({
       timetable_title: "Updated Title",
       semester: "Spring 2025",
     });

course-matrix/backend/__tests__/timetablesController.test.ts

@@ -41,7 +41,6 @@ export const availableFunctions: AvailableFunctions = {
     try {
       // Retrieve user_id
       const user_id = (req as any).user.id;
-
       // Retrieve user timetable item based on user_id
       let timeTableQuery = supabase
         .schema("timetable")
@@ -63,7 +62,11 @@ export const availableFunctions: AvailableFunctions = {
         };
       }
 
-      return { status: 200, data: timetableData };
+      return {
+        status: 200,
+        timetableCount: timetableData.length,
+        data: timetableData,
+      };
     } catch (error) {
       console.log(error);
       return { status: 400, error: error };
@@ -113,6 +116,7 @@ export const availableFunctions: AvailableFunctions = {
       }
 
       let updateData: any = {};
+      updateData.updated_at = new Date().toISOString();
       if (timetable_title) updateData.timetable_title = timetable_title;
       if (semester) updateData.semester = semester;
 
@@ -198,13 +202,33 @@ export const availableFunctions: AvailableFunctions = {
     try {
       // Extract event details and course information from the request
       const { name, semester, courses, restrictions } = args;
+      // Get user id from session authentication to insert in the user_id col
+      const user_id = (req as any).user.id;
+
       if (name.length > 50) {
         return {
           status: 400,
           error: "timetable title is over 50 characters long",
         };
       }
 
+      // Timetables cannot exceed the size of 25.
+      const { count: timetable_count, error: timetableCountError } =
+        await supabase
+          .schema("timetable")
+          .from("timetables")
+          .select("*", { count: "exact", head: true })
+          .eq("user_id", user_id);
+
+      console.log(timetable_count);
+
+      if ((timetable_count ?? 0) >= 25) {
+        return {
+          status: 400,
+          error: "You have exceeded the limit of 25 timetables",
+        };
+      }
+
       const courseOfferingsList: OfferingList[] = [];
       const validCourseOfferingsList: GroupedOfferingList[] = [];
       const maxdays = getMaxDays(restrictions);
@@ -277,9 +301,6 @@ export const availableFunctions: AvailableFunctions = {
 
       // ------ CREATE FLOW ------
 
-      // Get user id from session authentication to insert in the user_id col
-      const user_id = (req as any).user.id;
-
       // Retrieve timetable title
       const schedule = trim(validSchedules)[0];
       if (!name || !semester) {

course-matrix/backend/src/constants/availableFunctions.ts

@@ -244,7 +244,6 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
             - Allowing natural language queries about courses, offerings, and academic programs
             - Providing personalized recommendations based on degree requirements and course availability
             - Creating, reading, updating, and deleting user timetables based on natural language
-        
             ## Your Capabilities
             - Create new timetables based on provided courses and restrictions
             - Update timetable names and semesters
@@ -266,11 +265,12 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
             }/dashboard/timetable?edit=[[TIMETABLE_ID]] , where TIMETABLE_ID is the id of the respective timetable.
             - If the user provides a course code of length 6 like CSCA08, then assume they mean CSCA08H3 (H3 appended)
             - If the user wants to create a timetable:
-              1. First call getCourses to get course information on the requested courses, 
-              2. If the user provided a semester, then call getOfferings with the provided courses and semester to ensure the courses are actually offered in the semester. 
+              1. First call getTimetables to refetch most recent info on timetable names + timetableCount. DO NOT assume timetable names and # of timetables is same since last query.
+              2. Then call getCourses to get course information on the requested courses, 
+              3. If the user provided a semester, then call getOfferings with the provided courses and semester to ensure the courses are actually offered in the semester. 
                 a) If a course is NOT returned by getOFferings, then list it under "Excluded courses" with "reason: not offered in [provided semester]"
                 b) If no courses have offerings, then do not generate the timetable.
-              3. Lastly, call generateTimetable with the provided information.
+              4. Lastly, call generateTimetable with the provided information.
             - Do not make up fake courses or offerings. 
             - If a user asks about a course that you do not know of, acknowledge this.
             - You can only edit title of the timetable, nothing else. If a user tries to edit something else, acknowledge this limitation.
@@ -280,12 +280,14 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
             - After a deletion has been cancelled, /timetable confirm will do nothing. If the user wants to delete again after cancelling, they must specify so.
             - Do not create multiple timetables for a single user query. Each user query can create at most 1 timetable
             - If you try to update or create a timetable but you get an error saying a timetable with the same name already exists, then ask the user to rename
+            - It is possible for users to delete timetables / update them manually. For this reason, always refetch getTimtables before creation, to get the latest names and timetable count. Do not assume the timetables are the same since the last query.
+            - If a user asks for the timetable count, always refetch getTimetables. Assume this count could have changed between user queries.
             `,
         messages,
         tools: {
           getTimetables: tool({
             description:
-              "Get all the timetables of the currently logged in user.",
+              "Get all the timetables of the currently logged in user AND the number of timetables of the currently logged in user",
             parameters: z.object({}),
             execute: async (args) => {
               return await availableFunctions.getTimetables(args, req);

course-matrix/backend/src/controllers/aiController.ts

@@ -31,6 +31,21 @@ export default {
           .status(400)
           .json({ error: "Timetable Title cannot be over 50 characters long" });
       }
+      // Timetables cannot exceed the size of 25.
+      const { count: timetable_count, error: timetableCountError } =
+        await supabase
+          .schema("timetable")
+          .from("timetables")
+          .select("*", { count: "exact", head: true })
+          .eq("user_id", user_id);
+
+      console.log(timetable_count);
+
+      if ((timetable_count ?? 0) >= 25) {
+        return res
+          .status(400)
+          .json({ error: "You have exceeded the limit of 25 timetables" });
+      }
 
       // Check if a timetable with the same title already exist for this user
       const { data: existingTimetable, error: existingTimetableError } =
@@ -163,17 +178,6 @@ export default {
         favorite,
         email_notifications_enabled,
       } = req.body;
-      if (
-        !timetable_title &&
-        !semester &&
-        favorite === undefined &&
-        email_notifications_enabled === undefined
-      ) {
-        return res.status(400).json({
-          error:
-            "New timetable title or semester or updated favorite status or email notifications enabled is required when updating a timetable",
-        });
-      }
 
       // Timetables cannot be longer than 50 characters.
       if (timetable_title && timetable_title.length > 50) {
@@ -184,7 +188,6 @@ export default {
 
       //Retrieve the authenticated user
       const user_id = (req as any).user.id;
-
       //Retrieve users allowed to access the timetable
       const { data: timetableUserData, error: timetableUserError } =
         await supabase
@@ -194,15 +197,13 @@ export default {
           .eq("user_id", user_id)
           .eq("id", id)
           .maybeSingle();
-
       if (timetableUserError)
         return res.status(400).json({ error: timetableUserError.message });
 
       //Validate timetable validity:
       if (!timetableUserData || timetableUserData.length === 0) {
         return res.status(404).json({ error: "Calendar id not found" });
       }
-
       // Check if another timetable with the same title already exist for this user
       const { data: existingTimetable, error: existingTimetableError } =
         await supabase
@@ -213,7 +214,6 @@ export default {
           .eq("timetable_title", timetable_title)
           .neq("id", id)
           .maybeSingle();
-
       if (existingTimetableError) {
         return res.status(400).json({ error: existingTimetableError.message });
       }
@@ -223,8 +223,8 @@ export default {
           .status(400)
           .json({ error: "Another timetable with this title already exists" });
       }
-
       let updateData: any = {};
+      updateData.updated_at = new Date().toISOString();
       if (timetable_title) updateData.timetable_title = timetable_title;
       if (semester) updateData.semester = semester;
       if (favorite !== undefined) updateData.favorite = favorite;
@@ -240,13 +240,11 @@ export default {
         .eq("id", id)
         .select()
         .single();
-
       const { data: timetableData, error: timetableError } =
         await updateTimetableQuery;
 
       if (timetableError)
         return res.status(400).json({ error: timetableError.message });
-
       // If no records were updated due to non-existence timetable or it doesn't belong to the user.
       if (!timetableData || timetableData.length === 0) {
         return res.status(404).json({
@@ -255,6 +253,7 @@ export default {
       }
       return res.status(200).json(timetableData);
     } catch (error) {
+      console.error(error);
       return res.status(500).send({ error });
     }
   }),

course-matrix/backend/src/controllers/timetablesController.ts

@@ -0,0 +1,33 @@
+import { describe, expect, it, test } from "@jest/globals";
+
+import { convertTimestampToLocaleTime } from "../src/utils/convert-timestamp-to-locale-time";
+
+describe("convertTimestampToLocaleTime", () => {
+  test("should convert a valid timestamp string to a locale time string", () => {
+    const timestamp = "2025-03-28T12:00:00Z";
+    const result = convertTimestampToLocaleTime(timestamp);
+    expect(typeof result).toBe("string");
+    expect(result.length).toBeGreaterThan(0); // Ensures it returns a non-empty string
+  });
+
+  test("should convert a valid numeric timestamp to a locale time string", () => {
+    const timestamp = 1711622400000; // Equivalent to 2025-03-28T12:00:00Z
+    // in milliseconds
+    const result = convertTimestampToLocaleTime(timestamp);
+    expect(typeof result).toBe("string");
+    expect(result.length).toBeGreaterThan(0);
+  });
+
+  test("convert to locale time date is different", () => {
+    const timestamp = "2025-03-28 02:33:02.589Z";
+    const result = convertTimestampToLocaleTime(timestamp);
+    expect(typeof result).toBe("string");
+    expect(result.length).toBeGreaterThan(0);
+  });
+
+  test("should return 'Invalid Date' for an invalid timestamp", () => {
+    const timestamp = "invalid";
+    const result = convertTimestampToLocaleTime(timestamp);
+    expect(result).toBe("Invalid Date");
+  });
+});

course-matrix/frontend/__tests__/convertTimestampToLocaleTime.test.ts

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/img/logo.png" />
+    <link rel="icon" type="image/png" href="/img/course-matrix-logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Course Matrix </title>
   </head>

course-matrix/frontend/index.html

@@ -30,6 +30,7 @@
     "@radix-ui/react-separator": "^1.1.2",
     "@radix-ui/react-slot": "^1.1.2",
     "@radix-ui/react-switch": "^1.1.3",
+    "@radix-ui/react-toast": "^1.2.6",
     "@radix-ui/react-tooltip": "^1.1.8",
     "@reduxjs/toolkit": "^2.5.1",
     "@schedule-x/drag-and-drop": "^2.21.1",