Mt/scrum 137 check timetable duplicated name

course-matrix/backend/jest.config.ts

@@ -2,8 +2,12 @@ import type { Config } from "jest";
 
 const config: Config = {
   preset: "ts-jest",
-  moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
+  moduleNameMapper: {
+    "\\.(css|scss)$": "identity-obj-proxy",
+    "^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
+  },
   // 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,6 +1,7 @@
 import { Request, Response } from "express";
 import asyncHandler from "../middleware/asyncHandler";
 import { supabase } from "../db/setupDb";
+import { maybeCoerceBoolean } from "openai/core";
 
 export default {
   /**
@@ -18,26 +19,51 @@ export default {
       const user_id = (req as any).user.id;
 
       //Retrieve timetable title
-      const { timetable_title, semester } = req.body;
-      if (!timetable_title) {
-        return res.status(400).json({ error: "timetable title is required" });
+      const { timetable_title, semester, favorite = false } = req.body;
+      if (!timetable_title || !semester) {
+        return res
+          .status(400)
+          .json({ error: "timetable title and semester are required" });
       }
 
-      if (!semester) {
+      // Check if a timetable with the same title already exist for this user
+      const { data: existingTimetable, error: existingTimetableError } =
+        await supabase
+          .schema("timetable")
+          .from("timetables")
+          .select("id")
+          .eq("user_id", user_id)
+          .eq("timetable_title", timetable_title)
+          .maybeSingle();
+
+      if (existingTimetableError) {
+        return res.status(400).json({ error: existingTimetableError.message });
+      }
+
+      if (existingTimetable) {
         return res
           .status(400)
-          .json({ error: "timetable semester is required" });
+          .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")
-        .insert([{ user_id, timetable_title, semester }])
-        .select();
+        .insert([
+          {
+            user_id,
+            timetable_title,
+            semester,
+            favorite,
+          },
+        ])
+        .select()
+        .single();
 
       const { data: timetableData, error: timetableError } =
         await insertTimetable;
+
       if (timetableError) {
         return res.status(400).json({ error: timetableError.message });
       }
@@ -91,11 +117,11 @@ export default {
       const { id } = req.params;
 
       //Retrieve timetable title
-      const { timetable_title, semester } = req.body;
-      if (!timetable_title && !semester) {
+      const { timetable_title, semester, favorite } = req.body;
+      if (!timetable_title && !semester && favorite === undefined) {
         return res.status(400).json({
           error:
-            "New timetable title or semester is required when updating a timetable",
+            "New timetable title or semester or updated favorite status is required when updating a timetable",
         });
       }
 
@@ -112,26 +138,34 @@ export default {
           .eq("user_id", user_id)
           .maybeSingle();
 
-      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) {
+      if (timetableUserError || !timetableUserData)
         return res
-          .status(401)
-          .json({ error: "Unauthorized access to timetable events" });
+          .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" });
+        }
       }
 
       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
@@ -140,7 +174,8 @@ export default {
         .update(updateData)
         .eq("id", id)
         .eq("user_id", user_id)
-        .select();
+        .select()
+        .single();
 
       const { data: timetableData, error: timetableError } =
         await updateTimetableQuery;
@@ -180,7 +215,6 @@ 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 });
@@ -190,13 +224,6 @@ 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/src/utils/convert-breadth-requirement.ts

@@ -0,0 +1,9 @@
+export const convertBreadthRequirement = (code: string) => {
+  if (code === "ART_LIT_LANG") return "Arts, Literature and Language";
+  else if (code === "HIS_PHIL_CUL")
+    return "History, Philosophy and Cultural Studies";
+  else if (code === "SOCIAL_SCI") return "Social and Behavioral Sciences";
+  else if (code === "NAT_SCI") return "Natural Sciences";
+  else if (code === "QUANT") return "Quantitative Reasoning";
+  else return "";
+};

course-matrix/backend/src/utils/convert-year-level.ts

@@ -0,0 +1,7 @@
+export const convertYearLevel = (code: string) => {
+  if (code === "first_year") return "1st year";
+  else if (code === "second_year") return "2nd year";
+  else if (code === "third_year") return "3rd year";
+  else if (code === "fourth_year") return "4th year";
+  else return "";
+};

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

@@ -0,0 +1,2 @@
+export default "SvgrURL";
+export const ReactComponent = "div";

course-matrix/backend/tests/setupTests.ts

@@ -0,0 +1 @@
+import "@testing-library/jest-dom";

course-matrix/backend/tsconfig.app.json

@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true,
+
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["src", "tests/setupTests.ts"]
+}

course-matrix/frontend/jest.config.ts

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

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

@@ -104,9 +104,7 @@ const TimetableBuilder = () => {
   const [isCustomSettingsOpen, setIsCustomSettingsOpen] = useState(false);
   const [filters, setFilters] = useState<FilterForm | null>(null);
   const [showFilters, setShowFilters] = useState(false);
-  const [timetableId, setTimetableId] = useState(
-    editingTimetableId ? parseInt(editingTimetableId) : 0,
-  );
+  const [timetableId, setTimetableId] = useState(-1);
 
   const noSearchAndFilter = () => {
     return !searchQuery && !filters;

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

@@ -0,0 +1,2 @@
+export default "SvgrURL";
+export const ReactComponent = "div";

course-matrix/frontend/tests/setupTests.ts

@@ -0,0 +1 @@
+import "@testing-library/jest-dom";

course-matrix/frontend/tsconfig.app.json

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

course-matrix/frontend/tsconfig.json

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