Remove commented code

ruiqi7 · ruiqi7 · commit 453f25f35246 · 2024-11-12T13:32:28.000+08:00
diff --git a/backend/matching-service/src/handlers/matchHandler.ts b/backend/matching-service/src/handlers/matchHandler.ts
@@ -80,19 +80,6 @@ export const getMatchIdByUid = (uid: string): string | null => {
   return null;
 };
 
-export const getMatchByUid = (
-  uid: string
-): { matchId: string; partner: MatchUser } | null => {
-  for (const [matchId, match] of matches) {
-    if (match.matchUser1.id === uid) {
-      return { matchId: matchId, partner: match.matchUser2 };
-    } else if (match.matchUser2.id === uid) {
-      return { matchId: matchId, partner: match.matchUser1 };
-    }
-  }
-  return null;
-};
-
 export const getMatchById = (matchId: string): Match | undefined => {
   return matches.get(matchId);
 };
diff --git a/backend/matching-service/src/handlers/websocketHandler.ts b/backend/matching-service/src/handlers/websocketHandler.ts
@@ -3,7 +3,6 @@ import {
   handleMatchAccept,
   handleMatchDelete,
   getMatchIdByUid,
-  getMatchByUid,
   getMatchById,
 } from "./matchHandler";
 import { io } from "../server";
diff --git a/backend/question-service/src/app.ts b/backend/question-service/src/app.ts
@@ -21,25 +21,6 @@ const app = express();
 app.use(cors({ origin: allowedOrigins, credentials: true }));
 app.options("*", cors({ origin: allowedOrigins, credentials: true }));
 
-// To handle CORS Errors
-// app.use((req: Request, res: Response, next: NextFunction) => {
-//   res.header("Access-Control-Allow-Origin", req.headers.origin); // "*" -> Allow all links to access
-
-//   res.header(
-//     "Access-Control-Allow-Headers",
-//     "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-//   );
-
-//   // Browsers usually send this before PUT or POST Requests
-//   if (req.method === "OPTIONS") {
-//     res.header("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, PATCH");
-//     return res.status(200).json({});
-//   }
-
-//   // Continue Route Processing
-//   next();
-// });
-
 app.use(express.json());
 app.use("/api/questions", questionRoutes);
 app.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
diff --git a/backend/user-service/src/app.ts b/backend/user-service/src/app.ts
@@ -22,25 +22,6 @@ app.use(express.json());
 app.use(cors({ origin: allowedOrigins, credentials: true })); // config cors so that front-end can use
 app.options("*", cors({ origin: allowedOrigins, credentials: true }));
 
-// To handle CORS Errors
-// app.use((req: Request, res: Response, next: NextFunction) => {
-//   res.header("Access-Control-Allow-Origin", req.headers.origin); // "*" -> Allow all links to access
-
-//   res.header(
-//     "Access-Control-Allow-Headers",
-//     "Origin, X-Requested-With, Content-Type, Accept, Authorization"
-//   );
-
-//   // Browsers usually send this before PUT or POST Requests
-//   if (req.method === "OPTIONS") {
-//     res.header("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, PATCH");
-//     return res.status(200).json({});
-//   }
-
-//   // Continue Route Processing
-//   next();
-// });
-
 app.use("/api/users", userRoutes);
 app.use("/api/auth", authRoutes);
 app.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
diff --git a/backend/user-service/tests/authRoutes.spec.ts b/backend/user-service/tests/authRoutes.spec.ts
@@ -101,10 +101,6 @@ describe("Auth routes", () => {
     expect(res.status).toBe(401);
   });
 
-  it("Verify token but users not found", async () => {
-    // TODO
-  });
-
   it("Verify token", async () => {
     const { email, password } = await insertNonAdminUser();
 
@@ -164,8 +160,4 @@ describe("Auth routes", () => {
 
     expect(res.status).toBe(403);
   });
-
-  it("Verify if user is owner or admin", async () => {
-    // TODO
-  });
 });
