[Team09 - 쑤 & 쏭] 게임 진행 화면 구현 (Data binding & CALayer 추가)

iOS/BaseballApp/BaseballApp/Controllers/LobbyViewController.swift

@@ -11,23 +11,34 @@ import Combine
 class LobbyViewController: UIViewController {
 
     @IBOutlet weak var roomsTableView: UITableView!
-    var viewModel: RoomsViewModel?
-    var cancelBag = Set<AnyCancellable>()
+    var viewModel: RoomsViewModel!
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        roomsTableView.dataSource = self
 
         viewModel = RoomsViewModel()
-        bind()
+        viewModel.load {
+            DispatchQueue.main.async {
+                self.roomsTableView.reloadData()
+            }
+        }
+    }
+
+}
+
+extension LobbyViewController: UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return viewModel.rooms.data.count
     }
 
-    func bind() {
-        viewModel?.$rooms
-            .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { [weak self] _ in
-                self?.roomsTableView.reloadData()
-            })
-            .store(in: &self.cancelBag)
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: RoomTableViewCell.identifier, for: indexPath) as? RoomTableViewCell else {
+            return UITableViewCell()
+        }
+
+        let data = viewModel.rooms.data[indexPath.row]
+        cell.fill(data: data)
+        return cell
     }
 }
-

iOS/BaseballApp/BaseballApp/Controllers/PlayViewController.swift

@@ -18,11 +18,11 @@ class PlayViewController: UIViewController {
     @IBOutlet weak var playInformationStackView: UIStackView!
     @IBOutlet weak var scoreHeaderView: ScoreHeaderView!
 
-    var cancelBag = Set<AnyCancellable>()
+    var currentPlayerView: CurrentPlayerView!
     var count: Int = 0
-    var viewModel: GameViewModel? {
+    var viewModel: GameViewModel! {
         didSet {
-            count = viewModel?.game?.pitcherHistory.count ?? 0
+            count = viewModel?.game?.data.pitchHistories.count ?? 0
         }
     }
 
@@ -40,17 +40,16 @@ class PlayViewController: UIViewController {
 
         viewModel = GameViewModel()
         configureUI()
-    }
-
-    // MARK: - Private Functions
-    private func bind() {
-        viewModel?.$game
-            .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { [weak self] game in
-                self?.scoreHeaderView.configureAway(score: game?.away.score ?? 0)
-                self?.scoreHeaderView.configureHome(score: game?.home.score ?? 0)
-            })
-            .store(in: &self.cancelBag)
+        viewModel.load { game in
+            DispatchQueue.main.async { [weak self] in
+                self?.scoreHeaderView.configureAway(score: game.awayTeam.score)
+                self?.scoreHeaderView.configureHome(score: game.homeTeam.score)
+                self?.currentPlayerView.configure(batter: game.batter, status: game.batterStatus)
+                self?.currentPlayerView.configure(pitcher: game.pitcher, status: game.pitcherStatus)
+                self?.currentPlayerView.configure(playerRole: game.myRole)
+                self?.pitcherHistoryTableView.reloadData()
+            }
+        }
     }
 
     private func configureUI() {
@@ -62,7 +61,7 @@ class PlayViewController: UIViewController {
                                                                options: nil)?.first as? CurrentPlayerView else {
             return
         }
-
+        self.currentPlayerView = currentPlayerView
         playInformationStackView.addArrangedSubview(groundView)
         playInformationStackView.addArrangedSubview(currentPlayerView)
         playInformationStackView.addArrangedSubview(pitcherHistoryTableView)
@@ -79,12 +78,15 @@ class PlayViewController: UIViewController {
 
 extension PlayViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return viewModel?.game?.pitcherHistory.count ?? 0
+        return viewModel?.game?.data.pitchHistories.count ?? 0
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: PitcherRecordTableViewCell.identifier, for: indexPath) as! PitcherRecordTableViewCell
-        cell.backgroundColor = .systemRed
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: PitcherRecordTableViewCell.identifier, for: indexPath) as? PitcherRecordTableViewCell,
+              let record = viewModel.game?.data.pitchHistories[indexPath.row] else {
+            return UITableViewCell()
+        }
+        cell.configure(record: record)
         return cell
     }
 }

