feat: Add participants feature and update server configuration

- Introduced AddParticipantsDTO for validating participant addition requests, and added new endpoint to chatRoute for adding participants to a chat room
- Updated Swagger documentation to include the new endpoint
- Changed server URL in swagger configuration to the new AWS instance
- Removed unused Discord notification functionality and related code
- Removed IP whitelist
- Cleaned up .env.sample by removing unnecessary variables

Author: yuju-lee

.env.sample

@@ -1,6 +1,3 @@
-ALLOWED_IPS=
-IP_NAMES=
-
 PORT=3000
 DB_HOST=
 DB_USER=
@@ -13,6 +10,4 @@ BASIC_AUTH_PASSWORD=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_BUCKET_NAME=
-AWS_REGION=
-
-DISCORD_WEBHOOK_URL=
+AWS_REGION=

src/controllers/chatController.js

@@ -4,12 +4,14 @@ const {
   getChatList,
   createRoom,
   createChallengeRoom,
+  addParticipants,
 } = require('../services/chatService');
 
 const CreateChatRoomDTO = require('../dto/CreateChatRoom.dto');
 const CreateChallengeRoomDTO = require('../dto/CreateChallengeRoom.dto');
 const ChatRoomDTO = require('../dto/ChatRoom.dto');
 const ChatMessageDTO = require('../dto/ChatMessage.dto');
+const AddParticipantsDTO = require('../dto/AddParticipants.dto');
 
 /**
  * @swagger
@@ -48,19 +50,106 @@ const createChatRoomController = async (req, res) => {
   const createUserId = req.headers['user-id'];
 
   if (!createUserId) {
-    console.log('User ID is missing in the request headers.');
     return res.status(400).json({ message: 'User ID is required in the header' });
   }
 
+  const { roomName, type, participants } = req.body;
+
+  if (!roomName || !type || !Array.isArray(participants)) {
+    return res.status(400).json({ message: 'Invalid request body: roomName, type, and participants are required' });
+  }
+
+  if (participants.length < 2) {
+    return res.status(400).json({ message: 'Failed to create room: must select at least 2 participants' });
+  }
+
   try {
-    const { roomName, type, participants } = req.body;
     const createChatRoomDTO = new CreateChatRoomDTO(roomName, type, participants);
-
-    const result = await createRoom(createChatRoomDTO, createUserId);
-    res.status(201).json(new ChatRoomDTO(result.roomId, result.roomName, result.roomType));
+    const result = await createRoom(createChatRoomDTO);
+    return res.status(201).json(new ChatRoomDTO(result.roomId, result.roomName, result.roomType));
   } catch (error) {
     console.error('Failed to create room:', error);
-    res.status(500).json({ message: 'Failed to create room' });
+    return res.status(500).json({ message: 'Failed to create room' });
+  }
+};
+
+/**
+ * @swagger
+ * /chat/add:
+ *   post:
+ *     summary: 채팅방에 인원을 추가합니다.
+ *     tags:
+ *       - Chat
+ *     parameters:
+ *       - in: header
+ *         name: user-id
+ *         required: true
+ *         schema:
+ *           type: string
+ *     requestBody:
+ *       description: 추가할 인원과 방 ID
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             type: object
+ *             properties:
+ *               roomId:
+ *                 type: string
+ *                 description: 추가할 채팅방 ID
+ *               participants:
+ *                 type: array
+ *                 items:
+ *                   type: string
+ *                 description: 추가할 사용자 ID 목록
+ *     responses:
+ *       '200':
+ *         description: 인원 추가 성공
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: Participants added successfully
+ *       '400':
+ *         description: 잘못된 요청 (요청 데이터가 유효하지 않을 경우)
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: Invalid request data
+ *       '500':
+ *         description: 서버 오류 (추가 실패 시)
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: Failed to add participants
+ */
+const addParticipantsController = async (req, res) => {
+  try {
+    const createUserId = req.headers['user-id'];
+
+    if (!createUserId) {
+      return res.status(400).json({ message: 'User ID is required in the header' });
+    }
+
+    const { roomId, participants } = req.body;
+    const addParticipantsDTO = new AddParticipantsDTO(roomId, participants);
+
+    await addParticipants(addParticipantsDTO.roomId, addParticipantsDTO.participants);
+
+    res.status(200).json({ message: 'Participants added successfully' });
+  } catch (error) {
+    res.status(400).json({ message: error.message });
   }
 };
 
@@ -304,4 +393,5 @@ module.exports = {
   getChallengeRoomListController,
   getChatMessagesController,
   createChallengeRoomController,
+  addParticipantsController,
 };

src/discordNoti.js

