Merge conflicts

Author: guanquann

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

@@ -12,7 +12,6 @@ import {
   QN_RETRIEVED_MESSAGE,
   PAGE_LIMIT_REQUIRED_MESSAGE,
   PAGE_LIMIT_INCORRECT_FORMAT_MESSAGE,
-  CATEGORIES_NOT_FOUND_MESSAGE,
   CATEGORIES_RETRIEVED_MESSAGE,
 } from "../utils/constants.ts";
 
@@ -196,19 +195,14 @@ export const readQuestionsList = async (
       };
     }
 
-    const filteredTotalQuestions = await Question.countDocuments(query);
-    if (filteredTotalQuestions == 0) {
-      res.status(404).json({ message: QN_NOT_FOUND_MESSAGE });
-      return;
-    }
-
+    const filteredQuestionCount = await Question.countDocuments(query);
     const filteredQuestions = await Question.find(query)
       .skip((pageInt - 1) * qnLimitInt)
       .limit(qnLimitInt);
 
     res.status(200).json({
       message: QN_RETRIEVED_MESSAGE,
-      totalQns: filteredTotalQuestions,
+      questionCount: filteredQuestionCount,
       questions: filteredQuestions.map(formatQuestionResponse),
     });
   } catch (error) {
@@ -239,14 +233,11 @@ export const readQuestionIndiv = async (
 };
 
 export const readCategories = async (
-  req: Request,
+  _req: Request,
   res: Response,
 ): Promise<void> => {
   try {
     const uniqueCats = await Question.distinct("category");
-    if (!uniqueCats || uniqueCats.length == 0) {
-      res.status(404).json({ message: CATEGORIES_NOT_FOUND_MESSAGE });
-    }
 
     res.status(200).json({
       message: CATEGORIES_RETRIEVED_MESSAGE,

backend/question-service/src/utils/constants.ts

@@ -22,7 +22,5 @@ export const PAGE_LIMIT_REQUIRED_MESSAGE =
 export const PAGE_LIMIT_INCORRECT_FORMAT_MESSAGE =
   "Page number and question limit per page should be positive integers.";
 
-export const CATEGORIES_NOT_FOUND_MESSAGE = "No categories found.";
-
 export const CATEGORIES_RETRIEVED_MESSAGE =
   "Categories retrieved successfully.";

backend/question-service/swagger.yml

@@ -176,7 +176,7 @@ paths:
                   message:
                     type: string
                     description: Message
-                  totalQns:
+                  questionCount:
                     type: integer
                     description: Total number of questions
                   questions:
@@ -189,12 +189,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/definitions/Error"
-        404:
-          description: Question Not Found
-          content:
-            application/json:
-              schema:
-                $ref: "#/definitions/Error"
         500:
           description: Internal Server Error
           content:
@@ -290,7 +284,7 @@ paths:
           required: true
           description: Question id
       responses:
-        200: 
+        200:
           description: Successful Response
           content:
             application/json:
@@ -302,7 +296,7 @@ paths:
                     description: Message
                   question:
                     $ref: "#/definitions/Question"
-        404: 
+        404:
           description: Question Not Found
           content:
             application/json:
@@ -321,7 +315,7 @@ paths:
       summary: Returns question categories
       description: Returns list of unique question categories
       responses:
-        200: 
+        200:
           description: Successful Response
           content:
             application/json:
@@ -336,12 +330,6 @@ paths:
                     items:
                       type: string
                     description: Categories
-        404:
-          description: Categories Not Found
-          content:
-            application/json:
-              schema:
-                $ref: "#/definitions/Error"
         500:
           description: Internal Server Error
           content:

frontend/__mocks__/styleMock.ts

@@ -0,0 +1,3 @@
+const styleMock = {};
+
+export default styleMock;

frontend/jest.config.ts

@@ -91,7 +91,8 @@ const config: Config = {
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
   moduleNameMapper: {
-    "\\.(css|less|scss|sass)$": "identity-obj-proxy",
+    '\\.(css)$': '<rootDir>/__mocks__/styleMock.ts',
+    '\\.(svg)$': '<rootDir>/__mocks__/styleMock.ts',
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader