timetable limit with AI feature still in the works

Author: thomasyzy7

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

@@ -145,7 +145,7 @@ export const availableFunctions: AvailableFunctions = {
   deleteTimetable: async (args: any, req: Request) => {
     try {
       const { id } = args;
-
+      
       // Retrieve the authenticated user
       const user_id = (req as any).user.id;
 
@@ -197,13 +197,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);
@@ -276,9 +296,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) {
@@ -288,6 +305,8 @@ export const availableFunctions: AvailableFunctions = {
         };
       }
 
+
+
       // Check if a timetable with the same title already exist for this user
       const { data: existingTimetable, error: existingTimetableError } =
         await supabase

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

@@ -244,7 +244,9 @@ 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
-        
+
+            ##!IMPORTANT!: For create timetable requests, even if the timetable limit of 25 has been exceeded, run the tool regardless to get a more up to date data. 
+
             ## Your Capabilities
             - Create new timetables based on provided courses and restrictions
             - Update timetable names and semesters

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

@@ -31,6 +31,19 @@ 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 } =
@@ -52,6 +65,7 @@ export default {
           .json({ error: "A timetable with this title already exists" });
       }
       //Create query to insert the user_id and timetable_title into the db
+      
       let insertTimetable = supabase
         .schema("timetable")
         .from("timetables")
@@ -176,15 +190,14 @@ export default {
       }
 
       // Timetables cannot be longer than 50 characters.
-      if (timetable_title.length > 50) {
+      if (timetable_title && timetable_title.length > 50) {
         return res
           .status(400)
           .json({ error: "Timetable Title cannot be over 50 characters long" });
       }
 
       //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 +207,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 +224,6 @@ export default {
           .eq("timetable_title", timetable_title)
           .neq("id", id)
           .maybeSingle();
-
       if (existingTimetableError) {
         return res.status(400).json({ error: existingTimetableError.message });
       }
@@ -223,7 +233,6 @@ export default {
           .status(400)
           .json({ error: "Another timetable with this title already exists" });
       }
-
       let updateData: any = {};
       if (timetable_title) updateData.timetable_title = timetable_title;
       if (semester) updateData.semester = semester;
@@ -240,13 +249,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 +262,7 @@ export default {
       }
       return res.status(200).json(timetableData);
     } catch (error) {
+      console.error(error);
       return res.status(500).send({ error });
     }
   }),

course-matrix/frontend/src/pages/Home/Home.tsx

@@ -4,7 +4,7 @@ import TimetableCard from "./TimetableCard";
 import TimetableCompareButton from "./TimetableCompareButton";
 import TimetableCreateNewButton from "./TimetableCreateNewButton";
 import { useGetTimetablesQuery } from "../../api/timetableApiSlice";
-import { useState } from "react";
+import { useState,useEffect } from "react";
 import TimetableErrorDialog from "../TimetableBuilder/TimetableErrorDialog";
 
 export interface Timetable {
@@ -32,15 +32,26 @@ const Home = () => {
     isLoading: boolean;
     refetch: () => void;
   };
+  
 
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [count, setCount] = useState<number>(0);
+
+  useEffect(() => {
+    if(data!==undefined)
+      setCount(data.length);
+  }, [data]);
 
   return (
     <div className="w-full">
       <div className="m-8">
         <div className="mb-4 flex items-center gap-2 relative group">
           <h1 className="text-2xl font-medium tracking-tight">My Timetables</h1>
           <Pin size={24} className="text-blue-500" />
+
+          <h1 className={`${
+            count >= 25 ? "font-bold text-red-500" : "font-normal text-black"
+        }`}> (Timetable limit: {count}/25)</h1>
         </div>
         <TimetableErrorDialog
           errorMessage={errorMessage}