-
Notifications
You must be signed in to change notification settings - Fork 3
[feat] 방 게임 시작 구현 #51
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a1d6dc6
:sparkles: feat : 정답없이 문제 조회
silver-eunjoo 4885ae9
:sparkles: feat : 방 게임 시작 구현
silver-eunjoo 3f4d0ca
chore: Java 스타일 수정
e625940
:wrench: chore : 시큐리티 필터 임시 허용 해제
silver-eunjoo b84628e
:recycle: refactor : GameService 분리
silver-eunjoo d77f129
chore: Java 스타일 수정
6b003d5
Merge branch 'dev' into feat/45
silver-eunjoo 7fac78a
:wrench: chore : merge 잘못 한 거 수정
silver-eunjoo b975a3c
chore: Java 스타일 수정
0c3ff2b
:sparkles: 게임 시작 상태 SSE로 이벤트 퍼블리시
silver-eunjoo e63e36c
chore: Java 스타일 수정
e54b9a6
:recycle: refactor : PR 리뷰 반영(stream().allMatch, gameSetting 내부 메서드)
silver-eunjoo 55d53ec
chore: Java 스타일 수정
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
77 changes: 77 additions & 0 deletions
77
backend/src/main/java/io/f1/backend/domain/game/app/GameService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package io.f1.backend.domain.game.app; | ||
|
|
||
| import io.f1.backend.domain.game.dto.GameStartData; | ||
| import io.f1.backend.domain.game.dto.response.GameStartResponse; | ||
| import io.f1.backend.domain.game.event.RoomUpdatedEvent; | ||
| import io.f1.backend.domain.game.model.GameSetting; | ||
| import io.f1.backend.domain.game.model.Player; | ||
| import io.f1.backend.domain.game.model.Room; | ||
| import io.f1.backend.domain.game.model.RoomState; | ||
| import io.f1.backend.domain.game.store.RoomRepository; | ||
| import io.f1.backend.domain.quiz.app.QuizService; | ||
| import io.f1.backend.domain.quiz.entity.Quiz; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| import org.springframework.context.ApplicationEventPublisher; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class GameService { | ||
|
|
||
| private final QuizService quizService; | ||
| private final RoomRepository roomRepository; | ||
| private final ApplicationEventPublisher eventPublisher; | ||
|
|
||
| public GameStartData gameStart(Long roomId, Long quizId) { | ||
|
|
||
| Room room = | ||
| roomRepository | ||
| .findRoom(roomId) | ||
| .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다.")); | ||
|
|
||
| if (!validateReadyStatus(room)) { | ||
| throw new IllegalArgumentException("E403004 : 레디 상태가 아닙니다."); | ||
| } | ||
|
|
||
| // 방의 gameSetting에 설정된 퀴즈랑 요청 퀴즈랑 같은지 체크 후 GameSetting에서 라운드 가져오기 | ||
| Integer round = checkGameSetting(room, quizId); | ||
|
|
||
| Quiz quiz = quizService.getQuizWithQuestionsById(quizId); | ||
|
|
||
| // 라운드 수만큼 랜덤 Question 추출 | ||
| GameStartResponse questions = quizService.getRandomQuestionsWithoutAnswer(quizId, round); | ||
|
|
||
| // 방 정보 게임 중으로 변경 | ||
| room.updateRoomState(RoomState.PLAYING); | ||
|
|
||
| eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz)); | ||
|
|
||
| return new GameStartData(getDestination(roomId), questions); | ||
| } | ||
|
|
||
| private Integer checkGameSetting(Room room, Long quizId) { | ||
|
|
||
| GameSetting gameSetting = room.getGameSetting(); | ||
|
|
||
| if (!gameSetting.checkQuizId(quizId)) { | ||
| throw new IllegalArgumentException("E409002 : 게임 설정이 다릅니다. (게임을 시작할 수 없습니다.)"); | ||
| } | ||
|
|
||
| return gameSetting.getRound(); | ||
| } | ||
|
|
||
| private boolean validateReadyStatus(Room room) { | ||
|
|
||
| Map<String, Player> playerSessionMap = room.getPlayerSessionMap(); | ||
|
|
||
| return playerSessionMap.values().stream().allMatch(Player::isReady); | ||
| } | ||
|
|
||
| private static String getDestination(Long roomId) { | ||
| return "/sub/room/" + roomId; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
backend/src/main/java/io/f1/backend/domain/game/dto/GameStartData.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package io.f1.backend.domain.game.dto; | ||
|
|
||
| import io.f1.backend.domain.game.dto.response.GameStartResponse; | ||
|
|
||
| public record GameStartData(String destination, GameStartResponse gameStartResponse) {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,4 +5,5 @@ public enum MessageType { | |
| GAME_SETTING, | ||
| PLAYER_LIST, | ||
| SYSTEM_NOTICE, | ||
| GAME_START, | ||
| } | ||
3 changes: 3 additions & 0 deletions
3
backend/src/main/java/io/f1/backend/domain/game/dto/request/GameStartRequest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package io.f1.backend.domain.game.dto.request; | ||
|
|
||
| public record GameStartRequest(Long quizId) {} |
7 changes: 7 additions & 0 deletions
7
backend/src/main/java/io/f1/backend/domain/game/dto/response/GameStartResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package io.f1.backend.domain.game.dto.response; | ||
|
|
||
| import io.f1.backend.domain.quiz.dto.GameQuestionResponse; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public record GameStartResponse(List<GameQuestionResponse> questions) {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
backend/src/main/java/io/f1/backend/domain/quiz/dao/QuizRepository.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,30 @@ | ||
| package io.f1.backend.domain.quiz.dao; | ||
|
|
||
| import io.f1.backend.domain.question.entity.Question; | ||
| import io.f1.backend.domain.quiz.entity.Quiz; | ||
|
|
||
| import org.springframework.data.domain.Page; | ||
| import org.springframework.data.domain.Pageable; | ||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
| import org.springframework.data.jpa.repository.Query; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| public interface QuizRepository extends JpaRepository<Quiz, Long> { | ||
|
|
||
| Page<Quiz> findQuizzesByTitleContaining(String title, Pageable pageable); | ||
|
|
||
| Page<Quiz> findQuizzesByCreator_NicknameContaining(String creator, Pageable pageable); | ||
|
|
||
| @Query("SELECT q FROM Quiz q LEFT JOIN FETCH q.questions WHERE q.id = :quizId") | ||
| Optional<Quiz> findQuizWithQuestionsById(Long quizId); | ||
|
|
||
| @Query("SELECT MIN(q.id) FROM Quiz q") | ||
| Long getQuizMinId(); | ||
|
|
||
| @Query( | ||
| value = "SELECT * FROM question WHERE quiz_id = :quizId ORDER BY RAND() LIMIT :round", | ||
| nativeQuery = true) | ||
| List<Question> findRandQuestionsByQuizId(Long quizId, Integer round); | ||
| } |
3 changes: 3 additions & 0 deletions
3
backend/src/main/java/io/f1/backend/domain/quiz/dto/GameQuestionResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package io.f1.backend.domain.quiz.dto; | ||
|
|
||
| public record GameQuestionResponse(Long id, String question) {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.