resolve merge conflict

Author: feliciagan

backend/question-service/package-lock.json

@@ -5,6 +5,7 @@
   "type": "module",
   "scripts": {
     "start": "tsx server.ts",
+    "dev": "tsx watch server.ts",
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint": "eslint ."
   },
@@ -34,7 +35,6 @@
     "@types/swagger-ui-express": "^4.1.6",
     "eslint": "^9.10.0",
     "globals": "^15.9.0",
-    "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.1",

backend/question-service/package.json

@@ -7,6 +7,7 @@ import {
   QN_DESC_CHAR_LIMIT,
   QN_CREATED_MESSAGE,
   QN_NOT_FOUND_MESSAGE,
+  QN_DELETED_MESSAGE,
   SERVER_ERROR_MESSAGE,
   QN_RETRIEVED_MESSAGE,
   PAGE_LIMIT_REQUIRED_MESSAGE,
@@ -127,6 +128,25 @@ export const updateQuestion = async (
   }
 };
 
+export const deleteQuestion = async (
+  req: Request,
+  res: Response,
+): Promise<void> => {
+  try {
+    const { id } = req.params;
+    const currentQuestion = await Question.findById(id);
+    if (!currentQuestion) {
+      res.status(400).json({ message: QN_NOT_FOUND_MESSAGE });
+      return;
+    }
+
+    await Question.findByIdAndDelete(id);
+    res.status(200).json({ message: QN_DELETED_MESSAGE });
+  } catch (error) {
+    res.status(500).json({ message: SERVER_ERROR_MESSAGE, error });
+  }
+};
+
 interface QnListSearchFilterParams {
   page: string;
   qnLimit: string;
@@ -206,6 +226,7 @@ export const readQuestionIndiv = async (
       res.status(404).json({ message: QN_NOT_FOUND_MESSAGE });
       return;
     }
+
     res.status(200).json({
       message: QN_RETRIEVED_MESSAGE,
       question: questionDetails,

backend/question-service/src/controllers/questionController.ts

@@ -1,6 +1,7 @@
 import express from "express";
 import {
   createQuestion,
+  deleteQuestion,
   createImageLink,
   updateQuestion,
   readQuestionsList,
@@ -19,4 +20,6 @@ router.get("/questions", readQuestionsList);
 
 router.get("/questions/:id", readQuestionIndiv);
 
+router.delete("/questions/:id", deleteQuestion);
+
 export default router;

backend/question-service/src/routes/questionRoutes.ts

@@ -10,6 +10,8 @@ export const QN_CREATED_MESSAGE = "Question created successfully.";
 
 export const QN_NOT_FOUND_MESSAGE = "Question not found.";
 
+export const QN_DELETED_MESSAGE = "Question deleted successfully.";
+
 export const SERVER_ERROR_MESSAGE = "Server error.";
 
 export const QN_RETRIEVED_MESSAGE = "Question retrieved successfully.";