Merge branch 'development' into BE/stopmatch

jolynloh · jolynloh · commit b4317b71970d · 2024-10-21T00:54:42.000+08:00
diff --git a/backend/matching-service/config/rabbitmq.ts b/backend/matching-service/config/rabbitmq.ts
@@ -32,6 +32,7 @@ export const sendRabbitMq = async (
   try {
     const senderChannel = await mrConnection.createChannel();
     senderChannel.sendToQueue(queue, Buffer.from(JSON.stringify(data)));
+    console.log("Sent to queue:", JSON.stringify(data));
     return true;
   } catch (error) {
     console.log(error);
diff --git a/backend/matching-service/src/utils/mq_utils.ts b/backend/matching-service/src/utils/mq_utils.ts
@@ -34,6 +34,11 @@ export const matchUsers = (newRequest: string) => {
     if (isMatch(newRequestJson, pendingRequest)) {
       matchingRequests.delete(uid);
       createMatch(pendingRequest, newRequestJson);
+      console.log(
+        "Matched users:",
+        JSON.stringify(newRequestJson),
+        JSON.stringify(pendingRequest)
+      );
       return;
     }
   }
diff --git a/backend/question-service/src/controllers/questionController.ts b/backend/question-service/src/controllers/questionController.ts
@@ -251,11 +251,24 @@ export const readCategories = async (
   res: Response,
 ): Promise<void> => {
   try {
-    const uniqueCats = await Question.distinct("category");
+    // const uniqueCats = await Question.distinct("category");
 
+    // res.status(200).json({
+    //   message: CATEGORIES_RETRIEVED_MESSAGE,
+    //   categories: sortAlphabetically(uniqueCats),
+    // });
     res.status(200).json({
       message: CATEGORIES_RETRIEVED_MESSAGE,
-      categories: sortAlphabetically(uniqueCats),
+      categories: sortAlphabetically([
+        "Strings",
+        "Algorithms",
+        "Data Structures",
+        "Bit Manipulation",
+        "Recursion",
+        "Dynamic Programming",
+        "Arrays",
+        "Tree",
+      ]),
     });
   } catch (error) {
     res.status(500).json({ message: SERVER_ERROR_MESSAGE, error });
diff --git a/backend/question-service/src/scripts/seed.ts b/backend/question-service/src/scripts/seed.ts
@@ -11,98 +11,84 @@ export async function seedQuestions() {
       description:
         "Design an algorithm to serialize and deserialize a binary tree. There is no restriction on how your serialization/deserialization algorithm should work. You just need to ensure that a binary tree can be serialized to a string and this string can be deserialized to the original tree structure. \n\n![image](https://firebasestorage.googleapis.com/v0/b/peerprep-c3bd1.appspot.com/o/07148757-21b2-4c20-93e0-d8bef1b3560d?alt=media)",
       complexity: "Hard",
-      category: ["Tree", "Design"],
+      category: ["Tree"],
     },
     {
       title: "Two Sum",
       description:
         "Given an array of integers `nums` and an integer `target`, return indices of the two numbers such that they add up to `target`. You may assume that each input would have **exactly one solution**, and you may not use the same element twice. You can return the answer in any order.",
       complexity: "Easy",
-      category: ["Array", "Hash Table"],
-    },
-    {
-      title: "Add Two Numbers",
-      description:
-        "You are given two non-empty linked lists representing two non-negative integers. The digits are stored in **reverse order**, and each of their nodes contains a single digit. Add the two numbers and return the sum as a linked list. You may assume the two numbers do not contain any leading zero, except the number 0 itself.",
-      complexity: "Medium",
-      category: ["Linked List", "Math"],
+      category: ["Arrays"],
     },
     {
       title: "Longest Substring Without Repeating Characters",
       description:
         "Given a string `s`, find the length of the **longest substring** without repeating characters.",
       complexity: "Medium",
-      category: ["Hash Table", "Two Pointers", "String", "Sliding Window"],
+      category: ["Strings"],
     },
     {
       title: "Median of Two Sorted Arrays",
       description:
         "Given two sorted arrays `nums1` and `nums2` of size `m` and `n` respectively, return the median of the two sorted arrays.",
       complexity: "Hard",
-      category: ["Array", "Binary Search", "Divide and Conquer"],
+      category: ["Arrays"],
     },
     {
       title: "Longest Palindromic Substring",
       description:
         "Given a string `s`, return the **longest palindromic substring** in `s`.",
       complexity: "Medium",
-      category: ["String", "Dynamic Programming"],
+      category: ["Strings", "Dynamic Programming"],
     },
     {
       title: "ZigZag Conversion",
       description:
         "The string `PAYPALISHIRING` is written in a zigzag pattern on a given number of rows like this: (you may want to display this pattern in a fixed font for better legibility) P   A   H   N A P L S I I G Y   I   R And then read line by line: `PAHNAPLSIIGYIR` Write the code that will take a string and make this conversion given a number of rows.",
       complexity: "Medium",
-      category: ["String"],
+      category: ["Strings"],
     },
     {
       title: "Reverse Integer",
       description:
         "Given a signed 32-bit integer `x`, return `x` with its digits reversed. If reversing `x` causes the value to go outside the signed 32-bit integer range `[-2^31, 2^31 - 1]`, then return 0.",
       complexity: "Easy",
-      category: ["Math"],
+      category: ["Strings"],
     },
     {
       title: "String to Integer (atoi)",
       description:
         "Implement the `myAtoi(string s)` function, which converts a string to a 32-bit signed integer (similar to C/C++'s `atoi` function).",
       complexity: "Medium",
-      category: ["Math", "String"],
-    },
-    {
-      title: "Palindrome Number",
-      description:
-        "Given an integer `x`, return `true` if `x` is a palindrome integer. An integer is a palindrome when it reads the same backward as forward. For example, `121` is palindrome while `123` is not.",
-      complexity: "Easy",
-      category: ["Math"],
+      category: ["Strings"],
     },
     {
       title: "Regular Expression Matching",
       description:
         "Given an input string `s` and a pattern `p`, implement regular expression matching with support for `'.'` and `'*'` where: - `'.'` Matches any single character.​​​​ - `'*'` Matches zero or more of the preceding element.",
       complexity: "Hard",
-      category: ["String", "Dynamic Programming", "Backtracking"],
+      category: ["Strings", "Dynamic Programming"],
     },
     {
       title: "Container With Most Water",
       description:
         "Given `n` non-negative integers `a1, a2, ..., an`, where each represents a point at coordinate `(i, ai)`. `n` vertical lines are drawn such that the two endpoints of the line `i` is at `(i, ai)` and `(i, 0)`. Find two lines, which, together with the x-axis forms a container, such that the container contains the most water.",
       complexity: "Medium",
-      category: ["Array", "Two Pointers"],
+      category: ["Arrays"],
     },
     {
       title: "Integer to Roman",
       description:
         "Roman numerals are represented by seven different symbols: `I`, `V`, `X`, `L`, `C`, `D` and `M`. Given an integer, convert it to a roman numeral.",
       complexity: "Medium",
-      category: ["Math", "String"],
+      category: ["Strings"],
     },
     {
       title: "Roman to Integer",
       description:
         "Roman numerals are represented by seven different symbols: `I`, `V`, `X`, `L`, `C`, `D` and `M`. Given a roman numeral, convert it to an integer.",
       complexity: "Easy",
-      category: ["Math", "String"],
+      category: ["Strings"],
     },
   ];
 
diff --git a/frontend/src/components/QuestionCategoryAutoComplete/QuestionCategoryAutoComplete.test.tsx b/frontend/src/components/QuestionCategoryAutoComplete/QuestionCategoryAutoComplete.test.tsx
@@ -38,33 +38,33 @@ 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}
-      />
-    );
+  // 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 input = screen.getByLabelText("Category");
+  //   fireEvent.change(input, { target: { value: "New Category" } });
 
-    const valueAdded = 'Add: "New Category"';
-    expect(await screen.findByText(valueAdded)).toBeInTheDocument();
+  //   const valueAdded = 'Add: "New Category"';
+  //   expect(await screen.findByText(valueAdded)).toBeInTheDocument();
 
-    fireEvent.click(screen.getByText(valueAdded));
+  //   fireEvent.click(screen.getByText(valueAdded));
 
-    const updatedCategories = [...selectedCategories, "New Category"];
+  //   const updatedCategories = [...selectedCategories, "New Category"];
 
-    rerender(
-      <QuestionCategoryAutoComplete
-        selectedCategories={updatedCategories}
-        setSelectedCategories={setSelectedCategories}
-      />
-    );
+  //   rerender(
+  //     <QuestionCategoryAutoComplete
+  //       selectedCategories={updatedCategories}
+  //       setSelectedCategories={setSelectedCategories}
+  //     />
+  //   );
 
-    expect(screen.getByText("New Category")).toBeInTheDocument();
-  });
+  //   expect(screen.getByText("New Category")).toBeInTheDocument();
+  // });
 
   it("Remove a category from selected categories", async () => {
     render(
diff --git a/frontend/src/components/QuestionCategoryAutoComplete/index.tsx b/frontend/src/components/QuestionCategoryAutoComplete/index.tsx
@@ -24,31 +24,31 @@ const QuestionCategoryAutoComplete: React.FC<
   return (
     <Autocomplete
       multiple
-      freeSolo
       options={state.questionCategories}
       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);
-        }
+        // 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 { inputValue } = params;
 
-        const isExisting = options.some((option) => inputValue === option);
+        // const isExisting = options.some((option) => inputValue === option);
 
-        if (inputValue !== "" && !isExisting) {
-          filtered.push(`Add: "${inputValue}"`);
-        }
+        // if (inputValue !== "" && !isExisting) {
+        //   filtered.push(`Add: "${inputValue}"`);
+        // }
 
         return filtered;
       }}
