[NL-79]: 미비점 수정 (#63)

* [NL-79]: 신규 번호 추천 시 홈에서 추천 번호 조회 API 만 호출하도록 수정

* [NL-79]: 당첨 결과 확인 후 홈 화면 번호 재조회

* [NL-79]: 웹뷰 로딩 인디케이터 추가

Author: TTOzzi

Feature/History/Sources/HistoryWebViewController.swift

@@ -51,25 +51,41 @@ public final class HistoryWebViewController: BaseViewController {
     viewModel.output.loadURL
       .receive(on: DispatchQueue.main)
       .sink { [weak self] request in
+        self?.showLoading()
         self?.webView.load(request)
       }
       .store(in: &cancellables)
   }
 }
 
 extension HistoryWebViewController: WKNavigationDelegate {
+  public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+    // TODO: 뷰모델로 분리
+    hideLoading()
+  }
+  
   public func webView(
     _ webView: WKWebView, didFail navigation: WKNavigation!, withError error: any Error
   ) {
-    print(error)
+    // TODO: 뷰모델로 분리
+    hideLoading()
     // TODO: 에러 처리
+    print(error)
   }
 
   public func webView(
     _ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!,
     withError error: any Error
   ) {
+    // TODO: 뷰모델로 분리
+    hideLoading()
+    // TODO: 에러 처리
     print(error)
+  }
+  
+  public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
+    // TODO: 뷰모델로 분리
+    hideLoading()
     // TODO: 에러 처리
   }
 }

Feature/Home/Sources/Home/HomeService.swift

@@ -6,6 +6,7 @@
 //
 
 import Auth
+import Combine
 import DIInjector
 import Foundation
 import NetworkCore
