Skip to content

Commit f40ba73

Browse files
sehee123sehee123
committed
Merge remote-tracking branch 'origin/feat/49' into feat/49
2 parents a733350 + 9924be8 commit f40ba73

File tree

4 files changed

+52
-49
lines changed

4 files changed

+52
-49
lines changed

‎backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,18 @@
3939
import io.f1.backend.global.exception.CustomException;
4040
import io.f1.backend.global.exception.errorcode.QuestionErrorCode;
4141
import io.f1.backend.global.exception.errorcode.RoomErrorCode;
42+
43+
import lombok.RequiredArgsConstructor;
44+
import lombok.extern.slf4j.Slf4j;
45+
46+
import org.springframework.context.ApplicationEventPublisher;
47+
import org.springframework.stereotype.Service;
48+
4249
import java.util.List;
4350
import java.util.Map;
4451
import java.util.Optional;
4552
import java.util.concurrent.ConcurrentHashMap;
4653
import java.util.concurrent.atomic.AtomicLong;
47-
import lombok.RequiredArgsConstructor;
48-
import lombok.extern.slf4j.Slf4j;
49-
import org.springframework.context.ApplicationEventPublisher;
50-
import org.springframework.stereotype.Service;
5154

5255
@Slf4j
5356
@Service
@@ -207,7 +210,7 @@ public RoundResult chat(Long roomId, String sessionId, ChatMessage chatMessage)
207210

208211
String destination = getDestination(roomId);
209212

210-
if(!room.isPlaying()) {
213+
if (!room.isPlaying()) {
211214
return buildResultOnlyChat(destination, chatMessage);
212215
}
213216

@@ -230,7 +233,7 @@ public RoundResult chat(Long roomId, String sessionId, ChatMessage chatMessage)
230233

231234
return RoundResult.builder()
232235
.destination(destination)
233-
.questionResult(toQuestionResultResponse(questionId,chatMessage, answer))
236+
.questionResult(toQuestionResultResponse(questionId, chatMessage, answer))
234237
.rankUpdate(toRankUpdateResponse(room))
235238
.systemNotice(ofPlayerEvent(chatMessage.nickname(), RoomEventType.ENTER))
236239
.chat(chatMessage)
@@ -296,9 +299,6 @@ private void removePlayer(Room room, String sessionId, Player removePlayer) {
296299
}
297300

298301
private RoundResult buildResultOnlyChat(String destination, ChatMessage chatMessage) {
299-
return RoundResult.builder()
300-
.destination(destination)
301-
.chat(chatMessage)
302-
.build();
302+
return RoundResult.builder().destination(destination).chat(chatMessage).build();
303303
}
304304
}

‎backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class RoomMapper {
2929

3030
public static RoomSetting toRoomSetting(RoomCreateRequest request) {
3131
return new RoomSetting(
32-
request.roomName(), request.maxUserCount(), request.locked(), request.password());
32+
request.roomName(), request.maxUserCount(), request.locked(), request.password());
3333
}
3434

3535
public static GameSetting toGameSetting(Quiz quiz) {
@@ -38,47 +38,47 @@ public static GameSetting toGameSetting(Quiz quiz) {
3838

3939
public static RoomSettingResponse toRoomSettingResponse(Room room) {
4040
return new RoomSettingResponse(
41-
room.getRoomSetting().roomName(),
42-
room.getRoomSetting().maxUserCount(),
43-
room.getPlayerSessionMap().size());
41+
room.getRoomSetting().roomName(),
42+
room.getRoomSetting().maxUserCount(),
43+
room.getPlayerSessionMap().size());
4444
}
4545

4646
public static GameSettingResponse toGameSettingResponse(GameSetting gameSetting, Quiz quiz) {
4747
return new GameSettingResponse(
48-
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
48+
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
4949
}
5050

5151
public static PlayerListResponse toPlayerListResponse(Room room) {
5252
List<PlayerResponse> playerResponseList =
53-
room.getPlayerSessionMap().values().stream()
54-
.map(player -> new PlayerResponse(player.getNickname(), false))
55-
.toList();
53+
room.getPlayerSessionMap().values().stream()
54+
.map(player -> new PlayerResponse(player.getNickname(), false))
55+
.toList();
5656

5757
return new PlayerListResponse(room.getHost().getNickname(), playerResponseList);
5858
}
5959

6060
public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
6161
return new RoomResponse(
62-
room.getId(),
63-
room.getRoomSetting().roomName(),
64-
room.getRoomSetting().maxUserCount(),
65-
room.getPlayerSessionMap().size(),
66-
room.getRoomSetting().locked(),
67-
room.getState().name(),
68-
quiz.getTitle(),
69-
quiz.getDescription(),
70-
quiz.getCreator().getNickname(),
71-
quiz.getQuestions().size(),
72-
quiz.getThumbnailUrl());
62+
room.getId(),
63+
room.getRoomSetting().roomName(),
64+
room.getRoomSetting().maxUserCount(),
65+
room.getPlayerSessionMap().size(),
66+
room.getRoomSetting().locked(),
67+
room.getState().name(),
68+
quiz.getTitle(),
69+
quiz.getDescription(),
70+
quiz.getCreator().getNickname(),
71+
quiz.getQuestions().size(),
72+
quiz.getThumbnailUrl());
7373
}
7474

