Merge pull request #196 from boostcampwm-2024/feature/#192

[Feat] 각종 버그 수정 및 로그인시 클라측에서 id받는 로직 추가

packages/backend/gameserver/src/auth/auth.controller.ts

@@ -1,12 +1,15 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, Query } from '@nestjs/common';
 import { AuthService } from './auth.service';
 
 @Controller('auth')
 export class AuthController {
   constructor(private readonly authService: AuthService) {}
 
   @Get('guest-login')
-  guestLogin(): { userId: string; password: string } {
-    return this.authService.guestLogin();
+  guestLogin(@Query('userId') userId: string): {
+    userId: string;
+    password: string;
+  } {
+    return this.authService.guestLogin(userId || '게스트');
   }
 }

packages/backend/gameserver/src/auth/auth.service.ts

@@ -1,20 +1,22 @@
 import { Injectable } from '@nestjs/common';
 import { v4 as uuidv4 } from 'uuid';
 
-interface GuestCredentials {
-  userId: string;
-  password: string;
-}
-
 @Injectable()
 export class AuthService {
   private guestSessions: Map<string, string> = new Map();
-  private guestCounter: number = 1;
+  private userCounters: Map<string, number> = new Map();
 
-  guestLogin(): GuestCredentials {
-    const userId = `게스트_${this.guestCounter++}`;
-    const password = uuidv4();
+  guestLogin(requestedUserId: string): { userId: string; password: string } {
+    let userId = requestedUserId;
 
+    // 이미 존재하는 userId인 경우 카운터를 증가시켜 새로운 userId 생성
+    if (this.guestSessions.has(userId)) {
+      const counter = (this.userCounters.get(requestedUserId) || 1) + 1;
+      this.userCounters.set(requestedUserId, counter);
+      userId = `${requestedUserId}_${counter}`;
+    }
+
+    const password = uuidv4();
     this.guestSessions.set(userId, password);
     return { userId, password };
   }

packages/backend/gameserver/src/game/constants/words.ts

@@ -22,20 +22,13 @@ export const GAME_WORDS: WordTheme[] = [
       '키보드',
       '모니터',
       '프린터',
-      '책상',
-      '의자',
-      '침대',
-      '소파',
-      '냉장고',
       '헤어드라이어',
       '칫솔',
       '치약',
       '샴푸',
       '수건',
       '거울',
       '빗',
-      '물병',
-      '텀블러',
       '충전기',
       '이어폰',
       '노트북',
@@ -47,16 +40,11 @@ export const GAME_WORDS: WordTheme[] = [
       '테이프',
       '가위',
       '스테이플러',
-      '멀티탭',
       '청소기',
       '전자레인지',
       '밥솥',
-      '커튼',
-      '책장',
-      '옷걸이',
       '화분',
       '쓰레기통',
-      '도마',
       '칼',
       '후라이팬',
       '냄비',
@@ -76,11 +64,6 @@ export const GAME_WORDS: WordTheme[] = [
       '선풍기',
       '공기청정기',
       '가습기',
-      '제습기',
-      '건조기',
-      '다리미',
-      '옷솔',
-      '구두솔',
     ],
   },
   {
@@ -112,7 +95,6 @@ export const GAME_WORDS: WordTheme[] = [
       '아이스크림',
       '샌드위치',
       '만두',
-      '쌈밥',
       '부대찌개',
       '김치찌개',
       '된장찌개',
@@ -121,8 +103,6 @@ export const GAME_WORDS: WordTheme[] = [
       '잡채',
       '불고기',
       '곱창',
-      '마라탕',
-      '훠궈',
       '초콜릿',
       '과자',
       '사탕',
@@ -146,17 +126,8 @@ export const GAME_WORDS: WordTheme[] = [
       '계란말이',
       '오므라이스',
       '닭볶음탕',
-      '낙지볶음',
-      '쭈꾸미볶음',
       '족발',
       '보쌈',
-      '막창',
-      '대창',
-      '양꼬치',
-      '마라샹궈',
-      '딤섬',
-      '월남쌈',
-      '나시고랭',
     ],
   },
   {
@@ -192,7 +163,6 @@ export const GAME_WORDS: WordTheme[] = [
       '비버',
       '고슴도치',
       '공작새',
-      '플라밍고',
       '백조',
       '물개',
       '바다사자',
@@ -202,38 +172,27 @@ export const GAME_WORDS: WordTheme[] = [
       '오징어',
       '해파리',
       '불가사리',
-      '기니피그',
-      '카멜레온',
-      '이구아나',
-      '뱀',
-      '도마뱀',
-      '금붕어',
-      '열대어',
-      '잉어',
-      '메추라기',
+      '양',
+      '말',
+      '소',
       '닭',
       '오리',
       '거위',
-      '공작',
-      '타조',
+      '뱀',
+      '도마뱀',
+      '개구리',
+      '두더지',
       '순록',
       '사슴',
-      '고라니',
-      '족제비',
-      '두더지',
-      '박쥐',
-      '알파카',
-      '라마',
-      '미어캣',
-      '수달',
-      '랫서판다',
       '기러기',
-      '왜가리',
-      '두루미',
-      '딱따구리',
       '참새',
-      '까치',
       '까마귀',
+      '까치',
+      '매',
+      '참치',
+      '게',
+      '새우',
+      '조개',
     ],
   },
   {
@@ -259,38 +218,16 @@ export const GAME_WORDS: WordTheme[] = [
       '화가',
       '미용사',
       '건축가',
-      '파일럿',
       '승무원',
       '택시기사',
       '버스기사',
       '농부',
       '어부',
       '목수',
-      '전기기사',
-      '플로리스트',
-      '제빵사',
-      '수의사',
-      '약사',
-      '치과의사',
-      '물리치료사',
-      '심리상담사',
-      '통역사',
       '번역가',
       '사진작가',
       '영화감독',
       '유튜버',
-      '바리스타',
-      '조리사',
-      '웹디자이너',
-      '일러스트레이터',
-      '메이크업아티스트',
-      '헤어디자이너',
-      '네일아티스트',
-      '보험설계사',
-      '부동산중개사',
-      '비행기정비사',
-      '소믈리에',
-      '바텐더',
     ],
   },
   {
@@ -362,10 +299,47 @@ export const GAME_WORDS: WordTheme[] = [
       '다이빙',
       '서핑',
       '클라이밍',
-      '스쿼시',
-      '크로스핏',
-      '줄넘기',
-      '하이킹',
+    ],
+  },
+  {
+    theme: '감정/상태',
+    words: [
+      '행복',
+      '슬픔',
+      '화남',
+      '기쁨',
+      '우울',
+      '설렘',
+      '불안',
+      '평화로움',
+      '흥분',
+      '외로움',
+      '피곤',
+      '사랑',
+      '미움',
+      '긴장',
+      '스트레스',
+      '만족',
+      '후회',
+      '기대감',
+      '안도',
+      '충격',
+    ],
+  },
+  {
+    theme: '가구',
+    words: [
+      '책상',
+      '의자',
+      '침대',
+      '소파',
+      '냉장고',
+      '커튼',
+      '식탁',
+      '화장대',
+      '서랍장',
+      '옷장',
+      '싱크대',
     ],
   },
 ];

packages/backend/gameserver/src/game/game.service.ts

@@ -139,7 +139,7 @@ export class GameService {
     return game.isGuessed;
   }
 
-  async endGame(gsid: string): Promise<void> {
+  endGame(gsid: string) {
     this.games.delete(gsid);
   }
 }

packages/backend/gameserver/src/gateway/gateway.gateway.ts

@@ -229,10 +229,12 @@ export class GatewayGateway
           speakerId: gameState.speakerQueue[0],
           allUserIds: gameState.userIds,
         };
+        room.isPlaying = true;
 
         this.logger.logSocketEvent('send', 'start_game_success', {
           personalGameState,
         });
+
         this.server
           .to(this.getSocketIdByUserId(uid))
           .emit('start_game_success', personalGameState);
@@ -330,6 +332,11 @@ export class GatewayGateway
               isGuessed: false,
               guessingWord: '',
             });
+
+            this.gameService.endGame(gsid);
+            const room = this.roomService.getRoom(gsid);
+            room.readyUserIds.clear();
+            room.isPlaying = false;
           }, 3000);
         }
       }