@@ -17,10 +18,15 @@ final class HomeService {
   private var appVersion: String? {
     Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
   }
-  var round: Int?
+  private var cachedDailyFortunes: DailyFortunesDTO?
+  private(set) var round: Int?
+  var recommendationStateChanged: AnyPublisher<Void, Never> {
+    NotificationCenter.default.publisher(for: .recommendationStateChanged)
+      .map { _ in Void() }
+      .eraseToAnyPublisher()
+  }
 
   func fetch() async throws -> [any HomeCellModel] {
-    let name = self.userDataManager.user?.name ?? ""  // TODO: 확인 필요
     let getLottoRecommendationTarget = HomeTarget.GetLottoRecommendation(
       userID: userDataManager.userID)
     async let lottoRecommendationRequest = networkProvider.request(
@@ -31,8 +37,39 @@ final class HomeService {
       lottoRecommendationRequest, dailyFortunesRequest
     )
     self.round = lottoRecommendation.round
+    self.cachedDailyFortunes = dailyFortunes
 
-    let recommendationCollectionViewCellModel: HomeRecommendationCollectionViewCellModel
+    return [
+      makeHeader(round: lottoRecommendation.round, message: dailyFortunes.title),
+      makeRecommendation(lottoRecommendation),
+      makeTodayFortune(dailyFortunes),
+    ]
+  }
+  
+  func fetchLottoRecommendation() async throws -> [any HomeCellModel] {
+    guard let cachedDailyFortunes else {
+      return try await fetch()
+    }
+    let getLottoRecommendationTarget = HomeTarget.GetLottoRecommendation(
+      userID: userDataManager.userID)
+    let lottoRecommendation = try await networkProvider.request(target: getLottoRecommendationTarget)
+    round = lottoRecommendation.round
+    return [
+      makeHeader(round: lottoRecommendation.round, message: cachedDailyFortunes.title),
+      makeRecommendation(lottoRecommendation),
+      makeTodayFortune(cachedDailyFortunes),
+    ]
+  }
+  
+  private func makeHeader(round: Int, message: String?) -> HomeHeaderCollectionViewCellModel {
+    return HomeHeaderCollectionViewCellModel(
+      roundText: "\(round)회",
+      message: message ?? "잘 되면 꼭 기억해 주시오"
+    )
+  }
+  
+  private func makeRecommendation(_ lottoRecommendation: LottoRecommendationDTO) -> HomeRecommendationCollectionViewCellModel {
+    let name = self.userDataManager.user?.name ?? ""  // TODO: 확인 필요
     if let recommendationContent = lottoRecommendation.content {
       let numbers = [
         recommendationContent.num1,
@@ -42,33 +79,28 @@ final class HomeService {
         recommendationContent.num5,
         recommendationContent.num6,
       ].sorted()
-      recommendationCollectionViewCellModel = HomeRecommendationCollectionViewCellModel(
+      return HomeRecommendationCollectionViewCellModel(
         title: "\(name)님을 위한 로또 번호 추천",
-        state: lottoRecommendation.isFinished
-          ? .needsResultCheck(numbers: numbers) : .recommended(numbers: numbers)
+//        state: lottoRecommendation.isFinished
+//          ? .needsResultCheck(numbers: numbers) : .recommended(numbers: numbers)
+        state: .needsResultCheck(numbers: numbers)
       )
     } else {
-      recommendationCollectionViewCellModel = HomeRecommendationCollectionViewCellModel(
+      return HomeRecommendationCollectionViewCellModel(
         title: "\(name)님을 위한 로또 번호 추천",
         state: .needsRecommendation
       )
     }
-
+  }
+  
+  private func makeTodayFortune(_ dailyFortunes: DailyFortunesDTO) -> HomeTodayFortuneCollectionViewCellModel {
     let homeTodayFortuneCollectionViewCellModels = dailyFortunes.content.map { item in
       FortuneItemCollectionViewCellModel(
         title: item.fortuneType,
         imageURL: item.imageURL,
         message: item.description
       )
     }
-
-    return [
-      HomeHeaderCollectionViewCellModel(
-        roundText: "\(lottoRecommendation.round)회",
-        message: dailyFortunes.title ?? "잘 되면 꼭 기억해 주시오"
-      ),
-      recommendationCollectionViewCellModel,
-      HomeTodayFortuneCollectionViewCellModel(items: homeTodayFortuneCollectionViewCellModels),
-    ]
+    return HomeTodayFortuneCollectionViewCellModel(items: homeTodayFortuneCollectionViewCellModels)
   }
 }

Feature/Home/Sources/Home/HomeViewModel.swift

@@ -36,23 +36,23 @@ public final class HomeViewModel {
       .getPublisher()
       .sink { [weak self] _ in
         guard let self = self else { return }
-        fetchUser()
+        fetch()
       }
       .store(in: &cancellables)
 
-    RecommendationDetailService
-      .getPublisher()
+    homeService
+      .recommendationStateChanged
       .sink { [weak self] _ in
         guard let self = self else { return }
-        fetchUser()
+        fetchRecommendation()
       }
       .store(in: &cancellables)
   }
 
   func send(input: Input) {
     switch input {
     case .viewDidLoad:
-      fetchUser()
+      fetch()
 
     case .recommendationButtonTapped(let state):
       switch state {
@@ -81,8 +81,8 @@ public final class HomeViewModel {
   }
 }
 
-extension HomeViewModel {
-  func fetchUser() {
+private extension HomeViewModel {
+  func fetch() {
     output.isLoading.send(true)
     Task {
       do {
@@ -95,4 +95,18 @@ extension HomeViewModel {
       output.isLoading.send(false)
     }
   }
+  
+  func fetchRecommendation() {
+    output.isLoading.send(true)
+    Task {
+      do {
+        let sections = try await homeService.fetchLottoRecommendation()
+        output.sections.send(sections)
+      } catch {
+        // TODO: 에러 처리
+        print(error)
+      }
+      output.isLoading.send(false)
+    }
+  }
 }

Feature/Home/Sources/HomeNotifications.swift

@@ -0,0 +1,12 @@
+//
+//  HomeNotifications.swift
+//  Home
+//
+//  Created by ttozzi on 8/20/25.
+//
+
+import Foundation
+
+extension Notification.Name {
+  static let recommendationStateChanged = Notification.Name("recommendationStateChanged")
+}

Feature/Home/Sources/LottoResult/LottoResultService.swift

@@ -25,6 +25,7 @@ struct LottoResultService {
   func fetch(round: Int) async throws -> Response {
     let target = HomeTarget.CheckLottoResult(userID: userDataManager.userID, round: round)
     let lottoResult = try await networkProvider.request(target: target)
+    NotificationCenter.default.post(name: .recommendationStateChanged, object: nil)
 
     let rankTitle =
       if let rank = lottoResult.rank {

Feature/Home/Sources/RecommendationDetail/RecommendationDetailService.swift

@@ -16,8 +16,6 @@ final class RecommendationDetailService {
   @Injected private var userDataManager: UserDataManager
   @Injected private var networkProvider: NetworkProvider
 
-  private static var recommentPublisher = PassthroughSubject<Void, Never>()
-
   private var username: String? { userDataManager.user?.name }
   var navigationTitle: String {
     guard let username else {
@@ -30,7 +28,7 @@ final class RecommendationDetailService {
   func createRecommendation() async throws -> [any RecommendationDetailCellModel] {
     let target = HomeTarget.CreateLottoRecommendation(userID: userDataManager.userID)
     let lottoRecommendation = try await networkProvider.request(target: target)
-    RecommendationDetailService.recommentPublisher.send()
+    NotificationCenter.default.post(name: .recommendationStateChanged, object: nil)
     return try makeSections(from: lottoRecommendation)
   }
 
@@ -93,9 +91,4 @@ final class RecommendationDetailService {
       ),
     ]
   }
-
-  public static func getPublisher() -> AnyPublisher<Void, Never> {
-    RecommendationDetailService.recommentPublisher
-      .eraseToAnyPublisher()
-  }
 }