Merge pull request #30 from Jiayan-Lim/question-ui

Change error msg for edit
CS3219-AY2425S1 · Sep 29, 2024 · 71d86d6 · 71d86d6
2 parents 4dcba97 + 7599304
commit 71d86d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/backend/question-service/controllers/questionController.js b/backend/question-service/controllers/questionController.js
@@ -67,7 +67,7 @@ exports.addQuestion = async (req, res) => {
             });
         }
         if (error.code == 11000) {
-            return res.status(200).json({
+            return res.status(404).json({
                 errorCode: "DUPLICATE_TITLE",
                 msg: "This title already exists."
 
@@ -114,7 +114,7 @@ exports.updateQuestion = async (req, res) => {
         res.status(200).json(updatedQuestion);
     } catch (error) {
         if (error.code == 11000) {
-            return res.status(200).json({
+            return res.status(404).json({
                 errorCode: "DUPLICATE_TITLE",
                 msg: "This title already exists."
             });

diff --git a/frontend/app/questions/add-edit-question-dialog.tsx b/frontend/app/questions/add-edit-question-dialog.tsx
@@ -28,6 +28,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
+import { escape } from "querystring";
 
 interface AddEditQuestionDialogProps {
   row: Question | null;
@@ -139,17 +140,21 @@ function AddEditQuestionDialog(
         });
 
         if (!response.ok) {
-          if (!row?.id) {
+            console.log("error response from backend: ", response)
+
             const errorResponse = await response.json(); // Get the error details from the response
-            const errorMessages = errorResponse.errors 
-                    ? errorResponse.errors.join(", ") 
-                    : errorResponse.message || "An unexpected error occurred.";
+            const errorCode = errorResponse.errorCode;
+            if (errorCode == "DUPLICATE_TITLE") {
+              console.log("error")
+              alert(`Error: Question "${newQuestion.title}" already exists`);  
+            } else {
+              const errorMessages = errorResponse.errors 
+                      ? errorResponse.errors.join(", ") 
+                      : errorResponse.message || "An unexpected error occurred.";
 
-            alert(`Error: ${errorMessages}`);
+              alert(`Error: ${errorMessages}`);
+            }
             return;
-          } else {
-            throw new Error("Failed to update the question to backend");
-          }
         }
         const responseText = await response.text();
 
@@ -187,9 +192,7 @@ function AddEditQuestionDialog(
         handleClose();
       } catch (error) {
         alert(
-          `An error occurred while ${row?.id ? "updating" : "creating"} ${
-            row?.id ? row?.id : ""
-          } the question. Please try again.`
+          `An error occurred while ${row?.id ? "updating" : "creating"} the question. Please try again.`
         );
         console.error(
           `Error ${row?.id ? "updating" : "creating"} question:`,