Skip to content

🐛 resetpoll 어떻게든 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daeell wants to merge 3 commits into
base: challenge
Choose a base branch
from
Open

🐛 resetpoll 어떻게든 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e1276c
:bug: resetpoll 어떻게든
Daeell Jan 26, 2023
36b0617
:construction: send dto
Daeell Jan 26, 2023
4d04fbb
:sparkles: 한 판 돌아감
Daeell Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions backend/src/main/java/com/example/manmu/controller/RoomController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand All @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions backend/src/main/java/com/example/manmu/controller/ViduController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,4 @@ public ResponseEntity<String> createConnection(@PathVariable("sessionId") String
Connection connection = session.createConnection(properties);
return new ResponseEntity<>(connection.getToken(), HttpStatus.OK);
}


}
6 changes: 3 additions & 3 deletions backend/src/main/java/com/example/manmu/service/GameRoomService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down