Add bug fixes

- Match service sending improper params to get random qn
- FE sending improper difficulty values

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

backend/matching/src/services/get-match-items.ts

@@ -1,4 +1,5 @@
-import { IMatchItemsResponse, IMatchType } from '../types/index';
+import type { IMatchItemsResponse, IMatchType } from '@/types';
+
 import { createRoom } from './collab';
 import { getRandomQuestion } from './question';
 import { fetchAttemptedQuestions } from './user';
@@ -21,24 +22,26 @@ export async function getMatchItems(
     ]);
 
     const allAttemptedQuestions = [...new Set([...attemptedQuestions1, ...attemptedQuestions2])];
-
+    const topics = topic?.split('|') ?? [];
     const payload = {
       attemptedQuestions: allAttemptedQuestions,
       ...(searchIdentifier === 'difficulty' && difficulty ? { difficulty } : {}),
-      ...(searchIdentifier === 'topic' && topic ? { topic } : {}),
-      ...(searchIdentifier === 'exact match' && topic && difficulty ? { topic, difficulty } : {}),
+      ...(searchIdentifier === 'topic' && topic ? { topic: topics } : {}),
+      ...(searchIdentifier === 'exact match' && topic && difficulty
+        ? { topic: topics, difficulty }
+        : {}),
     };
 
     // Get a random question
     const question = await getRandomQuestion(payload);
 
-    const roomName = await createRoom(userId1, userId2, question.id.toString());
+    const roomId = await createRoom(userId1, userId2, question.id.toString());
 
     console.log('Successfully got match items');
     return {
-      roomName,
+      roomId,
       questionId: question.id,
-      question,
+      // question,
     };
   } catch (error) {
     console.error('Error in getMatchItems:', error);

backend/matching/src/types/index.ts

@@ -54,20 +54,20 @@ export interface IServiceResponse<T> {
 
 export interface IQuestion {
   id: number;
-  title: string;
-  description: string;
-  difficulty: string;
-  topic: string[];
+  // title: string;
+  // description: string;
+  // difficulty: string;
+  // topic: string[];
 }
 
 export interface IGetRandomQuestionPayload {
   attemptedQuestions: number[];
   difficulty?: string;
-  topic?: string;
+  topic?: Array<string>;
 }
 
 export interface IMatchItemsResponse {
-  roomName: string;
+  roomId: string;
   questionId: number;
-  question: IQuestion;
+  // question: IQuestion;
 }

frontend/src/routes/match/match-form.tsx

@@ -29,6 +29,8 @@ interface MatchFormProps {
   topics: string[];
 }
 
+const DIFFICULTIES = ['Easy', 'Medium', 'Hard'] as const;
+
 export const MatchForm = ({ topics }: MatchFormProps) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
@@ -105,9 +107,11 @@ export const MatchForm = ({ topics }: MatchFormProps) => {
                         </SelectTrigger>
                       </FormControl>
                       <SelectContent>
-                        <SelectItem value='easy'>Easy</SelectItem>
-                        <SelectItem value='medium'>Medium</SelectItem>
-                        <SelectItem value='hard'>Hard</SelectItem>
+                        {DIFFICULTIES.map((value, index) => (
+                          <SelectItem key={index} value={value}>
+                            {value}
+                          </SelectItem>
+                        ))}
                       </SelectContent>
                     </Select>
                     <FormMessage />