diff --git a/frontend/src/pages/Home/index.tsx b/frontend/src/pages/Home/index.tsx
@@ -49,7 +49,7 @@ const Home: React.FC = () => {
   }
   const { findMatch, loading } = match;
 
-  const isSmallerThan1100px = useMediaQuery('(max-width:1100px)');
+  const isSmallerThan1100px = useMediaQuery("(max-width:1100px)");
 
   useEffect(() => {
     getQuestionCategories(dispatch);
@@ -138,11 +138,9 @@ const Home: React.FC = () => {
               sx={{ backgroundColor: "white" }}
             >
               <Autocomplete
-                multiple
-                disableCloseOnSelect
                 options={complexityList}
                 onChange={(_, selectedOptions) => {
-                  setComplexities(selectedOptions);
+                  setComplexities(selectedOptions ? [selectedOptions] : []);
                 }}
                 renderInput={(params) => <TextField {...params} />}
                 renderTags={(tagValue, getTagProps) =>
@@ -178,11 +176,9 @@ const Home: React.FC = () => {
               sx={{ backgroundColor: "white" }}
             >
               <Autocomplete
-                multiple
-                disableCloseOnSelect
                 options={state.questionCategories}
                 onChange={(_, selectedOptions) => {
-                  setCategories(selectedOptions);
+                  setCategories(selectedOptions ? [selectedOptions] : []);
                 }}
                 renderInput={(params) => <TextField {...params} />}
                 renderTags={(tagValue, getTagProps) =>
@@ -218,11 +214,9 @@ const Home: React.FC = () => {
               sx={{ backgroundColor: "white" }}
             >
               <Autocomplete
-                multiple
-                disableCloseOnSelect
                 options={languageList}
                 onChange={(_, selectedOptions) => {
-                  setLanguages(selectedOptions);
+                  setLanguages(selectedOptions ? [selectedOptions] : []);
                 }}
                 renderInput={(params) => <TextField {...params} />}
                 renderTags={(tagValue, getTagProps) =>

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ export const matchUsers = (newRequest: string) => {`
`34`	`34`	`if (isMatch(newRequestJson, pendingRequest)) {`
`35`	`35`	`matchingRequests.delete(uid);`
`36`	`36`	`createMatch(pendingRequest, newRequestJson);`
	`37`	`+ console.log(`
	`38`	`+ "Matched users:",`
	`39`	`+ JSON.stringify(newRequestJson),`
	`40`	`+ JSON.stringify(pendingRequest)`
	`41`	`+ );`
`37`	`42`	`return;`
`38`	`43`	`}`
`39`	`44`	`}`