Merge pull request #287 from boostcampwm-2024/dev-be

Dev be to release
boostcampwm-2024 · Nov 28, 2024 · 9a95baa · 9a95baa
2 parents 9ec6e98 + 58a328a
commit 9a95baa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "release" ]
 
 env:
-  NODE_ENV: test
+  NODE_ENV: production
   DB_HOST_TEST: localhost
   DB_PORT_TEST: 3306
   DB_PASSWD_TEST: test
@@ -55,9 +55,9 @@ jobs:
         run: |
           echo '${{ secrets.ENV }}' > .env
 
-#      - name: BE 테스트 코드 실행 (unit test)
-#        working-directory: ./BE
-#        run: npm run test
+      #      - name: BE 테스트 코드 실행 (unit test)
+      #        working-directory: ./BE
+      #        run: npm run test
 
       # - name: BE 테스트 코드 실행2 (integration test)
       #   working-directory: ./BE

diff --git a/BE/src/game/game.gateway.ts b/BE/src/game/game.gateway.ts
@@ -31,9 +31,12 @@ import { ExceptionMessage } from '../common/constants/exception-message';
 @UseInterceptors(GameActivityInterceptor)
 @UseFilters(new WsExceptionFilter())
 @WebSocketGateway({
+  // cors: {
+  //   origin: ['*,', 'https://admin.socket.io'], //이러면 배포에서 cors오류 생김
+  //   credentials: true
+  // },
   cors: {
-    origin: ['*,', 'https://admin.socket.io'],
-    credentials: true
+    origin: '*' //이러면 배포에서 admin ui 접근 안됨
   },
   namespace: '/game'
 })
@@ -138,7 +141,7 @@ export class GameGateway {
   @SubscribeMessage(SocketEvents.KICK_ROOM)
   @UsePipes(new GameValidationPipe(SocketEvents.KICK_ROOM))
   async handleKickRoom(@MessageBody() kickRoomDto: KickRoomDto, @ConnectedSocket() client: Socket) {
-    await this.gameRoomService.kickRoom(kickRoomDto, client.id);
+    await this.gameRoomService.kickRoom(kickRoomDto, client.data.playerId);
   }
 
   afterInit(nameSpace: Namespace) {

diff --git a/BE/src/game/service/game.room.service.ts b/BE/src/game/service/game.room.service.ts
@@ -109,7 +109,7 @@ export class GameRoomService {
 
     await this.redis.set(`${playerKey}:Changes`, 'Join');
     await this.redis.hset(playerKey, {
-      playerName: '닉네임 설정 이전',
+      playerName: '', //이래야 프론트에서 모달을 띄워주는 조건
       positionX: positionX.toString(),
       positionY: positionY.toString(),
       disconnected: '0',