[FEAT] 응원톡 관리 화면에서의 응원톡 전체 조회

src/docs/asciidoc/api.adoc

@@ -20,6 +20,10 @@ operation::cheer-talk-query-controller-test/응원톡을_조회한다[snippets='
 
 operation::cheer-talk-query-controller-test/리그의_신고된_응원톡을_조회한다[snippets='http-request,query-parameters,path-parameters,http-response,response-fields']
 
+=== 응원톡 관리 화면에서의 응원톡 전체 조회
+
+operation::cheer-talk-query-controller-test/리그의_차단되지_않은_응원톡을_조회한다[snippets='http-request,query-parameters,path-parameters,http-response,response-fields']
+
 == 게임 API
 
 === 게임 상세 조회

src/main/java/com/sports/server/auth/config/SecurityConfig.java

@@ -49,7 +49,7 @@ 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.GET, "/leagues/{leagueId}/cheer-talks/reported"),
+                                mvc.pattern(HttpMethod.GET, "/leagues/{leagueId}/cheer-talks/**"),
                                 mvc.pattern(HttpMethod.POST, "/leagues/{leagueId}/games"),
                                 mvc.pattern(HttpMethod.POST, "/games/*/timelines/**"),
                                 mvc.pattern(HttpMethod.POST, "/games/{gameId}/lineup-players/{lineupPlayerId}/**")

src/main/java/com/sports/server/command/game/application/GameService.java

@@ -47,9 +47,9 @@ private void saveGameTeams(Game game, GameRequestDto.Register requestDto) {
         game.addTeam(gameTeam1);
         game.addTeam(gameTeam2);
 
-        leagueTeam1.getLeagueTeamPlayers().stream()
+        leagueTeam1.getLeagueTeamPlayers()
                 .forEach(gameTeam1::registerLineup);
-        leagueTeam2.getLeagueTeamPlayers().stream()
+        leagueTeam2.getLeagueTeamPlayers()
                 .forEach(gameTeam2::registerLineup);
     }
 

src/main/java/com/sports/server/command/game/domain/Game.java

@@ -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 com.sports.server.common.domain.ManagedEntity;
 import com.sports.server.common.exception.CustomException;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -30,7 +31,7 @@
 @Getter
 @Table(name = "games")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Game extends BaseEntity<Game> {
+public class Game extends BaseEntity<Game> implements ManagedEntity {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "sport_id")
@@ -192,4 +193,9 @@ private void validateGameTeam(final GameTeam gameTeam) {
             throw new CustomException(HttpStatus.BAD_REQUEST, "해당 게임팀은 이 게임에 포함되지 않습니다.");
         }
     }
+
+    @Override
+    public boolean isManagedBy(Member manager) {
+        return manager.equals(manager);
+    }
 }

src/main/java/com/sports/server/command/league/domain/League.java

@@ -4,6 +4,7 @@
 import com.sports.server.command.member.domain.Member;
 import com.sports.server.command.organization.domain.Organization;
 import com.sports.server.common.domain.BaseEntity;
+import com.sports.server.common.domain.ManagedEntity;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -28,7 +29,7 @@
 @SQLDelete(sql = "UPDATE leagues SET is_deleted = 1 WHERE id = ?")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
