Containerise frontend and update docker-compose

Author: jolynloh

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

@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
 import Question, { IQuestion } from "../models/Question.ts";
-import { checkIsExistingQuestion, sortAlphabetically } from "../utils/utils.ts";
+import { checkIsExistingQuestion } from "../utils/utils.ts";
 import {
   DUPLICATE_QUESTION_MESSAGE,
   QN_DESC_EXCEED_CHAR_LIMIT_MESSAGE,
@@ -13,8 +13,6 @@ import {
   PAGE_LIMIT_REQUIRED_MESSAGE,
   PAGE_LIMIT_INCORRECT_FORMAT_MESSAGE,
   CATEGORIES_RETRIEVED_MESSAGE,
-  MONGO_OBJ_ID_FORMAT,
-  MONGO_OBJ_ID_MALFORMED_MESSAGE,
 } from "../utils/constants.ts";
 
 import { upload } from "../../config/multer";
@@ -80,7 +78,6 @@ export const createImageLink = async (
 
       const uploadPromises = files.map((file) => uploadFileToFirebase(file));
       const imageUrls = await Promise.all(uploadPromises);
-      console.log(imageUrls);
       res
         .status(200)
         .json({ message: "Images uploaded successfully", imageUrls });
@@ -98,13 +95,7 @@ export const updateQuestion = async (
     const { id } = req.params;
     const { title, description } = req.body;
 
-    if (!id.match(MONGO_OBJ_ID_FORMAT)) {
-      res.status(400).json({ message: MONGO_OBJ_ID_MALFORMED_MESSAGE });
-      return;
-    }
-
     const currentQuestion = await Question.findById(id);
-
     if (!currentQuestion) {
       res.status(404).json({ message: QN_NOT_FOUND_MESSAGE });
       return;
@@ -212,12 +203,7 @@ export const readQuestionsList = async (
     res.status(200).json({
       message: QN_RETRIEVED_MESSAGE,
       questionCount: filteredQuestionCount,
-      questions: filteredQuestions
-        .map(formatQuestionResponse)
-        .map((question) => ({
-          ...question,
-          categories: sortAlphabetically(question.categories),
-        })),
+      questions: filteredQuestions.map(formatQuestionResponse),
     });
   } catch (error) {
     res.status(500).json({ message: SERVER_ERROR_MESSAGE, error });
@@ -255,7 +241,7 @@ export const readCategories = async (
 
     res.status(200).json({
       message: CATEGORIES_RETRIEVED_MESSAGE,
-      categories: sortAlphabetically(uniqueCats),
+      categories: uniqueCats,
     });
   } catch (error) {
     res.status(500).json({ message: SERVER_ERROR_MESSAGE, error });

docker-compose.yml

@@ -19,6 +19,17 @@ services:
     networks:
       - peerprep-network
     restart: on-failure
+  frontend:
+    image: peerprep/frontend
+    build: ./frontend
+    ports:
+      - 5173:5173
+    depends_on:
+      - user-service
+      - question-service
+    networks:
+      - peerprep-network
+    restart: on-failure
 
 networks:
   peerprep-network:

frontend/.dockerignore

@@ -0,0 +1 @@
+node_modules

frontend/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /frontend 
+
+COPY package*.json ./
+
+RUN npm ci
+
+COPY . .
+
+EXPOSE 5173
+
+CMD ["npm", "run", "dev"]