Merge pull request #15 from CS3219-AY2425S1/filter-category

Filter category

Author: bensohh

apps/question-service/src/app/page.tsx

@@ -129,6 +129,7 @@ export default function Home() {
       limit,
       sortBy,
       difficulty,
+      categories,
       delayedSearch
     );
     setQuestions(data.questions);
@@ -141,7 +142,7 @@ export default function Home() {
 
   useEffect(() => {
     loadQuestions();
-  }, [limit, currentPage, sortBy, difficulty, delayedSearch]);
+  }, [limit, currentPage, sortBy, difficulty, categories, delayedSearch]);
 
   // Delay the fetching of data only after user stops typing for awhile
   useEffect(() => {

apps/question-service/src/app/services/question.ts

@@ -26,7 +26,8 @@ export const GetQuestions = async (
   currentPage?: number,
   limit?: number,
   sortBy?: string,
-  difficulty?: string[],
+  difficulties?: string[],
+  categories?: string[],
   title?: string
 ): Promise<QuestionListResponse> => {
   let query_url = `${process.env.NEXT_PUBLIC_API_URL}questions`;
@@ -47,20 +48,23 @@ export const GetQuestions = async (
     }sortField=${field}&sortValue=${order}`;
   }
 
-  if (difficulty && difficulty.length > 0) {
-    const value = difficulty.join(","); // Change them from ["easy", "medium"] to "easy,medium"
+  if (difficulties && difficulties.length > 0) {
+    const value = difficulties.join(","); // Change them from ["easy", "medium"] to "easy,medium"
     query_params += `${query_params.length > 0 ? "&" : "?"}complexity=${value}`;
   }
 
+  if (categories && categories.length > 0) {
+    const value = categories.join(",");
+    query_params += `${query_params.length > 0 ? "&" : "?"}categories=${value}`;
+  }
+
   if (title && title != "") {
     const urlEncodedTitle = encodeURIComponent(title);
     query_params += `${
       query_params.length > 0 ? "&" : "?"
     }title=${urlEncodedTitle}`;
   }
 
-  // TODO: (Ryan) Filtering via categories
-
   query_url += query_params;
   const response = await fetch(query_url);
   const data = await response.json();

apps/question-service/src/utils/SelectOptions.ts

@@ -1,13 +1,16 @@
 export const CategoriesOption = [
-  { label: "Array", value: "Array" },
-  { label: "String", value: "String" },
+  { label: "Arrays", value: "Arrays" },
+  { label: "Algorithms", value: "Algorithms" },
+  { label: "Data Structures", value: "Data Structures" },
+  { label: "Strings", value: "Strings" },
+  { label: "Recursion", value: "Recursion" },
   { label: "Hash Table", value: "Hash Table" },
   { label: "Dynamic Programming", value: "Dynamic Programming" },
   { label: "Math", value: "Math" },
   { label: "Sorting", value: "Sorting" },
   { label: "Greedy", value: "Greedy" },
   { label: "Depth-First Search", value: "Depth-First Search" },
-  { label: "Database", value: "Database" },
+  { label: "Databases", value: "Databases" },
   { label: "Binary Search", value: "Binary Search" },
   { label: "Matrix", value: "Matrix" },
   { label: "Breadth-First Search", value: "Breadth-First Search" },