-public class League extends BaseEntity<League> {
+public class League extends BaseEntity<League> implements ManagedEntity {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "manager_id")
@@ -86,6 +87,7 @@ public void updateInfo(String name, LocalDateTime startAt, LocalDateTime endAt,
         this.maxRound = maxRound;
     }
 
+    @Override
     public boolean isManagedBy(Member manager) {
         return this.manager.equals(manager);
     }

src/main/java/com/sports/server/command/leagueteam/application/LeagueTeamService.java

@@ -1,6 +1,5 @@
 package com.sports.server.command.leagueteam.application;
 
-import com.sports.server.auth.exception.AuthorizationErrorMessages;
 import com.sports.server.command.league.domain.League;
 import com.sports.server.command.leagueteam.domain.LeagueTeam;
 import com.sports.server.command.leagueteam.domain.LeagueTeamPlayer;
@@ -10,8 +9,8 @@
 import com.sports.server.command.leagueteam.dto.LeagueTeamRequest;
 import com.sports.server.command.member.domain.Member;
 import com.sports.server.common.application.EntityUtils;
+import com.sports.server.common.application.PermissionValidator;
 import com.sports.server.common.exception.NotFoundException;
-import com.sports.server.common.exception.UnauthorizedException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -33,7 +32,8 @@ public class LeagueTeamService {
     private final EntityUtils entityUtils;
 
     public void register(final Long leagueId, final Member manager, final LeagueTeamRequest.Register request) {
-        League league = getLeagueAndCheckPermission(leagueId, manager);
+        League league = entityUtils.getEntity(leagueId, League.class);
+        PermissionValidator.checkPermission(league, manager);
 
         String imgUrl = changeLogoImageUrlToBeSaved(request.logoImageUrl());
         LeagueTeam leagueTeam = request.toEntity(manager, league, imgUrl);
@@ -46,7 +46,9 @@ public void register(final Long leagueId, final Member manager, final LeagueTeam
     }
 
     public void update(Long leagueId, LeagueTeamRequest.Update request, Member manager, Long teamId) {
-        getLeagueAndCheckPermission(leagueId, manager);
+        League league = entityUtils.getEntity(leagueId, League.class);
+        PermissionValidator.checkPermission(league, manager);
+
         LeagueTeam leagueTeam = getLeagueTeam(teamId);
 
         leagueTeam.updateInfo(request.name(), changeLogoImageUrlToBeSaved(request.logoImageUrl()));
@@ -57,7 +59,9 @@ public void update(Long leagueId, LeagueTeamRequest.Update request, Member manag
     }
 
     public void delete(Long leagueId, Member manager, Long teamId) {
-        League league = getLeagueAndCheckPermission(leagueId, manager);
+        League league = entityUtils.getEntity(leagueId, League.class);
+        PermissionValidator.checkPermission(league, manager);
+
         LeagueTeam leagueTeam = entityUtils.getEntity(teamId, LeagueTeam.class);
         leagueTeam.isParticipate(league);
 
@@ -102,7 +106,8 @@ private void deletePlayers(LeagueTeamRequest.Update request, LeagueTeam leagueTe
     }
 
     public void deleteLogoImage(Long leagueId, Member manager, Long teamId) {
-        getLeagueAndCheckPermission(leagueId, manager);
+        League league = entityUtils.getEntity(leagueId, League.class);
+        PermissionValidator.checkPermission(league, manager);
 
         LeagueTeam leagueTeam = entityUtils.getEntity(teamId, LeagueTeam.class);
         leagueTeam.deleteLogoImageUrl();
@@ -115,13 +120,4 @@ private String changeLogoImageUrlToBeSaved(String logoImageUrl) {
         return logoImageUrl.replace(originPrefix, replacePrefix);
     }
 
-    private League getLeagueAndCheckPermission(final Long leagueId, final Member manager) {
-        League league = entityUtils.getEntity(leagueId, League.class);
-
-        if (!league.isManagedBy(manager)) {
-            throw new UnauthorizedException(AuthorizationErrorMessages.PERMISSION_DENIED);
-        }
-
-        return league;
-    }
 }

src/main/java/com/sports/server/command/timeline/application/TimelineService.java

@@ -7,8 +7,8 @@
 import com.sports.server.command.timeline.dto.TimelineRequest;
 import com.sports.server.command.timeline.mapper.TimelineMapper;
 import com.sports.server.common.application.EntityUtils;
+import com.sports.server.common.application.PermissionValidator;
 import com.sports.server.common.exception.CustomException;
-import com.sports.server.common.exception.UnauthorizedException;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -19,37 +19,29 @@
 @RequiredArgsConstructor
 public class TimelineService {
     private final TimelineRepository timelineRepository;
-    private final EntityUtils entityUtils;
     private final TimelineMapper timelineMapper;
+    private final EntityUtils entityUtils;
 
-    public void register(Member member, Long gameId, TimelineRequest request) {
-        Game game = checkPermissionAndGet(gameId, member);
+    public void register(Member manager, Long gameId, TimelineRequest request) {
+        Game game = entityUtils.getEntity(gameId, Game.class);
+        PermissionValidator.checkPermission(game, manager);
 
         Timeline timeline = timelineMapper.toEntity(game, request);
         timeline.apply();
 
         timelineRepository.save(timeline);
     }
 
-    public void deleteTimeline(Member member, Long gameId, Long timelineId) {
-        Game game = checkPermissionAndGet(gameId, member);
+    public void deleteTimeline(Member manager, Long gameId, Long timelineId) {
+        Game game = entityUtils.getEntity(gameId, Game.class);
+        PermissionValidator.checkPermission(game, manager);
 
         Timeline timeline = getLastTimeline(timelineId, game);
         timeline.rollback();
 
         timelineRepository.delete(timeline);
     }
 
-    private Game checkPermissionAndGet(Long gameId, Member member) {
-        Game game = entityUtils.getEntity(gameId, Game.class);
-
-        if (!game.isMangedBy(member)) {
-            throw new UnauthorizedException("타임라인 조작 권한이 없습니다.");
-        }
-
-        return game;
-    }
-
     private Timeline getLastTimeline(Long timelineId, Game game) {
         return timelineRepository.findFirstByGameOrderByIdDesc(game)
                 .filter(t -> t.getId().equals(timelineId))

src/main/java/com/sports/server/common/application/PermissionValidator.java

@@ -0,0 +1,15 @@
+package com.sports.server.common.application;
+
+import com.sports.server.command.member.domain.Member;
+import com.sports.server.common.domain.ManagedEntity;
+import com.sports.server.common.exception.UnauthorizedException;
+
+public class PermissionValidator {
+
+    public static <T extends ManagedEntity> void checkPermission(final T entity, final Member manager) {
+        if (!entity.isManagedBy(manager)) {
+            throw new UnauthorizedException(
+                    manager.getEmail() + " 은 " + entity.getClass() + " 에 접근할 권한이 존재하지 않습니다.");
+        }
+    }
+}

src/main/java/com/sports/server/common/domain/ManagedEntity.java

@@ -0,0 +1,7 @@
+package com.sports.server.common.domain;
+
+import com.sports.server.command.member.domain.Member;
+
+public interface ManagedEntity {
+    boolean isManagedBy(Member manager);
+}

src/main/java/com/sports/server/query/application/CheerTalkQueryService.java

@@ -1,13 +1,13 @@
 package com.sports.server.query.application;
 
-import com.sports.server.auth.exception.AuthorizationErrorMessages;
 import com.sports.server.command.cheertalk.domain.CheerTalk;
 import com.sports.server.command.league.domain.League;
 import com.sports.server.command.member.domain.Member;
 import com.sports.server.common.application.EntityUtils;
+import com.sports.server.common.application.PermissionValidator;
 import com.sports.server.common.dto.PageRequestDto;
-import com.sports.server.common.exception.UnauthorizedException;
 import com.sports.server.query.dto.response.CheerTalkResponse;
+import com.sports.server.query.dto.response.CheerTalkResponse.ForManager;
 import com.sports.server.query.repository.CheerTalkDynamicRepository;
 import com.sports.server.query.repository.GameQueryRepository;
 import java.util.Collections;
@@ -42,22 +42,35 @@ public List<CheerTalkResponse.ForSpectator> getCheerTalksByGameId(final Long gam
         return responses;
     }
 
-    public List<CheerTalkResponse.Reported> getReportedCheerTalksByLeagueId(final Long leagueId,
-                                                                           final PageRequestDto pageRequest,
-                                                                           final Member manager) {
+    public List<CheerTalkResponse.ForManager> getReportedCheerTalksByLeagueId(final Long leagueId,
+                                                                              final PageRequestDto pageRequest,
+                                                                              final Member manager) {
         League league = entityUtils.getEntity(leagueId, League.class);
-
-        if (!league.isManagedBy(manager)) {
-            throw new UnauthorizedException(AuthorizationErrorMessages.PERMISSION_DENIED);
-        }
+        PermissionValidator.checkPermission(league, manager);
 
         List<CheerTalk> reportedCheerTalks = cheerTalkDynamicRepository.findReportedCheerTalksByLeagueId(
                 leagueId, pageRequest.cursor(), pageRequest.size()
         );
 
         return reportedCheerTalks.stream()
-                .map(cheerTalk -> new CheerTalkResponse.Reported(cheerTalk,
-                        gameQueryRepository.findByIdWithLeague(cheerTalk.getGameTeamId()))).toList();
+                .map(cheerTalk -> new CheerTalkResponse.ForManager(cheerTalk,
+                        gameQueryRepository.findByGameTeamIdWithLeague(cheerTalk.getGameTeamId()))).toList();
     }
 
+    public List<CheerTalkResponse.ForManager> getUnblockedCheerTalksByLeagueId(Long leagueId,
+                                                                               PageRequestDto pageRequest,
+                                                                               Member manager) {
+        League league = entityUtils.getEntity(leagueId, League.class);
+        PermissionValidator.checkPermission(league, manager);
+
+        List<CheerTalk> cheerTalks = cheerTalkDynamicRepository.findUnblockedCheerTalksByLeagueId(
+                leagueId, pageRequest.cursor(), pageRequest.size()
+        );
+
+        return cheerTalks.stream()
+                .map(cheerTalk -> new ForManager(cheerTalk,
+                        gameQueryRepository.findByGameTeamIdWithLeague(cheerTalk.getGameTeamId()))).toList();
+    }
+
+
 }

src/main/java/com/sports/server/query/dto/response/CheerTalkResponse.java

@@ -30,7 +30,7 @@ private static String checkCheerTalkIsBlocked(CheerTalk cheerTalk) {
         }
     }
 
-    public record Reported(
+    public record ForManager(
             Long cheerTalkId,
             Long gameId,
             Long leagueId,
@@ -41,7 +41,7 @@ public record Reported(
             String gameName,
             String leagueName
     ) {
-        public Reported(CheerTalk cheerTalk, Game game) {
+        public ForManager(CheerTalk cheerTalk, Game game) {
             this(
                     cheerTalk.getId(),
                     game.getId(),

src/main/java/com/sports/server/query/presentation/CheerTalkQueryController.java

@@ -26,9 +26,18 @@ public ResponseEntity<List<CheerTalkResponse.ForSpectator>> getAllCheerTalks(@Pa
     }
 
     @GetMapping("/leagues/{leagueId}/cheer-talks/reported")
-    public ResponseEntity<List<CheerTalkResponse.Reported>> getAllReportedCheerTalks(@PathVariable final Long leagueId,
-                                                                                    @ModelAttribute final PageRequestDto pageRequest,
-                                                                                    Member member) {
+    public ResponseEntity<List<CheerTalkResponse.ForManager>> getAllReportedCheerTalks(
+            @PathVariable final Long leagueId,
+            @ModelAttribute final PageRequestDto pageRequest,
+            Member member) {
         return ResponseEntity.ok(cheerTalkQueryService.getReportedCheerTalksByLeagueId(leagueId, pageRequest, member));
     }
+
+    @GetMapping("/leagues/{leagueId}/cheer-talks")
+    public ResponseEntity<List<CheerTalkResponse.ForManager>> getUnblockedCheerTalksOfLeague(
+            @PathVariable final Long leagueId,
+            @ModelAttribute final PageRequestDto pageRequest, Member
+                    member) {
+        return ResponseEntity.ok(cheerTalkQueryService.getUnblockedCheerTalksByLeagueId(leagueId, pageRequest, member));
+    }
 }

src/main/java/com/sports/server/query/repository/CheerTalkDynamicRepository.java

@@ -8,4 +8,6 @@ public interface CheerTalkDynamicRepository {
     List<CheerTalk> findByGameIdOrderByStartTime(Long gameId, Long cursor, Integer size);
 
     List<CheerTalk> findReportedCheerTalksByLeagueId(Long leagueId, Long cursor, Integer size);
+
+    List<CheerTalk> findUnblockedCheerTalksByLeagueId(Long leagueId, Long cursor, Integer size);
 }

src/main/java/com/sports/server/query/repository/CheerTalkDynamicRepositoryImpl.java

@@ -44,6 +44,18 @@ public List<CheerTalk> findReportedCheerTalksByLeagueId(Long leagueId, Long curs
         );
     }
 
+    @Override
+    public List<CheerTalk> findUnblockedCheerTalksByLeagueId(Long leagueId, Long cursor, Integer size) {
+        return applyPagination(
+                queryFactory.selectFrom(cheerTalk)
+                        .join(gameTeam).on(cheerTalk.gameTeamId.eq(gameTeam.id))
+                        .where(gameTeam.game.league.id.eq(leagueId))
+                        .where(cheerTalk.isBlocked.eq(false)),
+                cursor,
+                size
+        );
+    }
+
     private List<CheerTalk> applyPagination(JPAQuery<CheerTalk> query, Long cursor, Integer size) {
         return query
                 .where(getPaginationConditions(cursor))

src/main/java/com/sports/server/query/repository/GameQueryRepository.java

@@ -26,7 +26,8 @@ public interface GameQueryRepository extends Repository<Game, Long> {
     @Query(
             "SELECT g FROM Game g "
                     + "JOIN FETCH g.league "
-                    + "WHERE g.id=:id"
+                    + "JOIN GameTeam gt ON gt.game = g "
+                    + "WHERE gt.id = :gameTeamId"
     )
-    Game findByIdWithLeague(@Param("id") Long id);
+    Game findByGameTeamIdWithLeague(@Param("gameTeamId") Long gameTeamId);
 }