Merge pull request #120 from hufscheer/del/#119-order

[DEL] 필요 없는 order 관련 로직 및 필드 삭제

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

@@ -23,13 +23,8 @@ public List<CheerTalkResponse> getCheerTalksByGameId(final Long gameId, final Pa
                 gameId, pageRequest.cursor(), pageRequest.size()
         );
 
-        List<Long> gameTeamIds = getOrderedGameTeamIds(cheerTalks);
-
         List<CheerTalkResponse> responses = cheerTalks.stream()
-                .map(cheerTalk -> new CheerTalkResponse(
-                        cheerTalk,
-                        getOrderOfGameTeamId(cheerTalk.getGameTeamId(), gameTeamIds)
-                ))
+                .map(CheerTalkResponse::new)
                 .collect(Collectors.toList());
 
         Collections.reverse(responses);
@@ -44,8 +39,4 @@ private List<Long> getOrderedGameTeamIds(final List<CheerTalk> cheerTalks) {
                 .sorted()
                 .toList();
     }
-
-    private int getOrderOfGameTeamId(final Long gameTeamId, final List<Long> gameTeamIds) {
-        return gameTeamIds.indexOf(gameTeamId) + 1;
-    }
 }

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

@@ -1,34 +1,31 @@
 package com.sports.server.query.application;
 
+import static java.util.Comparator.comparingLong;
+
 import com.sports.server.command.game.domain.Game;
 import com.sports.server.command.game.domain.GameTeam;
-import com.sports.server.query.dto.response.GameTeamCheerResponseDto;
 import com.sports.server.common.application.EntityUtils;
+import com.sports.server.query.dto.response.GameTeamCheerResponseDto;
 import com.sports.server.query.repository.GameTeamQueryRepository;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
-import static java.util.Comparator.comparingLong;
-
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class GameTeamQueryService {
 
     private final GameTeamQueryRepository gameTeamQueryRepository;
-    private final GameTeamServiceUtils gameTeamServiceUtils;
     private final EntityUtils entityUtils;
 
     public List<GameTeamCheerResponseDto> getCheerCountOfGameTeams(final Long gameId) {
         Game game = entityUtils.getEntity(gameId, Game.class);
 
         return gameTeamQueryRepository.findAllByGame(game).stream()
                 .sorted(comparingLong(GameTeam::getId))
-                .map(gameTeam -> new GameTeamCheerResponseDto(gameTeam,
-                        gameTeamServiceUtils.calculateOrderOfGameTeam(game, gameTeam)))
+                .map(gameTeam -> new GameTeamCheerResponseDto(gameTeam))
                 .toList();
     }
 }

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

@@ -2,11 +2,12 @@
 
 import static java.util.stream.Collectors.groupingBy;
 
-import com.sports.server.command.game.domain.LineupPlayer;
-import com.sports.server.query.repository.LineupPlayerQueryRepository;
 import com.sports.server.command.game.domain.GameTeam;
+import com.sports.server.command.game.domain.LineupPlayer;
 import com.sports.server.query.dto.response.LineupPlayerResponse;
