-
Notifications
You must be signed in to change notification settings - Fork 0
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
[FEAT] 매니저가 생성한 리그 전체 조회 #194
Closed
Closed
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e218fc2
[FEAT] 매니저가 생성한 리그와 리그에 해당하는 경기 및 경기팀 조회 기능 구현 #192
Jin409 2bdba2c
[TEST] 서비스 테스트 추가 #192
Jin409 faf1f37
[FIX] 리그팀 삭제 시 게임팀도 삭제될 수 있도록 양방향 연관관계를 맺도록 수정 #192
Jin409 7651c05
[TEST] league 픽스처 수정에 따른 테스트 수정 #192
Jin409 4a8eb05
[TEST] 인수 테스트 추가 #192
Jin409 3085480
[DOCS] 문서화 #192
Jin409 66613cd
[FIX] 중복되는 양방향 연관관계 삭제 #192
Jin409 a5144bd
[CHORE] 라인업 선발/후보 수정 엔드포인트 SecurityConfig 에 등록 #192
Jin409 c7bbcff
[MERGE] 메인 브랜치 변경 사항 반영 #192
Jin409 e2dd01b
[RENAME] LeagueResponseForManager 를 LeagueResponseWithInProgressGames…
Jin409 d4edbf1
[REFACTOR] 진행 중인 경기를 조회한다는 의미를 포함하도록 메서드명 수정 #192
Jin409 3711951
[FEAT] 리그에 해당하는 경기 정보 조회 기능 구현 #200
Jin409 dca57dd
[TEST] 서비스 테스트 추가 #200
Jin409 a228851
[TEST] 인수 테스트 추가 #200
Jin409 8375f47
[DOCS] 문서화 #200
Jin409 8098a58
[RENAME] Response Dto 내부 레코드 이름 변경 #200
Jin409 88ebb0e
Merge pull request #202 from hufscheer/feat/#200-league
Jin409 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
This file contains 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 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 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 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 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 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
64 changes: 64 additions & 0 deletions
64
src/main/java/com/sports/server/query/dto/response/LeagueResponseWithInProgressGames.java
This file contains 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,64 @@ | ||
package com.sports.server.query.dto.response; | ||
|
||
import com.sports.server.command.game.domain.Game; | ||
import com.sports.server.command.game.domain.GameTeam; | ||
import com.sports.server.command.league.domain.League; | ||
import java.time.LocalDateTime; | ||
import java.util.List; | ||
|
||
public record LeagueResponseWithInProgressGames( | ||
|
||
Long id, | ||
String name, | ||
String state, | ||
int sizeOfLeagueTeams, | ||
String maxRound, | ||
LocalDateTime startAt, | ||
LocalDateTime endAt, | ||
List<GameDetailResponse> inProgressGames | ||
|
||
) { | ||
public static LeagueResponseWithInProgressGames of(League league, String state, List<Game> games) { | ||
return new LeagueResponseWithInProgressGames( | ||
league.getId(), league.getName(), state, league.getLeagueTeams().size(), | ||
league.getMaxRound().getDescription(), league.getStartAt(), league.getEndAt(), | ||
games.stream() | ||
.map(GameDetailResponse::of) | ||
.toList() | ||
); | ||
} | ||
|
||
public record GameDetailResponse( | ||
Long id, | ||
String state, | ||
LocalDateTime startTime, | ||
List<GameTeamResponse> gameTeams | ||
) { | ||
public record GameTeamResponse( | ||
Long gameTeamId, | ||
String gameTeamName, | ||
String logoImageUrl, | ||
Integer score | ||
) { | ||
public static GameTeamResponse of(GameTeam gameTeam) { | ||
return new GameTeamResponse( | ||
gameTeam.getId(), | ||
gameTeam.getLeagueTeam().getName(), | ||
gameTeam.getLeagueTeam().getLogoImageUrl(), | ||
gameTeam.getScore() | ||
); | ||
} | ||
} | ||
|
||
public static GameDetailResponse of(final Game game) { | ||
return new GameDetailResponse( | ||
game.getId(), game.getState().name(), game.getStartTime(), | ||
game.getTeams().stream() | ||
.map(GameTeamResponse::of) | ||
.toList() | ||
); | ||
} | ||
|
||
} | ||
} | ||
|
19 changes: 13 additions & 6 deletions
19
src/main/java/com/sports/server/query/presentation/GameQueryController.java
This file contains 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 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
18 changes: 18 additions & 0 deletions
18
src/main/java/com/sports/server/query/repository/GameQueryRepository.java
This file contains 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,18 @@ | ||
package com.sports.server.query.repository; | ||
|
||
import com.sports.server.command.game.domain.Game; | ||
import com.sports.server.command.league.domain.League; | ||
import java.util.List; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.data.repository.Repository; | ||
import org.springframework.data.repository.query.Param; | ||
|
||
public interface GameQueryRepository extends Repository<Game, Long> { | ||
@Query( | ||
"SELECT g FROM Game g " | ||
+ "JOIN FETCH g.teams " | ||
+ "WHERE g.league =:league " | ||
+ "AND g.state = 'PLAYING'" | ||
) | ||
List<Game> findByLeagueWithGameTeams(@Param("league") League league); | ||
} | ||
ldk980130 marked this conversation as resolved.
Show resolved
Hide resolved
|
13 changes: 11 additions & 2 deletions
13
src/main/java/com/sports/server/query/repository/LeagueQueryRepository.java
This file contains 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,11 +1,20 @@ | ||
package com.sports.server.query.repository; | ||
|
||
import com.sports.server.command.league.domain.League; | ||
import org.springframework.data.repository.Repository; | ||
|
||
import com.sports.server.command.member.domain.Member; | ||
import java.util.List; | ||
import java.util.Optional; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.data.repository.Repository; | ||
|
||
public interface LeagueQueryRepository extends Repository<League, Long>, LeagueQueryDynamicRepository { | ||
|
||
Optional<League> findById(Long id); | ||
|
||
@Query( | ||
"SELECT l FROM League l " | ||
+ "JOIN FETCH l.leagueTeams " | ||
+ "WHERE l.manager =:member" | ||
) | ||
List<League> findByManager(Member member); | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이름이 너무 긴 것도 있는데 너무 구체적인 것 같아. 적당히 세부 사항을 제외하면 어떨까?
진행 중인 게임을 지금을 반환하지만 나중에는 게임이 없을 수도, 모든 게임을 조회할 수도 있으니, 요구 사항이 바뀔 때마다 dto 이름도 수정해야 하면 번거로울 것 같아.
핵심은 리그를 조회하는 거니 리그의 의미만 담아도 좋을 것 같아. 아님
LeagueWithGameResponse
라고만 해도 좋을 것 같아There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 pr 에서 구현한 응답이 LeagueWithGames 여서 분류를 위해 다른 네이밍을 사용했는데.. 자잘자잘하게 차이점들이 있어서 분류해뒀거든. 합쳐도 되려나? 어떻게 생각하는지 궁금해.