박스오피스 앱 [STEP 4] Matthew, Kyle

BoxOffice/Controller/BoxOfficeDetailViewController.swift

@@ -0,0 +1,72 @@
+//
+//  BoxOfficeDetailViewController.swift
+//  BoxOffice
+//
+//  Created by Matthew on 3/8/24.
+//
+
+import UIKit
+
+final class BoxOfficeDetailViewController: UIViewController {
+    private let movieName: String
+    private let movieCode: String
+    private let movieManager: MovieManager
+    private let boxOfficeDetailView = BoxOfficeDetailView()
+
+    init(
+        movieName: String,
+        movieCode: String,
+        movieManager: MovieManager
+    ) {
+        self.movieName = movieName
+        self.movieCode = movieCode
+        self.movieManager = movieManager
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupView()
+        fetchBoxOfficeDetailData()
+    }
+}
+
+private extension BoxOfficeDetailViewController {
+    func setupView() {
+        LoadingIndicatorView.showLoading(in: self.boxOfficeDetailView)
+        view = boxOfficeDetailView
+        view.backgroundColor = .white
+        self.title = movieName
+    }
+
+    func fetchBoxOfficeDetailData() {
+        Task {
+            do {
+                try await fetchMoiveImageURL()
+                try await fetchMovieInfo()
+                try await setupMovieImage()
+            } catch {
+                print(error.localizedDescription)
+            }
+            LoadingIndicatorView.hideLoading(in: self.boxOfficeDetailView)
+        }
+    }
+
+    func fetchMovieInfo() async throws {
+        let data = try await movieManager.fetchMovieInfoResultData(code: movieCode)
+        self.boxOfficeDetailView.setupDetailView(data: data)
+    }
+
+    func fetchMoiveImageURL() async throws {
+        try await movieManager.fetchMoiveImageURL(movieName: movieName)
+    }
+
+    func setupMovieImage() async throws {
+        guard let data = try await movieManager.fetchImageData() else { return }
+        self.boxOfficeDetailView.setupImage(image: UIImage(data: data))
+    }
+}

BoxOffice/Controller/BoxOfficeViewController.swift

@@ -17,20 +17,9 @@ final class BoxOfficeViewController: UIViewController {
     }()
     private lazy var dataSource = BoxOfficeListDataSource(self.boxOfficeListView)
 
-//    init() {
-//        super.init(nibName: nil, bundle: nil)
-//    }
-//    
-//    required init?(coder: NSCoder) {
-//        fatalError("init(coder:) has not been implemented")
-//    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
-        boxOfficeListView.boxOfficeListDelegate = self
-        boxOfficeListView.delegate = self
-        boxOfficeListView.dataSource = dataSource
-        view = boxOfficeListView
+        setupBoxOfficeListView()
         setupBoxOfficeData()
     }
 }
@@ -40,13 +29,22 @@ private extension BoxOfficeViewController {
         self.title = Date.titleDateFormatter.string(from: date)
     }
 
