Merge pull request #134 from HandTris/#133

게임 결과창에서 Back to Lobby 클릭 시 & 게임중 탈주 시 발생하는 에러 해결
HandTris · Jul 14, 2024 · 65ebe12 · 65ebe12
2 parents 15bbe5b + e109729
commit 65ebe12
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/src/main/java/jungle/HandTris/application/impl/GameRoomServiceImpl.java b/src/main/java/jungle/HandTris/application/impl/GameRoomServiceImpl.java
@@ -95,18 +95,21 @@ public GameRoom exitGameRoom(@UserNicknameFromJwt String nickname, String roomCo
         Pair<String, MemberRecordDetailRes> memberDetails = memberProfileService.getMemberProfileWithStatsByNickname(nickname);
         GameMemberEssentialDTO dto = new GameMemberEssentialDTO(nickname, memberDetails.getFirst(), memberDetails.getSecond());
 
-        if (!gameMember.isPresentMember(dto)) {
+        if (!gameMember.isPresentMember(nickname)) {
             throw new MemberNotFoundException();
         }
 
         // gameMember에서 해당 유저 삭제
-        gameMember.removeMember(dto);
+        gameMember.removeMember(nickname);
 
-        // Redis에 업데이트
+        // 만약 인원이 0명이라면
         if (gameRoom.getParticipantCount() == 0) {
             gameRoomRepository.delete(gameRoom);
             redisTemplate.delete(key);
-        } else {
+        }
+        // 인원이 남아있다면
+        else {
+            redisTemplate.delete(key);
             redisTemplate.opsForValue().set(key, gameMember.toString());
         }
         return gameRoom;

diff --git a/src/main/java/jungle/HandTris/domain/GameMember.java b/src/main/java/jungle/HandTris/domain/GameMember.java
@@ -38,12 +38,16 @@ public void addMember(GameMemberEssentialDTO dto) {
         this.members.add(dto);
     }
 
-    public void removeMember(GameMemberEssentialDTO dto) {
-        this.members.remove(dto);
+    public void removeMember(String nickname) {
+
+        GameMemberEssentialDTO foundDTO = this.members.stream().filter(gameMemberEssentialDTO -> gameMemberEssentialDTO.nickname().equals(nickname)).findAny().orElse(null);
+        this.members.remove(foundDTO);
     }
 
-    public boolean isPresentMember(GameMemberEssentialDTO dto) {
-        return this.members.contains(dto);
+    public boolean isPresentMember(String nickname) {
+
+        GameMemberEssentialDTO foundDTO = this.members.stream().filter(gameMemberEssentialDTO -> gameMemberEssentialDTO.nickname().equals(nickname)).findAny().orElse(null);
+        return foundDTO != null;
     }
 
     public GameMember(String id, GameMemberEssentialDTO member) {

diff --git a/src/main/java/jungle/HandTris/presentation/TetrisController.java b/src/main/java/jungle/HandTris/presentation/TetrisController.java
@@ -60,7 +60,26 @@ public void handleDisconnect(SimpMessageHeaderAccessor headerAccessor, @Destinat
         // message에서 isStart 확인
         boolean isStart = headerAccessor.getFirstNativeHeader("isStart").equals("true");
         if (isStart) {
-            String[][] emptyBoard = {{}};
+            String[][] emptyBoard = {{"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "orange", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "orange", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "orange", "orange", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"}};
             // 탈주 유저의 상대에게 승리 메세지 보내기 ------------------------------
             TetrisMessageReq win = new TetrisMessageReq(emptyBoard, true, false, false);
             String otherUser = headerAccessor.getHeader("otherUser").toString();