[team-13 새리] API 구현

BE/baseball/src/main/java/com/codesquad/baseball/DTO/GameListDTO.java

@@ -1,24 +1,29 @@
 package com.codesquad.baseball.DTO;
 
-import org.springframework.data.relational.core.mapping.Column;
+import com.codesquad.baseball.domain.Team;
 
 public class GameListDTO {
 
-    @Column("gameId")
     private Long gameId;
 
-    @Column("homeTeamName")
     private String homeTeamName;
 
-    @Column("homeTeamId")
     private Long homeTeamId;
 
-    @Column("awayTeamName")
     private String awayTeamName;
 
-    @Column("awayTeamId")
     private Long awayTeamId;
 
+    public static GameListDTO of(Long gameId, Team homeTeam, Team awayTeam) {
+        return new GameListDTO(
+                gameId,
+                homeTeam.getName(),
+                homeTeam.getId(),
+                awayTeam.getName(),
+                awayTeam.getId()
+        );
+    }
+
     public GameListDTO(Long gameId, String homeTeamName, Long homeTeamId, String awayTeamName, Long awayTeamId) {
         this.gameId = gameId;
         this.homeTeamName = homeTeamName;

BE/baseball/src/main/java/com/codesquad/baseball/DTO/record/PlayerRecordDTO.java

@@ -2,11 +2,13 @@
 
 import com.codesquad.baseball.domain.Player;
 
-import java.text.DecimalFormat;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 public class PlayerRecordDTO {
 
-    private static final DecimalFormat AVERAGE_FORMAT = new DecimalFormat("0.000");
+    private static final int AVERAGE_DECIMAL_PLACES = 3;
+
     private Long id;
 
     private String name;
@@ -17,7 +19,7 @@ public class PlayerRecordDTO {
 
     private int out;
 
-    private String average;
+    private BigDecimal average;
 
     private int battingOrder;
 
@@ -26,11 +28,10 @@ public class PlayerRecordDTO {
     private boolean isPitcher;
 
     public static PlayerRecordDTO of(Player player) {
-        String average = "0";
-        if (player.getPlateAppearance() > 0) {
-            average = AVERAGE_FORMAT.format(player.getHit() / (float) player.getPlateAppearance());
-            System.out.println(average);
-        }
+        BigDecimal average = (player.getPlateAppearance() > 0) ?
+                BigDecimal.valueOf(player.getHit() / (double) player.getPlateAppearance()) : BigDecimal.ZERO;
+        average = average.setScale(AVERAGE_DECIMAL_PLACES, RoundingMode.CEILING);
+
         return new PlayerRecordDTO(
                 player.getId(),
                 player.getName(),
@@ -44,7 +45,7 @@ public static PlayerRecordDTO of(Player player) {
         );
     }
 
-    private PlayerRecordDTO(Long id, String name, int plateAppearance, int hit, int out, String average,
+    private PlayerRecordDTO(Long id, String name, int plateAppearance, int hit, int out, BigDecimal average,
                             int battingOrder, int backNumber, boolean isPitcher) {
         this.id = id;
         this.name = name;
@@ -77,7 +78,7 @@ public int getOut() {
         return out;
     }
 
-    public String getAverage() {
+    public BigDecimal getAverage() {
         return average;
     }
 

BE/baseball/src/main/java/com/codesquad/baseball/DTO/score/TeamScoreDTO.java

@@ -3,9 +3,7 @@
 import com.codesquad.baseball.domain.Score;
 import com.codesquad.baseball.domain.Team;
 
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class TeamScoreDTO {
 
@@ -18,15 +16,11 @@ public class TeamScoreDTO {
     private List<Score> scores;
 
     public static TeamScoreDTO of(Team team) {
-        List<Score> scores = team.getScores().stream()
-                .sorted(Comparator.comparingInt(Score::getInning))
-                .collect(Collectors.toList());
-
         return new TeamScoreDTO(
                 team.getId(),
                 team.getName(),
                 team.isUserSelected(),
-                scores
+                team.getSortedScores()
         );
     }
 

BE/baseball/src/main/java/com/codesquad/baseball/controller/GameController.java

@@ -1,17 +1,13 @@
 package com.codesquad.baseball.controller;
 
-import com.codesquad.baseball.DTO.*;
+import com.codesquad.baseball.DTO.GameListDTO;
 import com.codesquad.baseball.DTO.record.TeamRecordDTO;
-import com.codesquad.baseball.DTO.record.request.PlayerRecordRequest;
 import com.codesquad.baseball.DTO.score.GameScoreDTO;
-import com.codesquad.baseball.DTO.score.TeamScoreDTO;
-import com.codesquad.baseball.domain.Game;
-import com.codesquad.baseball.domain.Score;
-import com.codesquad.baseball.domain.Team;
 import com.codesquad.baseball.service.GameService;
-import com.codesquad.baseball.service.TeamService;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -20,48 +16,24 @@
 public class GameController {
 
     private final GameService gameService;
-    private final TeamService teamService;
 
-    public GameController(GameService gameService, TeamService teamService) {
+    public GameController(GameService gameService) {
         this.gameService = gameService;
-        this.teamService = teamService;
     }
 
     @GetMapping("/games")
     public List<GameListDTO> browseGames() {
         return gameService.browseAllGames();
     }
 
-    @GetMapping("/games/{teamId}")
-    public TeamDTO browseTeamStatus(@PathVariable Long teamId) {
-        return teamService.browseTeamStatus(teamId);
-    }
-
-    @GetMapping("/play/{gameId}/players")
+    @GetMapping("/game/{gameId}/players")
     public TeamRecordDTO browseTeamPlayers(@PathVariable Long gameId) {
-        Game game = gameService.findGameById(gameId);
-        Team homeTeam = teamService.browseTeamById(game.getHomeTeamId());
-        Team awayTeam = teamService.browseTeamById(game.getAwayTeamId());
-        return new TeamRecordDTO(homeTeam, awayTeam);
+        return gameService.browseTeamPlayersByGameId(gameId);
     }
 
-    @PostMapping("/play/{teamId}/score")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void addScore(@PathVariable Long teamId, @RequestBody Score score) {
-        teamService.addScore(teamId, score);
-    }
-
-    @GetMapping("/play/{gameId}/score")
+    @GetMapping("/game/{gameId}/score")
     public GameScoreDTO browseAllScore(@PathVariable Long gameId) {
-        Game game = gameService.findGameById(gameId);
-        TeamScoreDTO homeTeamScoreDTO = teamService.browseTeamScore(game.getHomeTeamId());
-        TeamScoreDTO awayTeamScoreDTO = teamService.browseTeamScore(game.getAwayTeamId());
-        return GameScoreDTO.of(game, homeTeamScoreDTO, awayTeamScoreDTO);
+        return gameService.browseGameScoreByGameId(gameId);
     }
 
-    @PatchMapping("/play/{teamId}/record")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void updatePlayerRecord(@PathVariable Long teamId, @RequestBody PlayerRecordRequest record) {
-        teamService.updatePlayerRecord(teamId, record);
-    }
 }

BE/baseball/src/main/java/com/codesquad/baseball/controller/TeamController.java

@@ -0,0 +1,36 @@
+package com.codesquad.baseball.controller;
+
+import com.codesquad.baseball.DTO.TeamDTO;
+import com.codesquad.baseball.DTO.record.request.PlayerRecordRequest;
+import com.codesquad.baseball.domain.Score;
+import com.codesquad.baseball.service.TeamService;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/baseball")
+public class TeamController {
+
+    private final TeamService teamService;
+
+    public TeamController(TeamService teamService) {
+        this.teamService = teamService;
+    }
+
+    @GetMapping("/games/{teamId}")
+    public TeamDTO browseTeamStatus(@PathVariable Long teamId) {
+        return teamService.browseTeamStatus(teamId);
+    }
+
+    @PostMapping("/play/{teamId}/score")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void addScore(@PathVariable Long teamId, @RequestBody Score score) {
+        teamService.addScore(teamId, score);
+    }
+
+    @PatchMapping("/play/{teamId}/record")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void updatePlayerRecord(@PathVariable Long teamId, @RequestBody PlayerRecordRequest record) {
+        teamService.updatePlayerRecord(teamId, record);
+    }
+}

BE/baseball/src/main/java/com/codesquad/baseball/domain/Team.java

@@ -3,8 +3,11 @@
 import com.codesquad.baseball.error.exception.PlayerNotFoundException;
 import org.springframework.data.annotation.Id;
 
+import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public class Team {
 
@@ -106,6 +109,12 @@ public void addScore(Score score) {
         scores.add(score);
     }
 
+    public List<Score> getSortedScores() {
+        return scores.stream()
+                .sorted(Comparator.comparingInt(Score::getInning))
+                .collect(Collectors.toList());
+    }
+
     @Override
     public String toString() {
         return "Team{" +

BE/baseball/src/main/java/com/codesquad/baseball/service/GameService.java

@@ -1,31 +1,64 @@
 package com.codesquad.baseball.service;
 
 import com.codesquad.baseball.DTO.GameListDTO;
+import com.codesquad.baseball.DTO.record.TeamRecordDTO;
+import com.codesquad.baseball.DTO.score.GameScoreDTO;
+import com.codesquad.baseball.DTO.score.TeamScoreDTO;
 import com.codesquad.baseball.domain.Game;
+import com.codesquad.baseball.domain.Team;
 import com.codesquad.baseball.error.exception.GameNotFoundException;
+import com.codesquad.baseball.error.exception.TeamNotFoundException;
 import com.codesquad.baseball.repository.GameRepository;
+import com.codesquad.baseball.repository.TeamRepository;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class GameService {
 
     private final GameRepository gameRepository;
+    private final TeamRepository teamRepository;
 
-    public GameService(GameRepository gameRepository) {
+    @Autowired
+    public GameService(GameRepository gameRepository, TeamRepository teamRepository) {
         this.gameRepository = gameRepository;
+        this.teamRepository = teamRepository;
     }
 
     public Game save(Game game) {
         return gameRepository.save(game);
     }
 
     public List<GameListDTO> browseAllGames() {
-        return gameRepository.browseAllGames();
+        Iterable<Game> games = gameRepository.findAll();
+        List<GameListDTO> gameList = new ArrayList<>();
+        for (Game game : games) {
+            Long id = game.getId();
+            gameList.add(GameListDTO.of(id, findHomeTeamByGameId(id), findAwayTeamByGameId(id)));
+        }
+        return gameList;
     }
 
     public Game findGameById(Long id) {
         return gameRepository.findById(id).orElseThrow(GameNotFoundException::new);
     }
+
+    public Team findHomeTeamByGameId(Long id) {
+        return teamRepository.findById(findGameById(id).getHomeTeamId()).orElseThrow(TeamNotFoundException::new);
+    }
+
+    public Team findAwayTeamByGameId(Long id) {
+        return teamRepository.findById(findGameById(id).getAwayTeamId()).orElseThrow(TeamNotFoundException::new);
+    }
+
+    public TeamRecordDTO browseTeamPlayersByGameId(Long id) {
+        return new TeamRecordDTO(findAwayTeamByGameId(id), findHomeTeamByGameId(id));
+    }
+
+    public GameScoreDTO browseGameScoreByGameId(Long id) {
+        return GameScoreDTO.of(findGameById(id), TeamScoreDTO.of(findHomeTeamByGameId(id)), TeamScoreDTO.of(findAwayTeamByGameId(id)));
+    }
 }

BE/baseball/src/main/java/com/codesquad/baseball/service/TeamService.java

@@ -1,7 +1,7 @@
 package com.codesquad.baseball.service;
 
-import com.codesquad.baseball.DTO.record.request.PlayerRecordRequest;
 import com.codesquad.baseball.DTO.TeamDTO;
+import com.codesquad.baseball.DTO.record.request.PlayerRecordRequest;
 import com.codesquad.baseball.DTO.score.TeamScoreDTO;
 import com.codesquad.baseball.domain.Player;
 import com.codesquad.baseball.domain.Score;