diff --git a/backend/src/main/java/com/example/manmu/controller/RoomController.java b/backend/src/main/java/com/example/manmu/controller/RoomController.java index 8b4b472..2765237 100644 --- a/backend/src/main/java/com/example/manmu/controller/RoomController.java +++ b/backend/src/main/java/com/example/manmu/controller/RoomController.java @@ -2,6 +2,7 @@ import com.example.manmu.GameSignal; import com.example.manmu.PollSignal; +import com.example.manmu.entity.User; import com.example.manmu.entity.UserDto; import com.example.manmu.entity.VoteData; import com.example.manmu.service.GameRoomService; @@ -114,9 +115,12 @@ public void startGame(@Payload GameSignal gameSignal) { public void sendSong(@Payload GameSignal gameSignal) { RoomDto gameRoomDto = gameRoomService.findRoom(); UserDto championUserDto = gameRoomDto.getCurrentChampion(); + UserDto challengerUserDto = gameRoomDto.getCurrentChallenger(); gameRoomService.setCurrentDancer(championUserDto.getConnectionId()); gameSignal.setSong(championUserDto.getSong()); gameSignal.setConnectionId(championUserDto.getConnectionId()); + gameSignal.setChampion(championUserDto); + gameSignal.setChallenger(challengerUserDto); template.convertAndSend("/topic/public", gameSignal); } @@ -131,6 +135,8 @@ public void endSong(@Payload GameSignal gameSignal) { gameSignal.setType("SONG_START"); gameSignal.setConnectionId(challengerDto.getConnectionId()); gameSignal.setSong(challengerDto.getSong()); + gameSignal.setChampion(roomDto.getCurrentChampion()); + gameSignal.setChallenger(roomDto.getCurrentChallenger()); template.convertAndSend("/topic/public", gameSignal); } else { diff --git a/backend/src/main/java/com/example/manmu/controller/ViduController.java b/backend/src/main/java/com/example/manmu/controller/ViduController.java index 7af94a9..cc988a9 100644 --- a/backend/src/main/java/com/example/manmu/controller/ViduController.java +++ b/backend/src/main/java/com/example/manmu/controller/ViduController.java @@ -40,6 +40,4 @@ public ResponseEntity createConnection(@PathVariable("sessionId") String Connection connection = session.createConnection(properties); return new ResponseEntity<>(connection.getToken(), HttpStatus.OK); } - - } diff --git a/backend/src/main/java/com/example/manmu/service/GameRoomService.java b/backend/src/main/java/com/example/manmu/service/GameRoomService.java index 0f4b10e..8c0e974 100644 --- a/backend/src/main/java/com/example/manmu/service/GameRoomService.java +++ b/backend/src/main/java/com/example/manmu/service/GameRoomService.java @@ -126,7 +126,7 @@ public RoomDto endGame(String currentUserMail) { .orElseThrow(() -> new UserNotFoundException("해당 유저를 찾을 수 없습니다! " + currentChallengerDto.getEmail())); Ranking currentChampionRanking = rankingRepository.findByUser(currentChampionUser); Ranking currentChallengerRanking = rankingRepository.findByUser(currentChallengerUser); - + if (leftScore == null || rightScore == null) { return null; } @@ -147,7 +147,7 @@ else if (leftScore > rightScore) { UserDto newChallenger = getNewChallenger(gameRoom); gameRoom.addPlayer(newChallenger); gameRoom.setCurrentChallenger(newChallenger); - + resetPoll(); redisTemplate.opsForValue().set("ROOM", gameRoom); return new RoomDto(gameRoom); } @@ -163,7 +163,7 @@ else if (leftScore > rightScore) { UserDto newChallenger = getNewChallenger(gameRoom); gameRoom.addPlayer(newChallenger); gameRoom.setCurrentChallenger(newChallenger); - + resetPoll(); redisTemplate.opsForValue().set("ROOM", gameRoom); return new RoomDto(gameRoom); }