@@ -0,0 +1,26 @@
+class AddParticipantsDTO {
+    /**
+     * @param {string} roomId
+     * @param {Array<string>} participants
+     */
+    constructor(roomId, participants) {
+      if (!roomId || typeof roomId !== "string") {
+        throw new Error("Invalid roomId: must be a non-empty string");
+      }
+  
+      if (!Array.isArray(participants) || participants.length === 0) {
+        throw new Error("Invalid participants: must be a non-empty array");
+      }
+  
+      participants.forEach((participant) => {
+        if (typeof participant !== "string") {
+          throw new Error(`Invalid participant ID: ${participant}`);
+        }
+      });
+  
+      this.roomId = roomId;
+      this.participants = participants;
+    }
+  }
+  
+  module.exports = AddParticipantsDTO;

src/dto/AddParticipants.dto.js

@@ -1,4 +1,3 @@
-require('dotenv').config();
 const { IpFilter, IpDeniedError } = require('express-ipfilter');
 
 const ips = process.env.ALLOWED_IPS ? process.env.ALLOWED_IPS.split(',') : [];
@@ -16,7 +15,6 @@ if (ips.length === 0) {
   process.exit(1);
 }
 
-// IP 필터 미들웨어 설정
 const ipFilterMiddleware = IpFilter(ips, { mode: 'allow' });
 
 const ipFilterErrorHandler = (err, req, res, next) => {
@@ -27,11 +25,4 @@ const ipFilterErrorHandler = (err, req, res, next) => {
   }
 };
 
-const logRequestWithIpName = (req, res, next) => {
-  const ip = req.ip;
-  const name = ipNameMap[ip] || ip;
-  console.log(`Access granted to: ${name}`);
-  next();
-};
-
-module.exports = { ipFilterMiddleware, ipFilterErrorHandler, logRequestWithIpName };
+module.exports = { ipFilterMiddleware, ipFilterErrorHandler };

src/middlewares/ipFilter.js

@@ -6,12 +6,14 @@ const {
   getGroupRoomListController,
   createChallengeRoomController,
   deleteRoomController,
+  addParticipantsController,
 } = require('../controllers/chatController');
 
 const router = express.Router();
 
 router.get('/list/group', getGroupRoomListController);
 router.get('/list/challenge', getChallengeRoomListController);
+router.post('/add', addParticipantsController);
 router.get('/message/:roomId', getChatMessagesController);
 router.post('/create', createChatRoomController);
 router.post('/create/challenge/:challengeId', createChallengeRoomController);

src/routes/chatRoute.js

@@ -2,13 +2,11 @@ const express = require('express');
 const http = require('http');
 const { Server } = require('socket.io');
 const cors = require('cors');
-const { ipFilterMiddleware, ipFilterErrorHandler } = require('./middlewares/ipFilter'); // IP 화이트리스트 미들웨어
 const chatRoutes = require('./routes/chatRoute');
 const imageRoutes = require('./routes/imageRoute');
 const defaultRoutes = require('./routes/defaultRoute');
 const socketHandler = require('./socket/socketHandler');
 const swaggerUi = require('swagger-ui-express');
-const {sendDiscordShutdownNotification, sendDiscordNotification} = require('./discordNoti');
 const path = require('path');
 const app = express();
 const server = http.createServer(app);
@@ -20,21 +18,18 @@ app.use(express.urlencoded({ extended: true }));
 app.use('/swagger/swagger-output.json', express.static(path.join(__dirname, 'swagger', 'swagger-output.json')));
 app.use('/swagger/swagger-output.yaml', express.static(path.join(__dirname, 'swagger', 'swagger-output.yaml')));
 
+app.use(basicAuth({
+  users: { [process.env.BASIC_AUTH_USER]: process.env.BASIC_AUTH_PASSWORD },
+  challenge: true
+}));
+
 app.use(cors({
     origin: ['http://localhost:3000', 'http://127.0.0.1:5500', 'http://210.183.4.67:8081', 'http://210.183.4.67:8080' , 'http://localhost:3001'],
     methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
     allowedHeaders: ['Content-Type', 'Authorization', 'user-id'],
     credentials: true 
 }));
 
-app.use(basicAuth({
-  users: { [process.env.BASIC_AUTH_USER]: process.env.BASIC_AUTH_PASSWORD },
-  challenge: true
-}));
-
-app.use(ipFilterMiddleware);
-app.use(ipFilterErrorHandler);
-
 app.use('', defaultRoutes);
 app.use('/chat', chatRoutes);
 app.use('/chat/image', imageRoutes);
@@ -54,7 +49,6 @@ socketHandler(io);
 const PORT = process.env.PORT || 3000;
 server.listen(PORT, () => {
     console.log(`Server is running on port ${PORT}`);
-    // sendDiscordNotification();
 });
 
 let isNotified = false;
@@ -63,7 +57,6 @@ const handleShutdown = async () => {
   if (isNotified) return;
   isNotified = true;
   console.log('Server is shutting down...');
-//   await sendDiscordShutdownNotification();
   process.exit();
 };