boostcampwm-2024 · NewCodes7 · Nov 21, 2024 · Nov 21, 2024
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -116,9 +116,9 @@ jobs:
             cd
             cd /home/ubuntu/nest-server/current/FE
             npm i
-            npx pm2 stop backend-server || true
+            npx pm2 delete quiz-ground-was1 quiz-ground-was2 || true
             cd /home/ubuntu/nest-server/current/BE
-            npx pm2 start dist/src/main.js --name "backend-server"
+            npx pm2 start ecosystem.config.js
 
 #            todo: # FrontEnd 배포
 #            # Frontend 배포

diff --git a/BE/ecosystem.config.js b/BE/ecosystem.config.js
@@ -0,0 +1,18 @@
+module.exports = {
+  apps: [
+    {
+      name: 'quiz-ground-was1',
+      script: 'dist/src/main.js',
+      env: {
+        WAS_PORT: 3000
+      }
+    },
+    {
+      name: 'quiz-ground-was2',
+      script: 'dist/src/main.js',
+      env: {
+        WAS_PORT: 3001
+      }
+    }
+  ]
+};
diff --git a/BE/src/auth/auth.controller.spec.ts b/BE/src/auth/auth.controller.spec.ts
diff --git a/BE/src/auth/auth.service.spec.ts b/BE/src/auth/auth.service.spec.ts
diff --git a/BE/src/game/dto/create-game.dto.ts b/BE/src/game/dto/create-game.dto.ts
@@ -36,5 +36,5 @@ export class CreateGameDto {
       message: '잘못된 boolean 값입니다'
     });
   })
-  isPublicGame: boolean;
+  isPublic: boolean;
 }
diff --git a/BE/src/game/dto/update-room-option.dto.ts b/BE/src/game/dto/update-room-option.dto.ts
@@ -40,5 +40,5 @@ export class UpdateRoomOptionDto {
       message: '잘못된 boolean 값입니다'
     });
   })
-  isPublicGame: boolean;
+  isPublic: boolean;
 }
diff --git a/BE/src/game/game.gateway.ts b/BE/src/game/game.gateway.ts
@@ -62,8 +62,7 @@ export class GameGateway {
     if (client.data.user) {
       dto.playerName = client.data.user.nickname;
     }
-    const players = await this.gameRoomService.joinRoom(dto, client.id);
-    client.join(dto.gameId);
+    const players = await this.gameRoomService.joinRoom(client, dto, client.id);
     client.emit(SocketEvents.JOIN_ROOM, { players });
   }
 

