Fix incorrect commit so that this branch only contain check timetable duplicated name

Author: minhhaitran08

course-matrix/backend/jest.config.ts

@@ -2,12 +2,8 @@ import type { Config } from "jest";
 
 const config: Config = {
   preset: "ts-jest",
-  moduleNameMapper: {
-    "\\.(css|scss)$": "identity-obj-proxy",
-    "^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
-  },
+  moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
   // to obtain access to the matchers.
-  setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   modulePaths: ["<rootDir>"],
   testEnvironment: "jsdom",

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

@@ -1,7 +1,6 @@
 import { Request, Response } from "express";
 import asyncHandler from "../middleware/asyncHandler";
 import { supabase } from "../db/setupDb";
-import { maybeCoerceBoolean } from "openai/core";
 
 export default {
   /**
@@ -19,11 +18,15 @@ export default {
       const user_id = (req as any).user.id;
 
       //Retrieve timetable title
-      const { timetable_title, semester, favorite = false } = req.body;
-      if (!timetable_title || !semester) {
+      const { timetable_title, semester } = req.body;
+      if (!timetable_title) {
+        return res.status(400).json({ error: "timetable title is required" });
+      }
+
+      if (!semester) {
         return res
           .status(400)
-          .json({ error: "timetable title and semester are required" });
+          .json({ error: "timetable semester is required" });
       }
 
       // Check if a timetable with the same title already exist for this user
@@ -50,14 +53,7 @@ export default {
       let insertTimetable = supabase
         .schema("timetable")
         .from("timetables")
-        .insert([
-          {
-            user_id,
-            timetable_title,
-            semester,
-            favorite,
-          },
-        ])
+        .insert([{ user_id, timetable_title, semester }])
         .select()
         .single();
 
@@ -117,11 +113,11 @@ export default {
       const { id } = req.params;
 
       //Retrieve timetable title
-      const { timetable_title, semester, favorite } = req.body;
-      if (!timetable_title && !semester && favorite === undefined) {
+      const { timetable_title, semester } = req.body;
+      if (!timetable_title && !semester) {
         return res.status(400).json({
           error:
-            "New timetable title or semester or updated favorite status is required when updating a timetable",
+            "New timetable title or semester is required when updating a timetable",
         });
       }
 
@@ -138,34 +134,26 @@ export default {
           .eq("user_id", user_id)
           .maybeSingle();
 
-      if (timetableUserError || !timetableUserData)
+      const timetable_user_id = timetableUserData?.user_id;
+
+      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" });
+      }
+
+      //Validate user access
+      if (user_id !== timetable_user_id) {
         return res
-          .status(400)
-          .json({ error: "Timetable not found or unauthorized" });
-
-      // Check for duplicate timetable title
-      if (timetable_title) {
-        const { data: existingTimetable, error: existingTimetableError } =
-          await supabase
-            .schema("timetable")
-            .from("timetables")
-            .select("*")
-            .eq("user_id", user_id)
-            .eq("timetable_title", timetable_title)
-            .neq("id", id)
-            .maybeSingle();
-
-        if (existingTimetable) {
-          return res
-            .status(400)
-            .json({ error: "A timetable this title already exist" });
-        }
+          .status(401)
+          .json({ error: "Unauthorized access to timetable events" });
       }
 
       let updateData: any = {};
       if (timetable_title) updateData.timetable_title = timetable_title;
       if (semester) updateData.semester = semester;
-      if (favorite !== undefined) updateData.favorite = favorite;
 
       //Update timetable title, for authenticated user only
       let updateTimetableQuery = supabase
@@ -174,8 +162,7 @@ export default {
         .update(updateData)
         .eq("id", id)
         .eq("user_id", user_id)
-        .select()
-        .single();
+        .select();
 
       const { data: timetableData, error: timetableError } =
         await updateTimetableQuery;
@@ -215,6 +202,7 @@ export default {
           .eq("id", id)
           .eq("user_id", user_id)
           .maybeSingle();
+      const timetable_user_id = timetableUserData?.user_id;
 
       if (timetableUserError)
         return res.status(400).json({ error: timetableUserError.message });
@@ -224,6 +212,13 @@ export default {
         return res.status(404).json({ error: "Calendar id not found" });
       }
 
+      //Validate user access
+      if (user_id !== timetable_user_id) {
+        return res
+          .status(401)
+          .json({ error: "Unauthorized access to timetable events" });
+      }
+
       // Delete only if the timetable belongs to the authenticated user
       let deleteTimetableQuery = supabase
         .schema("timetable")

course-matrix/backend/tests/mocks/svgMock.tsx

@@ -104,7 +104,9 @@ const TimetableBuilder = () => {
   const [isCustomSettingsOpen, setIsCustomSettingsOpen] = useState(false);
   const [filters, setFilters] = useState<FilterForm | null>(null);
   const [showFilters, setShowFilters] = useState(false);
-  const [timetableId, setTimetableId] = useState(-1);
+  const [timetableId, setTimetableId] = useState(
+    editingTimetableId ? parseInt(editingTimetableId) : 0
+  );
 
   const noSearchAndFilter = () => {
     return !searchQuery && !filters;
@@ -120,7 +122,7 @@ const TimetableBuilder = () => {
   });
 
   const { data: eventsData, isLoading: eventsLoading } = useGetEventsQuery(
-    timetableId,
+    timetableId
   ) as {
     data: { courseEvents: unknown[]; userEvents: unknown[] };
     isLoading: boolean;
@@ -254,7 +256,7 @@ const TimetableBuilder = () => {
                                     <SelectItem key={value} value={value}>
                                       {value}
                                     </SelectItem>
-                                  ),
+                                  )
                                 )}
                               </SelectContent>
                             </Select>
@@ -290,7 +292,7 @@ const TimetableBuilder = () => {
                   </div>
                   <div className="flex flex-col">
                     <p className="text-sm pb-2">
-                      Selected courses: {selectedCourses.length}
+                      Selected courses: {selectedCourses.length} (Max 8)
                     </p>
                     <div className="flex gap-2 flex-col">
                       {selectedCourses.map((course, index) => (
@@ -330,9 +332,18 @@ const TimetableBuilder = () => {
                   </div>
 
                   <div className="flex flex-col">
-                    <p className="text-sm pb-2">
-                      Enabled Restrictions: {enabledRestrictions.length}
-                    </p>
+                    <FormField
+                      control={form.control}
+                      name="restrictions"
+                      render={({ field }) => (
+                        <FormItem className="pb-2">
+                          <p className="text-sm">
+                            Enabled Restrictions: {enabledRestrictions.length}
+                          </p>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
                     <div className="flex gap-2 flex-col">
                       {enabledRestrictions.map((restric, index) => (
                         <div
@@ -370,18 +381,19 @@ const TimetableBuilder = () => {
 
                   <Button type="submit">Generate</Button>
                 </form>
+
+                {isCustomSettingsOpen && (
+                  <CreateCustomSetting
+                    submitHandler={handleAddRestriction}
+                    closeHandler={() => setIsCustomSettingsOpen(false)}
+                  />
+                )}
               </FormContext.Provider>
             </Form>
           </div>
           <div className="w-3/5">
             <Calendar courseEvents={courseEvents} userEvents={userEvents} />
           </div>
-          {isCustomSettingsOpen && (
-            <CreateCustomSetting
-              submitHandler={handleAddRestriction}
-              closeHandler={() => setIsCustomSettingsOpen(false)}
-            />
-          )}
 
           {showFilters && (
             <SearchFilters

course-matrix/backend/tests/setupTests.ts

@@ -27,5 +27,5 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src", "tests/setupTests.ts"]
+  "include": ["src"]
 }

course-matrix/backend/tsconfig.app.json

@@ -1,12 +1,13 @@
 {
+  "files": [],
+  "references": [
+    { "path": "./tsconfig.app.json" },
+    { "path": "./tsconfig.node.json" }
+  ],
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "outDir": "./build",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "tests"]
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  }
 }