Merge branch 'main' into D4-ui-fixes

Author: cyiting

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

@@ -1,3 +1,4 @@
+import { logger } from '@/lib/utils';
 import type { IMatchItemsResponse, IMatchType } from '@/types';
 
 import { createRoom } from './collab';
@@ -16,12 +17,18 @@ export async function getMatchItems(
       throw new Error('Both user IDs are required');
     }
 
-    const [attemptedQuestions1, attemptedQuestions2] = await Promise.all([
-      fetchAttemptedQuestions(userId1),
-      fetchAttemptedQuestions(userId2),
-    ]);
+    let allAttemptedQuestions: number[] = [];
+
+    try {
+      const [attemptedQuestions1, attemptedQuestions2] = await Promise.all([
+        fetchAttemptedQuestions(userId1),
+        fetchAttemptedQuestions(userId2),
+      ]);
+      allAttemptedQuestions = [...new Set([...attemptedQuestions1, ...attemptedQuestions2])];
+    } catch (error) {
+      logger.error('Error in getMatchItems: Failed to fetch attempted questions', error);
+    }
 
-    const allAttemptedQuestions = [...new Set([...attemptedQuestions1, ...attemptedQuestions2])];
     const topics = topic?.split('|') ?? [];
     const payload = {
       attemptedQuestions: allAttemptedQuestions,
@@ -35,16 +42,21 @@ export async function getMatchItems(
     // Get a random question
     const question = await getRandomQuestion(payload);
 
+    if (!question) {
+      logger.info('No matching question found');
+      return undefined;
+    }
+
     const roomId = await createRoom(userId1, userId2, question.id.toString());
 
-    console.log('Successfully got match items');
+    logger.info('Successfully got match items');
     return {
       roomId,
       questionId: question.id,
       // question,
     };
   } catch (error) {
-    console.error('Error in getMatchItems:', error);
+    logger.error('Error in getMatchItems:', error);
     return undefined;
   }
 }

backend/question/src/services/post/index.ts

@@ -26,14 +26,17 @@ export const createQuestionService = async (payload: ICreateQuestionPayload) =>
 
 export const updateQuestionService = async (payload: IUpdateQuestionPayload) => {
   try {
+    const updateSet: Partial<typeof questions.$inferInsert> = {};
+
+    if (payload.title !== undefined) updateSet.title = payload.title;
+    if (payload.description !== undefined) updateSet.description = payload.description;
+    if (payload.difficulty !== undefined) updateSet.difficulty = payload.difficulty;
+    if (payload.topics !== undefined && Array.isArray(payload.topics))
+      updateSet.topic = payload.topics.map(String);
+
     const [updatedQuestion] = await db
       .update(questions)
-      .set({
-        title: payload.title,
-        description: payload.description,
-        difficulty: payload.difficulty,
-        topic: payload.topics.map(String),
-      })
+      .set(updateSet)
       .where(eq(questions.id, Number(payload.id)))
       .returning();