Merge branch 'backend' into feature/be/#230-modifyChannelGetApiResponse

boostcampwm-2024 · Nov 21, 2024 · 2160228 · 2160228
2 parents 6a7c53b + 3206d89
commit 2160228
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 63 deletions.
diff --git a/backend/src/controllers/authController.js b/backend/src/controllers/authController.js
@@ -1,4 +1,6 @@
 import { loginUser, registerUser } from '../services/authService.js';
+import { ErrorResponseDto } from '../dto/errorResponse.dto.js';
+import { ResponseDto } from '../dto/response.dto.js';
 
 /**
  * @description 로그인 컨트롤러
@@ -9,16 +11,12 @@ export const loginController = async (req, res) => {
   try {
     const token = await loginUser(id, password);
     if (!token) {
-      return res.status(401).json({ success: false, message: 'Invalid ID or password' });
+      return res.status(401).json(new ErrorResponseDto({ message: 'Invalid ID or password' }));
     }
-    return res.status(201).json({
-      success: true,
-      message: 'Login successfully',
-      data: token,
-    });
+    return res.status(200).json(new ResponseDto({ resultMsg: 'Login successful', data: token }));
   } catch (error) {
     console.error('Login error:', error);
-    return res.status(500).json({ success: false, message: 'Server error occurred' });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error occurred' }));
   }
 };
 
@@ -29,16 +27,14 @@ export const registerUserController = async (req, res) => {
   try {
     const { id, name, password, email } = req.body;
     const newUser = await registerUser(id, name, password, email);
-    return res.status(201).json({
-      success: true,
-      message: 'Login successfully',
-      data: newUser,
-    });
+    return res
+      .status(200)
+      .json(new ResponseDto({ resultMsg: 'Registration successful', data: newUser }));
   } catch (error) {
     if (error.message === 'User ID already exists') {
-      return res.status(409).json({ error: 'User ID already exists' });
+      return res.status(409).json(new ErrorResponseDto({ message: 'User ID already exists' }));
     }
     console.error('User registration error:', error);
-    res.status(500).json({ error: 'Server error' });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error' }));
   }
 };
diff --git a/backend/src/controllers/channelController.js b/backend/src/controllers/channelController.js
@@ -5,6 +5,8 @@ import {
   getChannelGuestInfoService,
   getUserChannels,
 } from '../services/channelService.js';
+import { ResponseDto } from '../dto/response.dto.js';
+import { ErrorResponseDto } from '../dto/errorResponse.dto.js';
 
 /**
  * @description 채널 생성 컨트롤러
@@ -15,17 +17,12 @@ export const createChannelController = async (req, res) => {
 
     const channel = await createChannelService(name, host_id, guests);
 
-    return res.status(201).json({
-      success: true,
-      message: 'Channel created successfully',
-      data: channel,
-    });
+    return res
+      .status(200)
+      .json(new ResponseDto({ resultMsg: 'Channel created successfully', data: channel }));
   } catch (err) {
     console.error(err);
-    return res.status(500).json({
-      success: false,
-      message: 'Server error',
-    });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error occurred' }));
   }
 };
 
@@ -40,22 +37,15 @@ export const addGuestController = async (req, res) => {
     const updatedChannel = await addGuestService(channelId, guests);
 
     if (!updatedChannel) {
-      return res.status(404).json({
-        success: false,
-        message: 'Channel not found',
-      });
+      return res.status(404).json(new ErrorResponseDto({ message: 'Channel not found' }));
     }
 
-    return res.status(200).json({
-      success: true,
-      message: 'Guests added successfully',
-    });
+    return res
+      .status(200)
+      .json(new ResponseDto({ resultMsg: 'Guests added successfully', data: updatedChannel }));
   } catch (err) {
     console.error(err);
-    return res.status(500).json({
-      success: false,
-      message: 'Server error',
-    });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error occurred' }));
   }
 };
 
@@ -68,16 +58,14 @@ export const getChannelInfoController = async (req, res) => {
   try {
     const channel = await getChannelByIdService(id);
     if (!channel) {
-      return res.status(404).json({ success: false, message: 'Channel not found' });
+      return res.status(404).json(new ErrorResponseDto({ message: 'Channel not found' }));
     }
-    return res.status(200).json({
-      success: true,
-      message: 'Get channel successfully',
-      data: channel,
-    });
+    return res
+      .status(200)
+      .json(new ResponseDto({ resultMsg: 'Get channel successfully', data: channel }));
   } catch (err) {
     console.error(err);
-    return res.status(500).json({ success: false, message: 'Server error' });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error occurred' }));
   }
 };
 
@@ -89,17 +77,14 @@ export const getChannelGuestInfoController = async (req, res) => {
   try {
     const result = await getChannelGuestInfoService(channelId, guestId);
     if (result) {
-      res.status(200).json({
-        success: true,
-        message: 'Get guest data successfully',
-        data: result,
-      });
-    } else {
-      res.status(404).json({ success: false, message: 'Channel or guest not found' });
+      return res
+        .status(200)
+        .json(new ResponseDto({ resultMsg: 'Get guest data successfully', data: result }));
     }
+    return res.status(404).json(new ErrorResponseDto({ message: 'Channel or guest not found' }));
   } catch (error) {
     console.error(error);
-    res.status(500).json({ success: false, message: 'Server error' });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error occurred' }));
   }
 };
 
@@ -112,15 +97,15 @@ export const getUserChannelsController = async (req, res) => {
   try {
     const channels = await getUserChannels(userId);
     if (!channels.length) {
-      return res.status(404).json({ success: false, message: 'No channels found for this user.' });
+      return res
+        .status(404)
+        .json(new ErrorResponseDto({ message: 'No channels found for this user.' }));
     }
-    res.status(200).json({
-      success: true,
-      message: 'Get channels successfully',
-      data: { channels },
-    });
+    res
+      .status(200)
+      .json(new ResponseDto({ resultMsg: 'Get channels successfully', data: { channels } }));
   } catch (error) {
     console.error(error);
-    return res.status(500).json({ success: false, message: 'Server error' });
+    return res.status(500).json(new ErrorResponseDto({ message: 'Server error occurred' }));
   }
 };
diff --git a/backend/src/dto/errorResponse.dto.js b/backend/src/dto/errorResponse.dto.js
@@ -0,0 +1,8 @@
+export class ErrorResponseDto {
+  constructor(error) {
+    this.resultCode = error.resultCode || 1;
+    this.resultMsg = error.resultMsg || error.message || 'Unknown Error';
+    this.data = null;
+    this.totalCount = 0;
+  }
+}
diff --git a/backend/src/dto/response.dto.js b/backend/src/dto/response.dto.js
@@ -0,0 +1,8 @@
+export class ResponseDto {
+  constructor(data = {}) {
+    this.resultCode = data.resultCode || 0;
+    this.resultMsg = data.resultMsg || '';
+    this.data = data.data || null;
+    this.totalCount = data.totalCount || 0;
+  }
+}
diff --git a/backend/src/middleware/authenticateJWT.js b/backend/src/middleware/authenticateJWT.js
@@ -0,0 +1,18 @@
+import jwt from 'jsonwebtoken';
+
+export const authenticateJWT = (req, res, next) => {
+  const token = req.header('Authorization')?.replace('Bearer ', '');
+
+  if (!token) {
+    return res.status(403).json({ message: 'Access Denied: No Token Provided' });
+  }
+
+  jwt.verify(token, process.env.JWT_SECRET, (err, user) => {
+    if (err) {
+      return res.status(403).json({ message: 'Invalid Token' });
+    }
+
+    req.user = user;
+    next();
+  });
+};
diff --git a/backend/src/routes/authRouter.js b/backend/src/routes/authRouter.js
@@ -59,7 +59,7 @@ authRouter.post(
  *           schema:
  *             $ref: '#/components/schemas/RegisterRequest'
  *     responses:
- *       "201":
+ *       "200":
  *         description: "회원가입 성공"
  *       "400":
  *         description: "유효성 검사 실패"

diff --git a/backend/src/routes/channelRouter.js b/backend/src/routes/channelRouter.js
@@ -8,6 +8,7 @@ import {
   getUserChannelsController,
 } from '../controllers/channelController.js';
 import { validationMiddleware } from '../middleware/validationMiddleware.js';
+import { authenticateJWT } from '../middleware/authenticateJWT.js';
 
 export const channelRouter = express.Router();
 
@@ -27,7 +28,7 @@ export const channelRouter = express.Router();
  *             schema:
  *               $ref: '#/components/schemas/CreateChannelRequest'
  *       responses:
- *         201:
+ *         200:
  *           description: '채널 생성 성공'
  *           content:
  *             application/json:
@@ -40,6 +41,7 @@ channelRouter.post(
     body('name').notEmpty().withMessage('Name is required'),
     body('host_id').notEmpty().withMessage('Host ID is required'),
   ],
+  authenticateJWT,
   validationMiddleware,
   createChannelController,
 );
@@ -77,6 +79,7 @@ channelRouter.post(
 channelRouter.post(
   '/:channelId/guests',
   [body('guests').isArray().withMessage('Guests must be an array')],
+  authenticateJWT,
   validationMiddleware,
   addGuestController,
 );
@@ -108,6 +111,7 @@ channelRouter.post(
 channelRouter.get(
   '/:id',
   [param('id').notEmpty().withMessage('Channel ID is required')],
+  authenticateJWT,
   validationMiddleware,
   getChannelInfoController,
 );
@@ -182,6 +186,7 @@ channelRouter.get(
 channelRouter.get(
   '/user/:userId',
   [param('userId').notEmpty().withMessage('User ID is required')],
+  authenticateJWT,
   validationMiddleware,
   getUserChannelsController,
 );
diff --git a/backend/src/services/channelService.js b/backend/src/services/channelService.js
@@ -73,8 +73,7 @@ export const getChannelByIdService = async id => {
   try {
     return await getChannelWithGuestsByIdFromDB(id);
   } catch (error) {
-    console.error('Error fetching channel:', error);
-    throw error;
+    throw new Error('Error fetching channel', error);
   }
 };
 
@@ -89,8 +88,7 @@ export const getChannelGuestInfoService = async (channelId, guestId) => {
   try {
     return await getGuestByChannelAndGuestIdFromDB(channelId, guestId);
   } catch (error) {
-    console.error('Error fetching channel:', error);
-    throw error;
+    throw new Error('Error fetching channel', error);
   }
 };