[NL-87] : 미비점 보안 (#62)

* [NL-87] : 로또 번호 받을 시 Home에서 갱신하도록 수정

* [NL-87] : Fortune Network Error 처리 + 다시 시도

Author: GomHyeok

Common/Base/Sources/BaseViewController.swift

@@ -8,6 +8,7 @@
 import Combine
 import SnapKit
 import UIKit
+import DesignSystem
 
 open class BaseViewController: UIViewController {
 
@@ -27,12 +28,17 @@ open class BaseViewController: UIViewController {
     $0.hidesWhenStopped = true
   }
 
+  private lazy var errorPopup = PopUp(style: .one).then {
+    $0.isHidden = true
+  }
+  
   public override var title: String? {
     get { navigationBar.title }
     set { navigationBar.title = newValue }
   }
   private var navigationAreaHeight: Constraint?
   public var cancellables = Set<AnyCancellable>()
+  private var errorPopupCancellables = Set<AnyCancellable>()
 
   open override func viewDidLoad() {
     super.viewDidLoad()
@@ -49,6 +55,12 @@ open class BaseViewController: UIViewController {
     activityIndicator.snp.makeConstraints { make in
       make.center.equalToSuperview()
     }
+    
+    view.addSubview(errorPopup)
+    errorPopup.snp.makeConstraints { make in
+      make.centerX.centerY.equalToSuperview()
+      make.leading.trailing.equalToSuperview().inset(24)
+    }
   }
 
   open override func viewDidLayoutSubviews() {
@@ -115,3 +127,23 @@ extension BaseViewController {
     activityIndicator.stopAnimating()
   }
 }
+
+extension BaseViewController {
+  public func showErrorPopup( action: @escaping () -> Void) {
+    errorPopup.update(
+      titile: "문제가 발생하였소", description: "잠시 후 다시 시도해 주시오.", actionButtonTitle: "확인")
+    errorPopup.update(style: .one)
+    errorPopup.isHidden = false
+    
+    view.bringSubviewToFront(errorPopup)
+    
+    errorPopupCancellables.removeAll()
+    
+    errorPopup.actionButton.tapPublisher
+      .sink { _ in
+        action()
+        self.errorPopup.isHidden = true
+      }
+      .store(in: &errorPopupCancellables)
+  }
+}

Feature/Fortune/Sources/FortuneViewController.swift

@@ -21,7 +21,6 @@ enum FortuneSection {
 public final class FortuneViewController: BaseViewController {
 
   private let viewModel: FortuneViewModel
-  private var store: Set<AnyCancellable> = Set<AnyCancellable>()
 
   private lazy var ellips = UIImageView().then {
     $0.image = STImages.ellipseBackground.image.withRenderingMode(.alwaysTemplate)
@@ -184,7 +183,7 @@ extension FortuneViewController {
         guard let self else { return }
         self.collectionView.reloadData()
       }
-      .store(in: &store)
+      .store(in: &cancellables)
 
     viewModel.output.isLoading
       .receive(on: DispatchQueue.main)
@@ -196,7 +195,15 @@ extension FortuneViewController {
           self.hideLoading()
         }
       }
-      .store(in: &store)
+      .store(in: &cancellables)
+    
+    viewModel.output.showError
+      .receive(on: DispatchQueue.main)
+      .sink { [weak self] retryAction in
+        guard let self else { return }
+        self.showErrorPopup(action: retryAction)
+      }
+      .store(in: &cancellables)
   }
 }
 

Feature/Fortune/Sources/FourtuneViewModel.swift

@@ -18,6 +18,7 @@ public final class FortuneViewModel {
   struct Output {
     let sections = CurrentValueSubject<[FortuneSection], Never>([])
     let isLoading = PassthroughSubject<Bool, Never>()
+    let showError = PassthroughSubject<()->Void, Never>()
   }
 
   @Injected private var fortuneService: FortuneService
@@ -53,7 +54,12 @@ extension FortuneViewModel {
         self.output.sections.send(sections)
         output.isLoading.send(false)
       } catch {
-        // TODO: 에러 처리
+        output.isLoading.send(false)
+        output.showError.send { [weak self] in
+          guard let self else { return }
+          self.fetchUser()
+          
+        }
       }
     }
   }

Feature/Home/Sources/Home/HomeViewModel.swift

@@ -39,6 +39,14 @@ public final class HomeViewModel {
         fetchUser()
       }
       .store(in: &cancellables)
+    
+    RecommendationDetailService
+      .getPublisher()
+      .sink { [weak self] _ in
+        guard let self = self else { return }
+        fetchUser()
+      }
+      .store(in: &cancellables)
   }
 
   func send(input: Input) {

Feature/Home/Sources/RecommendationDetail/RecommendationDetailService.swift

@@ -9,11 +9,15 @@ import Auth
 import DIInjector
 import Foundation
 import NetworkCore
+import Combine
 
 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 {
@@ -26,6 +30,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()
     return try makeSections(from: lottoRecommendation)
   }
 
@@ -88,4 +93,9 @@ final class RecommendationDetailService {
       ),
     ]
   }
+  
+  public static func getPublisher() -> AnyPublisher<Void, Never> {
+    RecommendationDetailService.recommentPublisher
+      .eraseToAnyPublisher()
+  }
 }