Skip to content
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
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e218fc2
[FEAT] 매니저가 생성한 리그와 리그에 해당하는 경기 및 경기팀 조회 기능 구현 #192
Jin409 Aug 9, 2024
2bdba2c
[TEST] 서비스 테스트 추가 #192
Jin409 Aug 9, 2024
faf1f37
[FIX] 리그팀 삭제 시 게임팀도 삭제될 수 있도록 양방향 연관관계를 맺도록 수정 #192
Jin409 Aug 9, 2024
7651c05
[TEST] league 픽스처 수정에 따른 테스트 수정 #192
Jin409 Aug 9, 2024
4a8eb05
[TEST] 인수 테스트 추가 #192
Jin409 Aug 10, 2024
3085480
[DOCS] 문서화 #192
Jin409 Aug 10, 2024
66613cd
[FIX] 중복되는 양방향 연관관계 삭제 #192
Jin409 Aug 10, 2024
a5144bd
[CHORE] 라인업 선발/후보 수정 엔드포인트 SecurityConfig 에 등록 #192
Jin409 Aug 10, 2024
c7bbcff
[MERGE] 메인 브랜치 변경 사항 반영 #192
Jin409 Aug 13, 2024
e2dd01b
[RENAME] LeagueResponseForManager 를 LeagueResponseWithInProgressGames…
Jin409 Aug 13, 2024
d4edbf1
[REFACTOR] 진행 중인 경기를 조회한다는 의미를 포함하도록 메서드명 수정 #192
Jin409 Aug 13, 2024
3711951
[FEAT] 리그에 해당하는 경기 정보 조회 기능 구현 #200
Jin409 Aug 13, 2024
dca57dd
[TEST] 서비스 테스트 추가 #200
Jin409 Aug 13, 2024
a228851
[TEST] 인수 테스트 추가 #200
Jin409 Aug 13, 2024
8375f47
[DOCS] 문서화 #200
Jin409 Aug 13, 2024
8098a58
[RENAME] Response Dto 내부 레코드 이름 변경 #200
Jin409 Aug 17, 2024
88ebb0e
Merge pull request #202 from hufscheer/feat/#200-league
Jin409 Sep 9, 2024
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
4 changes: 2 additions & 2 deletions src/docs/asciidoc/api.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ operation::league-team-controller-test/리그팀을_삭제한다[snippets='http-

operation::league-query-controller-test/리그를_하나_조회한다[snippets='http-request,path-parameters,http-response,response-fields']

=== 리그팀 상세 조회
=== 매니저가 생성한 리그 전체 조회

operation::league-query-controller-test/리그팀을_상세_조회한다[snippets='http-request,path-parameters,http-response,response-fields']
operation::league-query-controller-test/매니저가_생성한_모든_리그를_조회한다[snippets='http-request,http-response,response-fields']

== 타임라인 API

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc
mvc.pattern(HttpMethod.PUT, "/leagues/{leagueId}/teams/{teamId}"),
mvc.pattern(HttpMethod.DELETE, "/leagues/{leagueId}/teams/{teamId}"),
mvc.pattern(HttpMethod.POST, "/leagues/{leagueId}/teams/{teamId}/delete-logo"),
mvc.pattern(HttpMethod.POST, "/games/*/timelines/**")
mvc.pattern(HttpMethod.POST, "/games/*/timelines/**"),
mvc.pattern(HttpMethod.POST, "/games/{gameId}/lineup-players/{lineupPlayerId}/**")
)
.authenticated()
.anyRequest().permitAll()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.sports.server.command.member.domain.Member;
import com.sports.server.command.sport.domain.Sport;
import com.sports.server.common.domain.BaseEntity;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
Expand Down Expand Up @@ -40,7 +41,7 @@ public class Game extends BaseEntity<Game> {
@JoinColumn(name = "league_id")
private League league;

@OneToMany(mappedBy = "game")
@OneToMany(mappedBy = "game", cascade = CascadeType.ALL, orphanRemoval = true)
private List<GameTeam> teams = new ArrayList<>();

@Column(name = "name", nullable = false)
Expand Down
48 changes: 28 additions & 20 deletions src/main/java/com/sports/server/command/league/domain/League.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
package com.sports.server.command.league.domain;

import com.sports.server.command.leagueteam.domain.LeagueTeam;
import com.sports.server.command.member.domain.Member;
import com.sports.server.command.organization.domain.Organization;
import com.sports.server.common.domain.BaseEntity;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down Expand Up @@ -48,25 +53,28 @@ public class League extends BaseEntity<League> {
@Column(name = "is_deleted", nullable = false)
private boolean isDeleted;

public League(
final Member manager,
final Organization organization,
final String name,
final LocalDateTime startAt,
final LocalDateTime endAt,
final Round maxRound
) {
this.manager = manager;
this.organization = organization;
this.name = name;
this.startAt = startAt;
this.endAt = endAt;
this.maxRound = maxRound;
this.inProgressRound = maxRound;
this.isDeleted = false;
}
@OneToMany(mappedBy = "league", cascade = CascadeType.ALL, orphanRemoval = true)
List<LeagueTeam> leagueTeams = new ArrayList<>();

public boolean isManagedBy(Member manager) {
return this.manager.equals(manager);
}
public League(
final Member manager,
final Organization organization,
final String name,
final LocalDateTime startAt,
final LocalDateTime endAt,
final Round maxRound
) {
this.manager = manager;
this.organization = organization;
this.name = name;
this.startAt = startAt;
this.endAt = endAt;
this.maxRound = maxRound;
this.inProgressRound = maxRound;
this.isDeleted = false;
}

public boolean isManagedBy(Member manager) {
return this.manager.equals(manager);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.sports.server.command.leagueteam.domain;

import com.sports.server.auth.exception.AuthorizationErrorMessages;
import com.sports.server.command.game.domain.GameTeam;
import com.sports.server.command.league.domain.League;
import com.sports.server.command.member.domain.Member;
import com.sports.server.command.organization.domain.Organization;
Expand Down Expand Up @@ -47,6 +48,9 @@ public class LeagueTeam extends BaseEntity<LeagueTeam> {
@OneToMany(mappedBy = "leagueTeam", cascade = CascadeType.ALL, orphanRemoval = true)
private List<LeagueTeamPlayer> leagueTeamPlayers = new ArrayList<>();

@OneToMany(mappedBy = "leagueTeam", cascade = CascadeType.ALL, orphanRemoval = true)
private List<GameTeam> gameTeams = new ArrayList<>();

public void addPlayer(LeagueTeamPlayer leagueTeamPlayer) {
leagueTeamPlayers.add(leagueTeamPlayer);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
package com.sports.server.query.application;

import static java.util.stream.Collectors.toMap;

import com.sports.server.command.game.domain.Game;
import com.sports.server.command.league.domain.League;
import com.sports.server.command.league.domain.LeagueProgress;
import com.sports.server.command.leagueteam.domain.LeagueTeam;
import com.sports.server.command.leagueteam.domain.LeagueTeamPlayer;
import com.sports.server.command.member.domain.Member;
import com.sports.server.common.application.EntityUtils;
import com.sports.server.common.exception.NotFoundException;
import com.sports.server.query.dto.response.LeagueDetailResponse;
import com.sports.server.query.dto.response.LeagueResponse;
import com.sports.server.query.dto.response.LeagueResponseWithInProgressGames;
import com.sports.server.query.dto.response.LeagueSportResponse;
import com.sports.server.query.dto.response.LeagueTeamDetailResponse;
import com.sports.server.query.dto.response.LeagueTeamPlayerResponse;
import com.sports.server.query.dto.response.LeagueTeamResponse;
import com.sports.server.query.repository.GameQueryRepository;
import com.sports.server.query.repository.LeagueQueryRepository;
import com.sports.server.query.repository.LeagueSportQueryRepository;
import com.sports.server.query.repository.LeagueTeamDynamicRepository;
import com.sports.server.query.repository.LeagueTeamPlayerQueryRepository;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -29,6 +38,7 @@ public class LeagueQueryService {
private final LeagueSportQueryRepository leagueSportQueryRepository;
private final LeagueTeamDynamicRepository leagueTeamDynamicRepository;
private final LeagueTeamPlayerQueryRepository leagueTeamPlayerQueryRepository;
private final GameQueryRepository gameQueryRepository;
private final EntityUtils entityUtils;

public List<LeagueResponse> findLeagues(Integer year) {
Expand Down Expand Up @@ -70,9 +80,28 @@ public List<LeagueTeamPlayerResponse> findPlayersByLeagueTeam(Long leagueTeamId)
.toList();
}

public List<LeagueResponseWithInProgressGames> findLeaguesByManager(final Member member) {
List<League> leagues = leagueQueryRepository.findByManager(member);
Map<League, List<Game>> gamesForLeagues = getGamesForLeague(leagues);

return leagues.stream()
.map(league -> LeagueResponseWithInProgressGames.of(
league,
LeagueProgress.getProgressDescription(LocalDateTime.now(), league),
gamesForLeagues.get(league)))
.toList();
}

private Map<League, List<Game>> getGamesForLeague(List<League> leagues) {
return leagues.stream()
.collect(toMap(league -> league, league -> gameQueryRepository.findByLeagueWithGameTeams(league)));
}


public LeagueTeamDetailResponse findLeagueTeam(final Long leagueTeamId) {
LeagueTeam leagueTeam = entityUtils.getEntity(leagueTeamId, LeagueTeam.class);
List<LeagueTeamPlayer> leagueTeamPlayers = leagueTeamPlayerQueryRepository.findByLeagueTeamId(leagueTeam.getId());
List<LeagueTeamPlayer> leagueTeamPlayers = leagueTeamPlayerQueryRepository.findByLeagueTeamId(
leagueTeam.getId());
return LeagueTeamDetailResponse.of(leagueTeam, leagueTeamPlayers);
}
}
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(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이름이 너무 긴 것도 있는데 너무 구체적인 것 같아. 적당히 세부 사항을 제외하면 어떨까?

진행 중인 게임을 지금을 반환하지만 나중에는 게임이 없을 수도, 모든 게임을 조회할 수도 있으니, 요구 사항이 바뀔 때마다 dto 이름도 수정해야 하면 번거로울 것 같아.

핵심은 리그를 조회하는 거니 리그의 의미만 담아도 좋을 것 같아. 아님 LeagueWithGameResponse라고만 해도 좋을 것 같아

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 pr 에서 구현한 응답이 LeagueWithGames 여서 분류를 위해 다른 네이밍을 사용했는데.. 자잘자잘하게 차이점들이 있어서 분류해뒀거든. 합쳐도 되려나? 어떻게 생각하는지 궁금해.


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()
);
}

}
}

Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
package com.sports.server.query.presentation;

import com.sports.server.query.dto.request.GamesQueryRequestDto;
import com.sports.server.common.dto.PageRequestDto;
import com.sports.server.query.application.GameQueryService;
import com.sports.server.query.application.LineupPlayerQueryService;
import com.sports.server.query.application.GameTeamQueryService;
import com.sports.server.query.dto.response.*;
import com.sports.server.query.application.LineupPlayerQueryService;
import com.sports.server.query.dto.request.GamesQueryRequestDto;
import com.sports.server.query.dto.response.GameDetailResponse;
import com.sports.server.query.dto.response.GameResponseDto;
import com.sports.server.query.dto.response.GameTeamCheerResponseDto;
import com.sports.server.query.dto.response.LineupPlayerResponse;
import com.sports.server.query.dto.response.VideoResponse;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.sports.server.query.presentation;

import com.sports.server.command.member.domain.Member;
import com.sports.server.query.application.LeagueQueryService;
import com.sports.server.query.dto.response.LeagueDetailResponse;
import com.sports.server.query.dto.response.LeagueResponse;
import com.sports.server.query.dto.response.LeagueResponseWithInProgressGames;
import com.sports.server.query.dto.response.LeagueSportResponse;
import com.sports.server.query.dto.response.LeagueTeamDetailResponse;
import com.sports.server.query.dto.response.LeagueTeamPlayerResponse;
Expand Down Expand Up @@ -50,6 +52,11 @@ public ResponseEntity<List<LeagueTeamPlayerResponse>> findPlayersByLeagueTeam(@P
return ResponseEntity.ok(leagueQueryService.findPlayersByLeagueTeam(leagueTeamId));
}

@GetMapping("/manager")
public ResponseEntity<List<LeagueResponseWithInProgressGames>> findLeaguesByManager(final Member member) {
return ResponseEntity.ok(leagueQueryService.findLeaguesByManager(member));
}

@GetMapping("/teams/{leagueTeamId}")
public ResponseEntity<LeagueTeamDetailResponse> findLeagueTeam(@PathVariable final Long leagueTeamId) {
return ResponseEntity.ok(leagueQueryService.findLeagueTeam(leagueTeamId));
Expand Down
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
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);
}
Loading
Loading