diff --git a/BE/src/game/redis/subscribers/room.subscriber.ts b/BE/src/game/redis/subscribers/room.subscriber.ts
@@ -40,16 +40,16 @@ export class RoomSubscriber extends RedisSubscriber {
         server.to(gameId).emit(SocketEvents.UPDATE_ROOM_OPTION, {
           title: roomData.title,
           gameMode: roomData.gameMode,
-          maxPlayerCount: roomData.maxPlayerCount,
-          isPublic: roomData.isPublic
+          maxPlayerCount: parseInt(roomData.maxPlayerCount),
+          isPublic: roomData.isPublic === '1'
         });
         this.logger.verbose(`Room option updated: ${gameId}`);
         break;
 
       case 'Quizset':
         server.to(gameId).emit(SocketEvents.UPDATE_ROOM_QUIZSET, {
           quizSetId: roomData.quizSetId,
-          quizCount: roomData.quizCount
+          quizCount: parseInt(roomData.quizCount)
         });
         this.logger.verbose(`Room quizset updated: ${gameId}`);
         break;

diff --git a/BE/src/game/service/game.room.service.ts b/BE/src/game/service/game.room.service.ts
@@ -10,6 +10,7 @@ import SocketEvents from '../../common/constants/socket-events';
 import { UpdateRoomOptionDto } from '../dto/update-room-option.dto';
 import { UpdateRoomQuizsetDto } from '../dto/update-room-quizset.dto';
 import { Cron, CronExpression } from '@nestjs/schedule';
+import { Socket } from 'socket.io';
 
 @Injectable()
 export class GameRoomService {
@@ -32,7 +33,7 @@ export class GameRoomService {
       title: gameConfig.title,
       gameMode: gameConfig.gameMode,
       maxPlayerCount: gameConfig.maxPlayerCount.toString(),
-      isPublicGame: gameConfig.isPublicGame ? '1' : '0',
+      isPublic: gameConfig.isPublic ? '1' : '0',
       isWaiting: '1',
       lastActivityAt: new Date().getTime().toString(),
       quizSetId: '-1', // 미설정시 기본퀴즈를 진행, -1은 기본 퀴즈셋
@@ -47,7 +48,7 @@ export class GameRoomService {
     return roomId;
   }
 
-  async joinRoom(dto: JoinRoomDto, clientId: string) {
+  async joinRoom(client: Socket, dto: JoinRoomDto, clientId: string) {
     const roomKey = REDIS_KEY.ROOM(dto.gameId);
     const room = await this.redis.hgetall(roomKey);
     this.gameValidator.validateRoomExists(SocketEvents.JOIN_ROOM, room);
@@ -60,6 +61,8 @@ export class GameRoomService {
     );
     this.gameValidator.validateRoomProgress(SocketEvents.JOIN_ROOM, room.status, room.isWaiting);
 
+    client.join(dto.gameId); //validation 후에 조인해야함
+
     const playerKey = REDIS_KEY.PLAYER(clientId);
     const positionX = Math.random();
     const positionY = Math.random();
@@ -86,13 +89,21 @@ export class GameRoomService {
       });
     }
 
+    const roomData = await this.redis.hgetall(REDIS_KEY.ROOM(dto.gameId));
+    client.emit(SocketEvents.UPDATE_ROOM_OPTION, {
+      title: roomData.title,
+      gameMode: roomData.gameMode,
+      maxPlayerCount: parseInt(roomData.maxPlayerCount),
+      isPublic: roomData.isPublic === '1'
+    });
+
     this.logger.verbose(`게임 방 입장 완료: ${dto.gameId} - ${clientId} (${dto.playerName})`);
 
     return players;
   }
 
   async updateRoomOption(updateRoomOptionDto: UpdateRoomOptionDto, clientId: string) {
-    const { gameId, gameMode, title, maxPlayerCount, isPublicGame } = updateRoomOptionDto;
+    const { gameId, gameMode, title, maxPlayerCount, isPublic } = updateRoomOptionDto;
     const roomKey = `Room:${gameId}`;
 
     const room = await this.redis.hgetall(roomKey);
@@ -105,7 +116,7 @@ export class GameRoomService {
       title: title,
       gameMode: gameMode,
       maxPlayerCount: maxPlayerCount.toString(),
-      isPublicGame: isPublicGame ? '1' : '0'
+      isPublic: isPublic ? '1' : '0'
     });
     this.logger.verbose(`게임방 옵션 변경: ${gameId}`);
   }

diff --git a/BE/src/user/user.service.spec.ts b/BE/src/user/user.service.spec.ts
diff --git a/BE/test/integration/game.integration.spec.ts b/BE/test/integration/game.integration.spec.ts
@@ -191,7 +191,7 @@ describe('GameGateway (e2e)', () => {
         title: 'hello world!',
         gameMode: 'RANKING',
         maxPlayerCount: 2,
-        isPublicGame: true
+        isPublic: true
       };
 
       const response = await new Promise<{ gameId: string }>((resolve) => {
@@ -213,19 +213,19 @@ describe('GameGateway (e2e)', () => {
     const invalidConfigs = [
       {
         case: '빈 title',
-        config: { title: '', gameMode: 'RANKING', maxPlayerCount: 2, isPublicGame: true }
+        config: { title: '', gameMode: 'RANKING', maxPlayerCount: 2, isPublic: true }
       },
       {
         case: '빈 gameMode',
-        config: { title: 'hello', gameMode: '', maxPlayerCount: 2, isPublicGame: true }
+        config: { title: 'hello', gameMode: '', maxPlayerCount: 2, isPublic: true }
       },
       {
         case: '잘못된 gameMode',
-        config: { title: 'hello', gameMode: 'invalid', maxPlayerCount: 2, isPublicGame: true }
+        config: { title: 'hello', gameMode: 'invalid', maxPlayerCount: 2, isPublic: true }
       },
       {
         case: '최소 인원 미달',
-        config: { title: 'hello', gameMode: 'RANKING', maxPlayerCount: 0, isPublicGame: true }
+        config: { title: 'hello', gameMode: 'RANKING', maxPlayerCount: 0, isPublic: true }
       }
     ];
 
@@ -251,7 +251,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
 
@@ -304,7 +304,7 @@ describe('GameGateway (e2e)', () => {
         title: 'Test Room',
         gameMode: 'RANKING',
         maxPlayerCount: 5,
-        isPublicGame: true
+        isPublic: true
       });
 
       // 순차적으로 이벤트 처리
@@ -342,7 +342,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Chat Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
 
@@ -393,7 +393,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Chat Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
 
@@ -442,7 +442,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Chat Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
 
@@ -489,7 +489,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
       const gameId = createResponse.gameId;
@@ -531,7 +531,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Cache Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
       const gameId = createResponse.gameId;
@@ -613,7 +613,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Cache Hit Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
       const gameId = createResponse.gameId;
@@ -693,7 +693,7 @@ describe('GameGateway (e2e)', () => {
           title: 'Expiry Test Room',
           gameMode: 'RANKING',
           maxPlayerCount: 5,
-          isPublicGame: true
+          isPublic: true
         });
       });
       const gameId = createResponse.gameId;