+import com.sports.server.query.repository.LineupPlayerQueryRepository;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +20,6 @@
 public class LineupPlayerQueryService {
 
     private final LineupPlayerQueryRepository lineupPlayerQueryRepository;
-    private final GameTeamServiceUtils gameTeamServiceUtils;
 
     public List<LineupPlayerResponse> getLineup(final Long gameId) {
         Map<GameTeam, List<LineupPlayer>> groupByTeam = lineupPlayerQueryRepository.findPlayersByGameId(gameId)
@@ -29,8 +29,9 @@ public List<LineupPlayerResponse> getLineup(final Long gameId) {
         List<GameTeam> gameTeams = groupByTeam.keySet().stream().toList();
 
         return gameTeams.stream()
-                .map(gameTeam -> new LineupPlayerResponse(gameTeam, groupByTeam.getOrDefault(gameTeam, new ArrayList<>()),
-                        gameTeamServiceUtils.calculateOrderOfGameTeam(gameTeams, gameTeam)))
+                .sorted(Comparator.comparingLong(GameTeam::getId))
+                .map(gameTeam -> new LineupPlayerResponse(gameTeam,
+                        groupByTeam.getOrDefault(gameTeam, new ArrayList<>())))
                 .toList();
     }
 }

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

@@ -8,17 +8,15 @@ public record CheerTalkResponse(
         String content,
         Long gameTeamId,
         LocalDateTime createdAt,
-        Boolean isBlocked,
-        int order
+        Boolean isBlocked
 ) {
-    public CheerTalkResponse(CheerTalk cheerTalk, final int order) {
+    public CheerTalkResponse(CheerTalk cheerTalk) {
         this(
                 cheerTalk.getId(),
                 checkCheerTalkIsBlocked(cheerTalk),
                 cheerTalk.getGameTeamId(),
                 cheerTalk.getCreatedAt(),
-                cheerTalk.isBlocked(),
-                order
+                cheerTalk.isBlocked()
         );
     }
 

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

@@ -5,8 +5,6 @@
 import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 public record GameDetailResponse(
         LocalDateTime startTime,
@@ -24,28 +22,25 @@ public GameDetailResponse(Game game, List<GameTeam> gameTeams) {
                 game.getGameQuarter(),
                 game.getName(),
                 game.getSport().getName(),
-                IntStream.range(0, gameTeams.size())
-                        .boxed()
-                        .sorted(Comparator.comparingLong(i -> gameTeams.get(i).getId()))
-                        .map(i -> new TeamResponse(gameTeams.get(i), i + 1))
-                        .collect(Collectors.toList())
+                gameTeams.stream()
+                        .sorted(Comparator.comparingLong(GameTeam::getId))
+                        .map(TeamResponse::new)
+                        .toList()
         );
     }
 
     public record TeamResponse(
             Long gameTeamId,
             String gameTeamName,
             String logoImageUrl,
-            Integer score,
-            int order
+            Integer score
     ) {
-        public TeamResponse(GameTeam gameTeam, int order) {
+        public TeamResponse(GameTeam gameTeam) {
             this(
                     gameTeam.getId(),
                     gameTeam.getLeagueTeam().getName(),
                     gameTeam.getLeagueTeam().getLogoImageUrl(),
-                    gameTeam.getScore(),
-                    order
+                    gameTeam.getScore()
             );
         }
     }

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

@@ -1,14 +1,11 @@
 package com.sports.server.query.dto.response;
 
-import com.sports.server.command.sport.domain.Sport;
 import com.sports.server.command.game.domain.Game;
 import com.sports.server.command.game.domain.GameTeam;
-
+import com.sports.server.command.sport.domain.Sport;
 import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 public record GameResponseDto(
         Long id,
@@ -24,11 +21,10 @@ public GameResponseDto(final Game game, final List<GameTeam> gameTeams, final Sp
                 game.getStartTime(),
                 game.getGameQuarter(),
                 game.getName(),
-                IntStream.range(0, gameTeams.size())
-                        .boxed()
-                        .sorted(Comparator.comparingLong(i -> gameTeams.get(i).getId()))
-                        .map(i -> new GameResponseDto.TeamResponse(gameTeams.get(i), i + 1))
-                        .collect(Collectors.toList()),
+                gameTeams.stream()
+                        .sorted(Comparator.comparingLong(GameTeam::getId))
+                        .map(TeamResponse::new)
+                        .toList(),
                 sport.getName()
         );
     }
@@ -37,15 +33,14 @@ public record TeamResponse(
             Long gameTeamId,
             String gameTeamName,
             String logoImageUrl,
-            Integer score,
-            int order
+            Integer score
     ) {
-        public TeamResponse(GameTeam gameTeam, int order) {
+        public TeamResponse(GameTeam gameTeam) {
             this(
                     gameTeam.getId(),
                     gameTeam.getLeagueTeam().getName(),
                     gameTeam.getLeagueTeam().getLogoImageUrl(),
-                    gameTeam.getScore(), order
+                    gameTeam.getScore()
             );
         }
     }

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

@@ -4,11 +4,10 @@
 
 public record GameTeamCheerResponseDto(
         Long gameTeamId,
-        int cheerCount,
-        int order
+        int cheerCount
 ) {
-    public GameTeamCheerResponseDto(final GameTeam gameTeam, final int order) {
-        this(gameTeam.getId(), gameTeam.getCheerCount(), order);
+    public GameTeamCheerResponseDto(final GameTeam gameTeam) {
+        this(gameTeam.getId(), gameTeam.getCheerCount());
     }
 
 }

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

@@ -7,19 +7,17 @@
 public record LineupPlayerResponse(
         Long gameTeamId,
         String teamName,
-        List<PlayerResponse> gameTeamPlayers,
-        int order
+        List<PlayerResponse> gameTeamPlayers
 
 ) {
 
-    public LineupPlayerResponse(GameTeam gameTeam, List<LineupPlayer> lineupPlayers, int order) {
+    public LineupPlayerResponse(GameTeam gameTeam, List<LineupPlayer> lineupPlayers) {
         this(
                 gameTeam.getId(),
                 gameTeam.getLeagueTeam().getName(),
                 lineupPlayers.stream()
                         .map(PlayerResponse::new)
-                        .toList(),
-                order
+                        .toList()
         );
     }
 

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

@@ -2,11 +2,10 @@
 
 import com.sports.server.command.cheertalk.domain.CheerTalk;
 import com.sports.server.command.cheertalk.domain.CheerTalkCreateEvent;
-import com.sports.server.query.dto.response.CheerTalkResponse;
-import com.sports.server.common.application.EntityUtils;
-import com.sports.server.query.application.GameTeamServiceUtils;
 import com.sports.server.command.game.domain.Game;
 import com.sports.server.command.game.domain.GameTeam;
+import com.sports.server.common.application.EntityUtils;
+import com.sports.server.query.dto.response.CheerTalkResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.scheduling.annotation.Async;
@@ -18,8 +17,6 @@
 public class CheerTalkEventHandler {
 
     private static final String DESTINATION = "/topic/games/";
-
-    private final GameTeamServiceUtils gameTeamServiceUtils;
     private final EntityUtils entityUtils;
     private final SimpMessagingTemplate messagingTemplate;
 
@@ -33,8 +30,7 @@ public void handle(CheerTalkCreateEvent event) {
 
         messagingTemplate.convertAndSend(
                 DESTINATION + game.getId(),
-                new CheerTalkResponse(cheerTalk,
-                        gameTeamServiceUtils.calculateOrderOfGameTeam(game, cheerTalk.getGameTeamId()))
+                new CheerTalkResponse(cheerTalk)
         );
 
     }