iOS/BaseballApp/BaseballApp/Entity/Game.swift

@@ -7,36 +7,69 @@
 
 import Foundation
 
+struct GameResponse: Decodable {
+    let data: Game
+}
+
 struct Game: Decodable {
-    let home: Team
-    let away: Team
     let strike: Int
     let ball: Int
     let out: Int
+    let awayTeam: Team
+    let homeTeam: Team
     let inning: String
-    let myRole: String
+    let halves: String
+    let pitcher: Player
+    let pitcherStatus: String
+    let batter: Player
+    let batterStatus: String
     let base1: String?
     let base2: String?
     let base3: String?
-    let pitcherHistory: [Record]
+    let pitchHistories: [Record]
+    let myRole: String
+
+    enum CodingKeys: String, CodingKey {
+        case strike, ball, out, inning, halves, pitcher, batter, base1, base2, base3
+        case awayTeam = "away_team"
+        case homeTeam = "home_team"
+        case pitcherStatus = "pitcher_status"
+        case batterStatus = "batter_status"
+        case pitchHistories = "pitch_histories"
+        case myRole = "my_role"
+    }
+}
+
+struct Player: Decodable {
+    let teamId: Int
+    let uniformNumber: Int
+    let name: String
+
+    enum CodingKeys: String, CodingKey {
+        case name
+        case teamId = "team_id"
+        case uniformNumber = "uniform_number"
+    }
 }
 
 struct Record: Decodable {
+    let pitcher: Player
+    let batter: Player
     let result: String
-    let pitchStrikeCount: String
+    let strikeCount: Int
+    let ballCount: Int
 
     enum CodingKeys: String, CodingKey {
-        case result
-        case pitchStrikeCount = "log"
+        case pitcher, batter, result
+        case strikeCount = "strike_count"
+        case ballCount = "ball_count"
     }
 }
 
 struct Team: Decodable {
     let name: String
     let score: Int
-    let position: String
-    let player: String
-    let playerStatus: String
+    let role: String
 }
 
 struct Scoreboard: Decodable {

iOS/BaseballApp/BaseballApp/Entity/Room.swift

@@ -8,13 +8,13 @@
 import Foundation
 
 struct RoomResponse: Decodable {
-    let rooms: [Room]
+    let data: [Room]
 }
 
 struct Room: Decodable {
     let id: Int
-    let number: String
-    let away: String
-    let home: String
-    let available: Bool
+    let awayTeam: String?
+    let homeTeam: String?
+    let awayUserEmail: String?
+    let homeUserEmail: String?
 }

iOS/BaseballApp/BaseballApp/Network/APIRequestManager.swift

@@ -9,41 +9,34 @@ import Foundation
 import Combine
 
 class APIRequestManager {
-    private var cancelBag = Set<AnyCancellable>()
 
     private func createRequest(url: URL, method: HTTPMethod, httpBody: Data? = nil) -> URLRequest {
         var request = URLRequest(url: url)
         request.httpMethod = method.rawValue
         request.httpBody = httpBody
         return request
     }
-    
-    func fetchRooms(url: URL, method: HTTPMethod, httpBody: Data? = nil) {
+
+    func fetch<T: Decodable>(url: URL, method: HTTPMethod, httpBody: Data? = nil) -> AnyPublisher<T, Error> {
         let request = createRequest(url: url, method: method)
-        URLSession.shared.dataTaskPublisher(for: request)
+        return URLSession.shared.dataTaskPublisher(for: request)
             .map(\.data)
-            .decode(type: RoomResponse.self, decoder: JSONDecoder())
-            .replaceError(with: RoomResponse(rooms: []))
-            .assign(to: \.rooms, on: RoomsViewModel())
-            .store(in: &self.cancelBag)
-    }
-
-    func fetchGame(url: URL, method: HTTPMethod, httpBody: Data? = nil) {
-        let request = createRequest(url: url, method: method)
-        URLSession.shared.dataTaskPublisher(for: request)
-            .map(\.data)
-            .decode(type: Game?.self, decoder: JSONDecoder())
-            .replaceError(with: nil)
-            .assign(to: \.game, on: GameViewModel())
-            .store(in: &self.cancelBag)
+            .decode(type: T.self, decoder: JSONDecoder())
+            .eraseToAnyPublisher()
     }
 }
 
 struct Endpoint {
+    enum Path {
+        static let gameList = "/game/list"
+        static let gameStatus = "/game/status"
+    }
+
     static func url(path: String) -> URL? {
         var components = URLComponents()
-        components.scheme = "https"
-        components.host = "api.github.com"
+        components.scheme = "http"
+        components.host = "52.78.19.43"
+        components.port = 8080
         components.path = path
         return components.url
     }

iOS/BaseballApp/BaseballApp/UseCases/GameUseCase.swift

@@ -6,11 +6,12 @@
 //
 
 import Foundation
+import Combine
 
 class GameUseCase {
     let apiRequestManager = APIRequestManager()
 
-    func start(url: URL) {
-        apiRequestManager.fetchGame(url: url, method: .get)
+    func start(url: URL) -> AnyPublisher<GameResponse, Error> {
+        return apiRequestManager.fetch(url: url, method: .get)
     }
 }

iOS/BaseballApp/BaseballApp/UseCases/RoomsUseCase.swift

@@ -6,11 +6,12 @@
 //
 
 import Foundation
+import Combine
 
 class RoomsUseCase {
     let apiRequestManager = APIRequestManager()
 
-    func start(url: URL) {
-        apiRequestManager.fetchRooms(url: url, method: .get)
+    func start(url: URL) -> AnyPublisher<RoomResponse, Error> {
+        return apiRequestManager.fetch(url: url, method: .get)
     }
 }

iOS/BaseballApp/BaseballApp/ViewModel/GameViewModel.swift

@@ -6,22 +6,27 @@
 //
 
 import Foundation
+import Combine
 
 class GameViewModel {
-    @Published var game: Game?
-
+    @Published var game: GameResponse?
     let gameUseCase = GameUseCase()
+    var cancelBag = Set<AnyCancellable>()
 
-    func load() {
-        guard let url = Endpoint.url(path: "/room/playInfo") else { return }
-        gameUseCase.start(url: url)
-    }
-
-    func getAwayScore() -> Int {
-        return game?.away.score ?? 0
-    }
-
-    func getHomeScore() -> Int {
-        return game?.home.score ?? 0
+    func load(completionHandler: @escaping (Game) -> Void) {
+        guard let url = Endpoint.url(path: Endpoint.Path.gameStatus) else { return }
+        let publisher = gameUseCase.start(url: url)
+        publisher.sink { (completion) in
+            switch completion {
+            case .finished:
+                break
+            case .failure(let error):
+                print(error.localizedDescription)
+            }
+        } receiveValue: { (response) in
+            self.game = response
+            completionHandler(response.data)
+        }
+        .store(in: &cancelBag)
     }
 }

iOS/BaseballApp/BaseballApp/ViewModel/RoomsViewModel.swift

@@ -6,13 +6,26 @@
 //
 
 import Foundation
+import Combine
 
 class RoomsViewModel {
-    @Published var rooms: RoomResponse = RoomResponse(rooms: [])
+    @Published var rooms: RoomResponse = RoomResponse(data: [])
+    var cancelBag = Set<AnyCancellable>()
     let roomsUseCase = RoomsUseCase()
-
-    func load() {
-        guard let url = Endpoint.url(path: "/room/list") else { return }
-        roomsUseCase.start(url: url)
+
+    func load(completionHandler: @escaping () -> Void) {
+        guard let url = Endpoint.url(path: Endpoint.Path.gameList) else { return }
+        let publisher = roomsUseCase.start(url: url)
+        publisher.sink { (completion) in
+            switch completion {
+            case .finished:
+                completionHandler()
+            case .failure(let error):
+                print(error.localizedDescription)
+            }
+        } receiveValue: { (response) in
+            self.rooms = response
+        }
+        .store(in: &cancelBag)
     }
 }

iOS/BaseballApp/BaseballApp/Views/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="z87-J8-Gpn">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="z87-J8-Gpn">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -30,7 +30,7 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="RoomTableViewCell" rowHeight="128" id="6g6-nx-YgT" customClass="RoomTableViewCell" customModule="BaseballApp" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="24.5" width="414" height="128"/>
+                                        <rect key="frame" x="0.0" y="28" width="414" height="128"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6g6-nx-YgT" id="cIk-9u-0ic">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>