7575
public static QuizResponse toQuizResponse(Quiz quiz) {
7676
return new QuizResponse(
77-
quiz.getId(),
78-
quiz.getTitle(),
79-
quiz.getDescription(),
80-
quiz.getThumbnailUrl(),
81-
quiz.getQuestions().size());
77+
quiz.getId(),
78+
quiz.getTitle(),
79+
quiz.getDescription(),
80+
quiz.getThumbnailUrl(),
81+
quiz.getQuestions().size());
8282
}
8383

8484
public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType roomEventType) {
@@ -92,15 +92,15 @@ public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType
9292
}
9393

9494
public static QuestionResultResponse toQuestionResultResponse(
95-
Long questionId, ChatMessage chatMessage, String answer) {
95+
Long questionId, ChatMessage chatMessage, String answer) {
9696
return new QuestionResultResponse(questionId, chatMessage.nickname(), answer);
9797
}
9898

9999
public static RankUpdateResponse toRankUpdateResponse(Room room) {
100100
return new RankUpdateResponse(
101-
room.getPlayerSessionMap().values().stream()
102-
.sorted(Comparator.comparing(Player::getCorrectCount).reversed())
103-
.map(player -> new Rank(player.getNickname(), player.getCorrectCount()))
104-
.toList());
101+
room.getPlayerSessionMap().values().stream()
102+
.sorted(Comparator.comparing(Player::getCorrectCount).reversed())
103+
.map(player -> new Rank(player.getNickname(), player.getCorrectCount()))
104+
.toList());
105105
}
106106
}

‎backend/src/main/java/io/f1/backend/domain/game/model/Room.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public void increasePlayerCorrectCount(String sessionId) {
6565
}
6666

6767
public Long getCurrentQuestionId() {
68-
return questions.get(currentRound-1).getId();
68+
return questions.get(currentRound - 1).getId();
6969
}
7070

71-
public Boolean isPlaying(){
71+
public Boolean isPlaying() {
7272
return state == RoomState.PLAYING;
7373
}
7474

‎backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
import io.f1.backend.domain.game.dto.RoundResult;
1111
import io.f1.backend.domain.game.dto.request.DefaultWebSocketRequest;
1212
import io.f1.backend.domain.game.dto.request.GameStartRequest;
13+
1314
import lombok.RequiredArgsConstructor;
15+
1416
import org.springframework.messaging.Message;
1517
import org.springframework.messaging.handler.annotation.DestinationVariable;
1618
import org.springframework.messaging.handler.annotation.MessageMapping;
@@ -74,21 +76,22 @@ public void gameStart(@DestinationVariable Long roomId, Message<GameStartRequest
7476
}
7577

7678
@MessageMapping("room/chat/{roomId}")
77-
public void chat(@DestinationVariable Long roomId,
78-
Message<DefaultWebSocketRequest<ChatMessage>> message) {
79-
RoundResult roundResult = roomService.chat(roomId, getSessionId(message),
80-
message.getPayload().getMessage());
79+
public void chat(
80+
@DestinationVariable Long roomId,
81+
Message<DefaultWebSocketRequest<ChatMessage>> message) {
82+
RoundResult roundResult =
83+
roomService.chat(roomId, getSessionId(message), message.getPayload().getMessage());
8184

8285
String destination = roundResult.getDestination();
8386

8487
messageSender.send(destination, MessageType.CHAT, roundResult.getChat());
8588

8689
if (!roundResult.hasOnlyChat()) {
87-
messageSender.send(destination, MessageType.QUESTION_RESULT,
88-
roundResult.getQuestionResult());
90+
messageSender.send(
91+
destination, MessageType.QUESTION_RESULT, roundResult.getQuestionResult());
8992
messageSender.send(destination, MessageType.RANK_UPDATE, roundResult.getRankUpdate());
90-
messageSender.send(destination, MessageType.SYSTEM_NOTICE,
91-
roundResult.getSystemNotice());
93+
messageSender.send(
94+
destination, MessageType.SYSTEM_NOTICE, roundResult.getSystemNotice());
9295
}
9396
}
9497

0 commit comments

Comments
 (0)