Skip to content

Commit c7ba52c

Browse files
committed
Merge remote-tracking branch 'origin/feat/6' into feat/6
2 parents 39481e4 + 2f33efb commit c7ba52c

File tree

1 file changed

+24
-16
lines changed

1 file changed

+24
-16
lines changed

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

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@
2020
import io.f1.backend.domain.game.store.RoomRepository;
2121
import io.f1.backend.domain.quiz.entity.Quiz;
2222
import io.f1.backend.domain.user.entity.User;
23+
24+
import lombok.RequiredArgsConstructor;
25+
26+
import org.springframework.stereotype.Service;
27+
2328
import java.util.List;
2429
import java.util.Map;
2530
import java.util.concurrent.atomic.AtomicLong;
26-
import lombok.RequiredArgsConstructor;
27-
import org.springframework.stereotype.Service;
2831

2932
@Service
3033
@RequiredArgsConstructor
@@ -50,10 +53,12 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object
5053

5154
public void validateRoom(RoomValidationRequest request) {
5255

53-
Room room = roomRepository.findRoom(request.roomId())
54-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
56+
Room room =
57+
roomRepository
58+
.findRoom(request.roomId())
59+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
5560

56-
if(room.getState().equals(RoomState.PLAYING)){
61+
if (room.getState().equals(RoomState.PLAYING)) {
5762
throw new IllegalArgumentException("403 게임이 진행중입니다.");
5863
}
5964

@@ -63,17 +68,20 @@ public void validateRoom(RoomValidationRequest request) {
6368
throw new IllegalArgumentException("403 정원이 모두 찼습니다.");
6469
}
6570

66-
if (room.getRoomSetting().locked() && !room.getRoomSetting().password().equals(request.password())) {
71+
if (room.getRoomSetting().locked()
72+
&& !room.getRoomSetting().password().equals(request.password())) {
6773
throw new IllegalArgumentException("401 비밀번호가 일치하지 않습니다.");
6874
}
6975
}
7076

7177
public RoomInitialData enterRoom(Long roomId, String sessionId) {
7278

73-
Room room = roomRepository.findRoom(roomId)
74-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
79+
Room room =
80+
roomRepository
81+
.findRoom(roomId)
82+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
7583

76-
//todo security
84+
// todo security
7785
Player player = new Player(1L, "빵야빵야");
7886

7987
Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
@@ -83,16 +91,16 @@ public RoomInitialData enterRoom(Long roomId, String sessionId) {
8391
String destination = "/sub/room/" + roomId;
8492

8593
RoomSettingResponse roomSettingResponse = toRoomSettingResponse(room);
86-
//todo quiz 생성 api 완성 후 수정
87-
QuizResponse quiz = new QuizResponse(room.getGameSetting().getQuizId(), "title", "설명",
88-
"url", 10);
89-
GameSettingResponse gameSettingResponse = toGameSettingResponse(room.getGameSetting(),
90-
quiz);
94+
// todo quiz 생성 api 완성 후 수정
95+
QuizResponse quiz =
96+
new QuizResponse(room.getGameSetting().getQuizId(), "title", "설명", "url", 10);
97+
GameSettingResponse gameSettingResponse =
98+
toGameSettingResponse(room.getGameSetting(), quiz);
9199

92100
PlayerListResponse playerListResponse = toPlayerListResponse(room);
93101

94-
return new RoomInitialData(destination, roomSettingResponse, gameSettingResponse,
95-
playerListResponse);
102+
return new RoomInitialData(
103+
destination, roomSettingResponse, gameSettingResponse, playerListResponse);
96104
}
97105

98106
// todo quizService에서 퀴즈 조회 메서드로 변경

0 commit comments

Comments
 (0)