Merge branch 'ty/scrum-159-timetable-limit' of https://github.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into ty/scrum-159-timetable-limit

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;
 
@@ -207,17 +207,17 @@ export const availableFunctions: AvailableFunctions = {
         };
       }
 
-      // Timetables cannot exceed the size of 25. 
-      const{count: timetable_count, error: timetableCountError} = 
+      // 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);
+          .schema("timetable")
+          .from("timetables")
+          .select("*", { count: "exact", head: true })
+          .eq("user_id", user_id);
 
       console.log(timetable_count);
-      
-      if ((timetable_count ?? 0) >=25){
+
+      if ((timetable_count ?? 0) >= 25) {
         return {
           status: 400,
           error: "You have exceeded the limit of 25 timetables",
@@ -305,8 +305,6 @@ 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/timetablesController.ts

@@ -31,18 +31,20 @@ 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} = 
+      // 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);
+          .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" });
+
+      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
@@ -65,7 +67,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")

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,useEffect } from "react";
+import { useState, useEffect } from "react";
 import TimetableErrorDialog from "../TimetableBuilder/TimetableErrorDialog";
 
 export interface Timetable {
@@ -32,14 +32,12 @@ 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);
+    if (data !== undefined) setCount(data.length);
   }, [data]);
 
   return (
@@ -49,9 +47,14 @@ const Home = () => {
           <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>
+          <h1
+            className={`${
+              count >= 25 ? "font-bold text-red-500" : "font-normal text-black"
+            }`}
+          >
+            {" "}
+            (Timetable limit: {count}/25)
+          </h1>
         </div>
         <TimetableErrorDialog
           errorMessage={errorMessage}