Be/feature/api PR

BE/src/main/java/com/example/baseball/controller/DetailController.java

@@ -14,8 +14,8 @@ public DetailController(DetailService detailService) {
         this.detailService = detailService;
     }
 
-    @GetMapping("/{gameId}/homeTeam")
-    public DetailPageDTO showDetailpage(@PathVariable Long gameId) {
-        return detailService.showDetailpage(gameId);
+    @GetMapping("/{gameId}/{teamName}")
+    public DetailPageDTO showDetailpage(@PathVariable Long gameId, @PathVariable String teamName) {
+        return detailService.showDetailpage(gameId, teamName);
     }
 }

BE/src/main/java/com/example/baseball/controller/GameListController.java

@@ -3,26 +3,21 @@
 import com.example.baseball.dto.MatchedTeamDTO;
 import com.example.baseball.service.GameListService;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
-public class    GameListController {
+public class GameListController {
     private final GameListService gameListService;
 
     public GameListController (GameListService gameListService) {
         this.gameListService = gameListService;
     }
 
-    @GetMapping("/matchTeam/{id}")
-    public MatchedTeamDTO findGame(@PathVariable Long id) {
-        return gameListService.findGame(id);
-    }
-
     @GetMapping("/matchList")
     public List<MatchedTeamDTO> findGameList() {
         List<MatchedTeamDTO> games = gameListService.findGameList();
-        return games
+        return games;
+    }
 }

BE/src/main/java/com/example/baseball/controller/GameScoreController.java

@@ -1,9 +1,14 @@
 package com.example.baseball.controller;
 
-import com.example.baseball.dto.GameDTO;
+import com.example.baseball.dto.PlayGameDTO;
+import com.example.baseball.entity.InningStatus;
 import com.example.baseball.service.GameScoreService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController
 public class GameScoreController {
 
     private GameScoreService gameScoreService;
@@ -12,9 +17,20 @@ public GameScoreController(GameScoreService gameScoreService) {
         this.gameScoreService = gameScoreService;
     }
 
-    @GetMapping("/game/attack}")
-    public GameDTO showAttackScreen() {
-        GameDTO gameDTO = gameScoreService.findGameDTO();
-        return gameDTO;
+    @GetMapping("/game/attack/{inning}/{inningStatus}")
+    public PlayGameDTO showAttackScreen(@PathVariable Integer inning, @PathVariable String inningStatus) {
+        return gameScoreService.findAttackGameDTO(inning, inningStatus);
     }
+
+//    @GetMapping("/game/defense/{inning}/{inningStatus}")
+//    public GameDTO showDefenseScreen(@PathVariable Integer inning, @PathVariable String inningStatus) {
+//        return gameScoreService.findGameDTO(inning, inningStatus);
+//    }
+
+//    @PutMapping("/game/defense/{inning}/{inningStatus}")
+//    public GameDTO updatePitch(@PathVariable Integer inning, @PathVariable String inningStatus) {
+//        return gameScoreService.updatePitch(inning, inningStatus);
+//    }
+
+
 }

BE/src/main/java/com/example/baseball/dto/BallCountDTO.java

@@ -0,0 +1,38 @@
+package com.example.baseball.dto;
+
+import com.example.baseball.entity.BallCount;
+
+public class BallCountDTO {
+
+    private Long id;
+    private String playerName;
+    private String ball;
+    private Long gameId;
+
+    public BallCountDTO(Long id, String playerName, String ball, Long gameId) {
+        this.id = id;
+        this.playerName = playerName;
+        this.ball = ball;
+        this.gameId = gameId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    public String getBall() {
+        return ball;
+    }
+
+    public Long getGameId() {
+        return gameId;
+    }
+
+    public static BallCountDTO of(BallCount ballCount) {
+        return new BallCountDTO(ballCount.getId(), ballCount.getPlayerName(), ballCount.getBall().getStatus(),ballCount.getGameId());
+    }
+}

BE/src/main/java/com/example/baseball/dto/DetailPageDTO.java

@@ -1,22 +1,20 @@
 package com.example.baseball.dto;
 
-import com.example.baseball.entity.Score;
-
 import java.util.List;
 
 public class DetailPageDTO {
-    Score score;
+    GameScoreResponseDTO gameScoreResponseDTO;
     List<HalfInningGameResponseDTO> halfInningGameResponseDTOs;
     List<PlayerResponseDTO> playerResponseDTOS;
 
-    public DetailPageDTO(Score score, List<HalfInningGameResponseDTO> halfInningGameResponseDTOs, List<PlayerResponseDTO> playerResponseDTOS) {
-        this.score = score;
+    public DetailPageDTO(GameScoreResponseDTO gameScoreResponseDTO, List<HalfInningGameResponseDTO> halfInningGameResponseDTOs, List<PlayerResponseDTO> playerResponseDTOS) {
+        this.gameScoreResponseDTO = gameScoreResponseDTO;
         this.halfInningGameResponseDTOs = halfInningGameResponseDTOs;
         this.playerResponseDTOS = playerResponseDTOS;
     }
 
-    public Score getScore() {
-        return score;
+    public GameScoreResponseDTO getGameScoreResponseDTO() {
+        return gameScoreResponseDTO;
     }
 
     public List<HalfInningGameResponseDTO> getHalfInningGameResponseDTOs() {
@@ -27,14 +25,14 @@ public List<PlayerResponseDTO> getPlayerResponseDTOS() {
         return playerResponseDTOS;
     }
 
-    public DetailPageDTO of(Score score, List<HalfInningGameResponseDTO> halfInningGameResponseDTOs, List<PlayerResponseDTO> playerResponseDTOS) {
-        return new DetailPageDTO(score, halfInningGameResponseDTOs, playerResponseDTOS);
+    public DetailPageDTO of(GameScoreResponseDTO gameScoreResponseDTO, List<HalfInningGameResponseDTO> halfInningGameResponseDTOs, List<PlayerResponseDTO> playerResponseDTOS) {
+        return new DetailPageDTO(gameScoreResponseDTO, halfInningGameResponseDTOs, playerResponseDTOS);
     }
 
     @Override
     public String toString() {
         return "DetailPageDTO{" +
-                "score=" + score +
+                "gameScoreResponseDTO=" + gameScoreResponseDTO +
                 ", halfInningGameResponseDTOs=" + halfInningGameResponseDTOs +
                 ", playerResponseDTOS=" + playerResponseDTOS +
                 '}';

BE/src/main/java/com/example/baseball/dto/GameScoreResponseDTO.java

@@ -3,18 +3,24 @@
 import com.example.baseball.entity.Score;
 
 public class GameScoreResponseDTO {
+    private Long id;
     private String homeTeam;
     private String awayTeam;
-    private int homeScore;
-    private int awayScore;
+    private Integer homeScore;
+    private Integer awayScore;
 
-    public GameScoreResponseDTO(String homeTeam, String awayTeam, int homeScore, int awayScore) {
+    public GameScoreResponseDTO(Long id, String homeTeam, String awayTeam, Integer homeScore, Integer awayScore) {
+        this.id = id;
         this.homeTeam = homeTeam;
         this.awayTeam = awayTeam;
         this.homeScore = homeScore;
         this.awayScore = awayScore;
     }
 
+    public Long getId() {
+        return id;
+    }
+
     public String getHomeTeam() {
         return homeTeam;
     }
@@ -23,15 +29,15 @@ public String getAwayTeam() {
         return awayTeam;
     }
 
-    public int getHomeScore() {
+    public Integer getHomeScore() {
         return homeScore;
     }
 
-    public int getAwayScore() {
+    public Integer getAwayScore() {
         return awayScore;
     }
 
     public static GameScoreResponseDTO of(Score score) {
-        return new GameScoreResponseDTO(score.getHomeTeam(), score.getAwayTeam(), score.getHomeScore(), score.getAwayScore());
+        return new GameScoreResponseDTO(score.getId(), score.getHomeTeam(), score.getAwayTeam(), score.getHomeScore(), score.getAwayScore());
     }
 }

BE/src/main/java/com/example/baseball/dto/HalfInningGameResponseDTO.java

@@ -1,27 +1,32 @@
 package com.example.baseball.dto;
 
-import com.example.baseball.entity.BallCount;
 import com.example.baseball.entity.Game;
-import com.example.baseball.entity.InningStatus;
 
 public class HalfInningGameResponseDTO {
 
+    private Long id;
+
     private String homeTeam;
     private String awayTeam;
     private Integer homeScore;
     private Integer awayScore;
     private Integer inning;
-    private InningStatus status; //Enum으로 관리
-    private BallCount ballCount;
+    private String inningStatus; //Enum으로 관리
+    private Long scoreId;
 
-    public HalfInningGameResponseDTO(String homeTeam, String awayTeam, Integer homeScore, Integer awayScore, Integer inning, InningStatus status, BallCount ballCount) {
+    public HalfInningGameResponseDTO(Long id, String homeTeam, String awayTeam, Integer homeScore, Integer awayScore, Integer inning, String inningStatus, Long scoreId) {
+        this.id = id;
         this.homeTeam = homeTeam;
         this.awayTeam = awayTeam;
         this.homeScore = homeScore;
         this.awayScore = awayScore;
         this.inning = inning;
-        this.status = status;
-        this.ballCount = ballCount;
+        this.inningStatus = inningStatus;
+        this.scoreId = scoreId;
+    }
+
+    public Long getId() {
+        return id;
     }
 
     public String getHomeTeam() {
@@ -44,24 +49,24 @@ public Integer getInning() {
         return inning;
     }
 
-    public InningStatus getStatus() {
-        return status;
+    public String getInningStatus() {
+        return inningStatus;
     }
 
-    public BallCount getBallCount() {
-        return ballCount;
+    public Long getScoreId() {
+        return scoreId;
     }
 
-
     public static HalfInningGameResponseDTO of(Game game) {
         return new HalfInningGameResponseDTO(
+                game.getId(),
                 game.getHomeTeam(),
                 game.getAwayTeam(),
                 game.getHomeScore(),
                 game.getAwayScore(),
                 game.getInning(),
-                game.getStatus(),
-                game.getBallCount()
+                game.getInningStatus().getStatus(),
+                game.getScoreId()
         );
     }
 }

BE/src/main/java/com/example/baseball/dto/MatchedTeamDTO.java

@@ -1,10 +1,9 @@
 package com.example.baseball.dto;
 
 import com.example.baseball.entity.Game;
-import org.springframework.data.annotation.Id;
+import com.example.baseball.entity.Score;
 
 public class MatchedTeamDTO {
-    @Id
     private Long id;
 
     private String homeTeam;
@@ -28,8 +27,8 @@ public String getAwayTeam() {
         return awayTeam;
     }
 
-    public static MatchedTeamDTO of(Game game) {
-        return new MatchedTeamDTO(game.getId(), game.getHomeTeam(), game.getAwayTeam());
+    public static MatchedTeamDTO of(Score score) {
+        return new MatchedTeamDTO(score.getId(), score.getHomeTeam(), score.getAwayTeam());
     }
 
 }

BE/src/main/java/com/example/baseball/dto/PlayGameDTO.java

@@ -0,0 +1,34 @@
+package com.example.baseball.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PlayGameDTO {
+    private GameScoreResponseDTO gameScoreResponseDTO;
+    private HalfInningGameResponseDTO halfInningGameResponseDTO;
+    private List<PlayerResponseDTO> players = new ArrayList<>(2); //0 :투수, 1 :타자
+    private List<BallCountDTO> ballCounts;
+
+    public PlayGameDTO(GameScoreResponseDTO gameScoreResponseDTO, HalfInningGameResponseDTO halfInningGameResponseDTO, List<PlayerResponseDTO> players, List<BallCountDTO> ballCounts) {
+        this.gameScoreResponseDTO = gameScoreResponseDTO;
+        this.halfInningGameResponseDTO = halfInningGameResponseDTO;
+        this.players = players;
+        this.ballCounts = ballCounts;
+    }
+
+    public GameScoreResponseDTO getGameScoreResponseDTO() {
+        return gameScoreResponseDTO;
+    }
+
+    public HalfInningGameResponseDTO getHalfInningGameResponseDTO() {
+        return halfInningGameResponseDTO;
+    }
+
+    public List<PlayerResponseDTO> getPlayers() {
+        return players;
+    }
+
+    public List<BallCountDTO> getBallCounts() {
+        return ballCounts;
+    }
+}