diff --git a/frontend/src/components/Chat/index.tsx b/frontend/src/components/Chat/index.tsx
@@ -60,7 +60,6 @@ const Chat: React.FC<ChatProps> = ({ isActive }) => {
 
     return () => {
       communicationSocket.emit(CommunicationEvents.USER_DISCONNECT);
-      // setMessages([]); // clear the earlier messages in dev mode
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
diff --git a/frontend/src/components/Layout/index.tsx b/frontend/src/components/Layout/index.tsx
@@ -10,7 +10,6 @@ const Layout: React.FC = () => {
         flexDirection: "column",
         minHeight: "100vh",
         minWidth: "755px",
-        // minInlineSize: "100vw",
       }}
     >
       <Navbar />
diff --git a/frontend/src/components/Navbar/Navbar.test.tsx b/frontend/src/components/Navbar/Navbar.test.tsx
@@ -26,12 +26,14 @@ beforeEach(() => {
     retryMatch: jest.fn(),
     matchingTimeout: jest.fn(),
     matchOfferTimeout: jest.fn(),
-    verifyMatchStatus: jest.fn(),
+    getMatchId: jest.fn(),
     matchUser: null,
     matchCriteria: null,
     partner: null,
     matchPending: false,
     loading: false,
+    questionId: null,
+    questionTitle: null,
   }));
 });
 
diff --git a/frontend/src/components/QuestionCategoryAutoComplete/QuestionCategoryAutoComplete.test.tsx b/frontend/src/components/QuestionCategoryAutoComplete/QuestionCategoryAutoComplete.test.tsx
@@ -38,34 +38,6 @@ describe("Question Category Auto Complete", () => {
     await waitFor(() => expect(screen.getByText("DFS")).toBeInTheDocument());
   });
 