+    func setupBoxOfficeListView() {
+        LoadingIndicatorView.showLoading(in: self.boxOfficeListView)
+        boxOfficeListView.boxOfficeListDelegate = self
+        boxOfficeListView.delegate = self
+        boxOfficeListView.dataSource = dataSource
+        view = boxOfficeListView
+    }
+
     func setupBoxOfficeData() {
-        movieManager.fetchBoxOfficeResultData(date: Date.movieDateToString) { result in
-            switch result {
-            case .success(let success):
-                self.reloadCollectionListData(result: success)
-            case .failure(let failure):
-                print("fetchBoxOfficeResultData 실패: \(failure)")
+        Task {
+            do {
+                let result = try await movieManager.fetchBoxOfficeResultData(date: Date.movieDateToString)
+                    self.reloadCollectionListData(result: result)
+                    LoadingIndicatorView.hideLoading(in: self.view)
+            } catch {
+                print(error.localizedDescription)
             }
         }
     }
@@ -60,27 +58,26 @@ private extension BoxOfficeViewController {
     }
 
     func updateBoxOfficeList() {
-        movieManager.fetchBoxOfficeResultData(date: Date.movieDateToString) { [weak self] result in
-            switch result {
-            case .success(let result):
-                DispatchQueue.main.async {
-                    self?.applyBoxOfficeList(result: result)
-                    guard
-                        let date = result.showRange.toDateFromRange()
-                    else {
-                        return
-                    }
-                    self?.configureNavigation(date: date)
+        Task {
+            do {
+                let result = try await self.movieManager.fetchBoxOfficeResultData(
+                    date: Date.movieDateToString
+                )
+                self.applyBoxOfficeList(result: result)
+                guard
+                    let date = result.showRange.toDateFromRange()
+                else {
+                    return
                 }
-            case .failure(let error):
+                self.configureNavigation(date: date)
+            } catch {
                 print(error.localizedDescription)
             }
         }
     }
 
     func reloadCollectionListData(result: BoxOfficeResult) {
         DispatchQueue.main.async {
-            self.boxOfficeListView.indicatorView.stopAnimating()
             self.configureNavigation(date: Date.yesterday)
             self.applyBoxOfficeList(result: result)
             self.boxOfficeListView.isScrollEnabled = true
@@ -90,7 +87,17 @@ private extension BoxOfficeViewController {
 
 extension BoxOfficeViewController: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        self.navigationController?.popViewController(animated: true)
+        guard 
+            let data = movieManager.setupBoxOfficeDetailData(for: indexPath.row)
+        else {
+            return
+        }
+        let detailViewController = BoxOfficeDetailViewController(
+            movieName: data.movieName,
+            movieCode: data.movieCode,
+            movieManager: movieManager
+        )
+        self.navigationController?.pushViewController(detailViewController, animated: true)
     }
 }
 

BoxOffice/Extension/Bundle+Extension.swift

@@ -8,8 +8,8 @@
 import Foundation
 
 extension Bundle {
-    var apiKey: String {
-        guard
+    var movieApiKey: String {
+        guard 
             let file = self.path(forResource: "Private", ofType: "plist"),
             let resource = NSDictionary(contentsOfFile: file),
             let key = resource["API_KEY"] as? String
@@ -18,4 +18,15 @@ extension Bundle {
         }
         return key
     }
+
+    var kakaoApiKey: String {
+        guard
+            let file = self.path(forResource: "Private", ofType: "plist"),
+            let resource = NSDictionary(contentsOfFile: file),
+            let key = resource["Kakao_API_KEY"] as? String
+        else {
+            return ""
+        }
+        return key
+    }
 }

BoxOffice/Extension/String+Extension.swift

@@ -9,9 +9,20 @@ import Foundation
 
 extension String {
     func toDateFromRange() -> Date? {
-        guard let result = self.split(separator: "~").last else { return nil }
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyyMMdd"
-        return dateFormatter.date(from: Self(result))
+        guard
+            let result = self.split(separator: "~").last
+        else {
+            return nil
+        }
+        return Date.movieDateFormatter.date(from: Self(result))
+    }
+
+    var makeDateFormat: String {
+        guard 
+            let date = Date.movieDateFormatter.date(from: self)
+        else {
+            return "-"
+        }
+        return Date.titleDateFormatter.string(from: date)
     }
 }

BoxOffice/Extension/URLSession+Extension.swift

@@ -8,15 +8,7 @@
 import Foundation
 
 extension URLSession: URLSessionProtocol {
-    func dataTask(
-        with url: URL,
-        completionHandler: @escaping @Sendable (Data?, URLResponse?, Error?) -> Void
-    ) -> URLSessionDataTaskProtocol {
-        return dataTask(
-            with: url,
-            completionHandler: completionHandler
-        ) as URLSessionDataTask
+    func requestData(with request: URLRequest) async throws -> (Data, URLResponse) {
+        return try await data(for: request)
     }
 }
-
-extension URLSessionDataTask: URLSessionDataTaskProtocol {}

BoxOffice/Model/Movie/Image/Document.swift

@@ -0,0 +1,28 @@
+//
+//  Document.swift
+//  BoxOffice
+//
+//  Created by 강창현 on 3/8/24.
+//
+
+struct Document: Codable {
+    let collection: String
+    let thumbnailURL: String
+    let imageURL: String
+    let width: Int
+    let height: Int
+    let displaySiteName: String
+    let docURL: String
+    let datetime: String
+
+    enum CodingKeys: String, CodingKey {
+        case collection
+        case thumbnailURL = "thumbnail_url"
+        case imageURL = "image_url"
+        case width
+        case height
+        case displaySiteName = "display_sitename"
+        case docURL = "doc_url"
+        case datetime
+    }
+}

BoxOffice/Model/Movie/Image/Meta.swift

@@ -0,0 +1,18 @@
+//
+//  Meta.swift
+//  BoxOffice
+//
+//  Created by 강창현 on 3/8/24.
+//
+
+struct Meta: Codable {
+    let totalCount: Int
+    let pageableCount: Int
+    let isEnd: Bool
+
+    enum CodingKeys: String, CodingKey {
+        case isEnd = "is_end"
+        case pageableCount = "pageable_count"
+        case totalCount = "total_count"
+    }
+}

BoxOffice/Model/Movie/Image/MovieImage.swift

@@ -0,0 +1,11 @@
+//
+//  MovieImage.swift
+//  BoxOffice
+//
+//  Created by 강창현 on 3/8/24.
+//
+
+struct MovieImage: Codable {
+    let meta: Meta
+    let documents: [Document]
+}