Merge pull request #275 from 42organization/274-fix-admin-page-에서-end-외의-게임-상태-보이게-수정하기

#274 fix admin page 에서 end 외의 게임 상태 보이게 수정하기

Author: AYoungSn

src/main/java/com/gg/server/admin/game/data/GameAdminRepository.java

@@ -23,8 +23,6 @@ public interface GameAdminRepository extends JpaRepository<Game, Long> {
             "from v_rank_game_detail t1, v_rank_game_detail t2 " +
             "where t1.gameId IN (:games) and t1.teamId <t2.teamId and t1.gameId=t2.gameId order by t1.startTime desc;", nativeQuery = true)
     List<GameTeamUser> findTeamsByGameIsIn(@Param("games") List<Long> games);
-
-    Page<Game> findAllByStatus(Pageable pageable, StatusType status);
     @Query(value = "SELECT g FROM Game g, Team t, TeamUser tu WHERE g.status = :status AND g.id = t.game.id"
             + " AND t.id = tu.team.id AND tu.user.id = :userId")
     Optional<Game> findByStatusTypeAndUserId(@Param("status") StatusType status, @Param("userId") Long userId);

src/main/java/com/gg/server/admin/game/dto/GameLogAdminDto.java

@@ -1,6 +1,7 @@
 package com.gg.server.admin.game.dto;
 
 import com.gg.server.domain.game.dto.GameTeamUser;
+import com.gg.server.domain.game.type.StatusType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,6 +17,7 @@ public class GameLogAdminDto {
     private LocalDateTime startAt;
     private String slotTime;
     private String mode;
+    private StatusType status;
     private GameTeamAdminDto team1;
     private GameTeamAdminDto team2;
 
@@ -27,5 +29,6 @@ public GameLogAdminDto(GameTeamUser game) {
         this.mode = game.getMode().getCode();
         this.team1 = new GameTeamAdminDto(game.getT1IntraId(), game.getT1TeamId(), game.getT1Score(), game.getT1IsWin());
         this.team2 = new GameTeamAdminDto(game.getT2IntraId(), game.getT2TeamId(), game.getT2Score(), game.getT2IsWin());
+        this.status = game.getStatus();
     }
 }

src/main/java/com/gg/server/admin/game/service/GameAdminService.java

@@ -29,6 +29,7 @@
 import com.gg.server.domain.user.User;
 import com.gg.server.domain.user.UserRepository;
 import com.gg.server.domain.user.exception.UserNotFoundException;
+import java.util.Arrays;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
@@ -57,7 +58,7 @@ public class GameAdminService {
 
     @Transactional(readOnly = true)
     public GameLogListAdminResponseDto findAllGamesByAdmin(Pageable pageable) {
-        Page<Game> gamePage = gameAdminRepository.findAllByStatus(pageable, StatusType.END); //모든 게임 정보 가져오기
+        Page<Game> gamePage = gameAdminRepository.findAll(pageable); //모든 게임 정보 가져오기
         return new GameLogListAdminResponseDto(getGameLogList(gamePage.getContent().stream().map(Game::getId).collect(Collectors.toList())), gamePage.getTotalPages());
     }
 

src/main/java/com/gg/server/domain/game/data/GameRepository.java

@@ -72,6 +72,5 @@ public interface GameRepository extends JpaRepository<Game, Long>, GameRepositor
             "WHERE g.id=t.game_id AND t.id = tu.team_id AND tu.user_id=u.id AND g.status = 'BEFORE'", nativeQuery = true)
     List<GameUser> findAllByStartTimeLessThanEqual(@Param("time") LocalDateTime time);
     @Lock(LockModeType.PESSIMISTIC_WRITE)
-    @Query(value = "SELECT g FROM Game g WHERE g.id=:gamdId")
-    Optional<Game> findWithPessimisticLockById(@Param("gameId") Long gameId);
+    Optional<Game> findWithPessimisticLockById(Long gameId);
 }