-  // it("Adding a new category not from the category list", async () => {
-  //   const { rerender } = render(
-  //     <QuestionCategoryAutoComplete
-  //       selectedCategories={selectedCategories}
-  //       setSelectedCategories={setSelectedCategories}
-  //     />
-  //   );
-
-  //   const input = screen.getByLabelText("Category");
-  //   fireEvent.change(input, { target: { value: "New Category" } });
-
-  //   const valueAdded = 'Add: "New Category"';
-  //   expect(await screen.findByText(valueAdded)).toBeInTheDocument();
-
-  //   fireEvent.click(screen.getByText(valueAdded));
-
-  //   const updatedCategories = [...selectedCategories, "New Category"];
-
-  //   rerender(
-  //     <QuestionCategoryAutoComplete
-  //       selectedCategories={updatedCategories}
-  //       setSelectedCategories={setSelectedCategories}
-  //     />
-  //   );
-
-  //   expect(screen.getByText("New Category")).toBeInTheDocument();
-  // });
-
   it("Remove a category from selected categories", async () => {
     render(
       <QuestionCategoryAutoComplete
diff --git a/frontend/src/components/QuestionCategoryAutoComplete/index.tsx b/frontend/src/components/QuestionCategoryAutoComplete/index.tsx
@@ -28,28 +28,10 @@ const QuestionCategoryAutoComplete: React.FC<
       sx={{ marginTop: 2 }}
       value={selectedCategories}
       onChange={(_e, newCategoriesSelected) => {
-        // const newValue =
-        //   newCategoriesSelected[newCategoriesSelected.length - 1];
-        // if (typeof newValue === "string" && newValue.startsWith(`Add: "`)) {
-        //   const newCategory = newValue.slice(6, -1);
-        //   state.questionCategories.push(newCategory);
-        //   setSelectedCategories((prev) => [...prev, newCategory]);
-        // } else {
-        //   setSelectedCategories(newCategoriesSelected);
-        // }
         setSelectedCategories(newCategoriesSelected);
       }}
       filterOptions={(options, params) => {
         const filtered = filter(options, params);
-
-        // const { inputValue } = params;
-
-        // const isExisting = options.some((option) => inputValue === option);
-
-        // if (inputValue !== "" && !isExisting) {
-        //   filtered.push(`Add: "${inputValue}"`);
-        // }
-
         return filtered;
       }}
       renderTags={(value, getTagProps) =>
diff --git a/frontend/src/pages/Home/index.tsx b/frontend/src/pages/Home/index.tsx
@@ -17,8 +17,8 @@ import AppMargin from "../../components/AppMargin";
 import {
   complexityList,
   languageList,
-  maxMatchTimeout,
-  minMatchTimeout,
+  MAX_MATCH_TIMEOUT,
+  MIN_MATCH_TIMEOUT,
   QUESTION_DOES_NOT_EXIST_ERROR,
   USE_MATCH_ERROR_MESSAGE,
 } from "../../utils/constants";
@@ -258,11 +258,11 @@ const Home: React.FC = () => {
                 const newTimeout = value ? parseInt(value, 10) : undefined;
                 setTimeout(newTimeout);
               }}
-              helperText={`Set a timeout between ${minMatchTimeout} to ${maxMatchTimeout} seconds`}
+              helperText={`Set a timeout between ${MIN_MATCH_TIMEOUT} to ${MAX_MATCH_TIMEOUT} seconds`}
               error={
                 !timeout ||
-                timeout < minMatchTimeout ||
-                timeout > maxMatchTimeout
+                timeout < MIN_MATCH_TIMEOUT ||
+                timeout > MAX_MATCH_TIMEOUT
               }
               sx={{
                 backgroundColor: "white",
@@ -283,8 +283,8 @@ const Home: React.FC = () => {
           sx={{ marginTop: 2 }}
           disabled={
             !timeout ||
-            timeout < minMatchTimeout ||
-            timeout > maxMatchTimeout ||
+            timeout < MIN_MATCH_TIMEOUT ||
+            timeout > MAX_MATCH_TIMEOUT ||
             !complexity ||
             !category ||
             !language
diff --git a/frontend/src/pages/Matching/index.tsx b/frontend/src/pages/Matching/index.tsx
@@ -6,7 +6,7 @@ import classes from "./index.module.css";
 import Timer from "../../components/Timer";
 import { useMatch } from "../../contexts/MatchContext";
 import {
-  minMatchTimeout,
+  MIN_MATCH_TIMEOUT,
   USE_MATCH_ERROR_MESSAGE,
 } from "../../utils/constants";
 import { Navigate } from "react-router-dom";
@@ -17,7 +17,7 @@ const Matching: React.FC = () => {
     throw new Error(USE_MATCH_ERROR_MESSAGE);
   }
   const { matchingTimeout, matchCriteria } = match;
-  const timeout = matchCriteria?.timeout || minMatchTimeout;
+  const timeout = matchCriteria?.timeout || MIN_MATCH_TIMEOUT;
 
   const [timeLeft, setTimeLeft] = useState<number>(timeout);
 
diff --git a/frontend/src/reducers/questionReducer.ts b/frontend/src/reducers/questionReducer.ts
@@ -302,8 +302,6 @@ export const updateQuestionById = async (
         description: question.description,
         complexity: question.complexity,
         category: question.categories,
-        // testcaseInputFileUrl: question.testcaseInputFileUrl,
-        // testcaseOutputFileUrl: question.testcaseOutputFileUrl,
         ...urls,
         pythonTemplate: question.pythonTemplate,
         javaTemplate: question.javaTemplate,
diff --git a/frontend/src/utils/constants.ts b/frontend/src/utils/constants.ts
@@ -63,9 +63,8 @@ export const SUCCESSFUL_SIGNUP =
 
 // Field Validation
 export const FILL_ALL_FIELDS = "Please fill in all fields";
-
-export const minMatchTimeout = 30;
-export const maxMatchTimeout = 300;
+export const MIN_MATCH_TIMEOUT = 30;
+export const MAX_MATCH_TIMEOUT = 300;
 
 // Question
 export const SUCCESS_QUESTION_CREATE = "Question created successfully";

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ const Layout: React.FC = () => {`
`10`	`10`	`flexDirection: "column",`
`11`	`11`	`minHeight: "100vh",`
`12`	`12`	`minWidth: "755px",`
`13`		`- // minInlineSize: "100vw",`
`14`	`13`	`}}`
`15`	`14`	`>`
`16`	`15`	`<Navbar />`