@@ -380,9 +387,8 @@ export class GatewayGateway
       // 게임 종료 및 초기화
       await this.gameService.endGame(gsid);
       const room = this.roomService.getRoom(gsid);
-      if (room) {
-        room.readyUserIds.clear();
-      }
+      room.readyUserIds.clear();
+      room.isPlaying = false;
     } catch (error) {
       this.logger.logError('guessing_error', error);
       this.emitError(client, error.message);

packages/backend/gameserver/src/room/room.service.ts

@@ -8,12 +8,17 @@ export class RoomService {
   private MAX_ROOM_SIZE = 6;
 
   async createRoom(userId: string): Promise<string> {
-    const gsid = uuidv4();
+    let gsid: string;
+    do {
+      gsid = uuidv4().substring(0, 4);
+    } while (this.rooms.has(gsid));
+
     const roomInfo: IRoomInfo = {
       gsid,
       userIds: new Set([userId]),
       readyUserIds: new Set(),
       hostUserId: userId,
+      isPlaying: false,
     };
 
     this.rooms.set(gsid, roomInfo);
@@ -26,10 +31,14 @@ export class RoomService {
       throw new Error('존재하지 않는 방입니다.');
     }
 
-    if (room.userIds.size > this.MAX_ROOM_SIZE) {
+    if (room.userIds.size >= this.MAX_ROOM_SIZE) {
       throw new Error('방이 가득 찼습니다.');
     }
 
+    if (room.isPlaying) {
+      throw new Error('게임이 진행중입니다.');
+    }
+
     room.userIds.add(userId);
 
     return {

packages/backend/gameserver/src/room/types/room.types.ts

@@ -3,6 +3,7 @@ export interface IRoomInfo {
   userIds: Set<string>;
   readyUserIds: Set<string>;
   hostUserId: string;
+  isPlaying: boolean;
 }
 
 export interface IRoomEventPayload {