[NL-95] : 정보 삭제 추가 (#69)

* [NL-95] : 정보 삭제 기능 추가

* [NL-95] : HomeView, Mypage Error 처리

* [NL-95] : Home에서 result check 이후 다시 recommend 받을 수 있도록 수정

* [NL-95] : uuid 삭제시 기존 uuid 남아있는 문제 해결

* [NL-95] : Loading Indicator 추가

Author: GomHyeok

App/Sources/AppDependencyHandler.swift

@@ -13,6 +13,7 @@ import Home
 import Lib
 import Setting
 import UIKit
+import Onboarding
 
 struct AppDependencyHandler: DependencyRegistrable {
   func register(to dependencyHandler: DependencyHandler) {
@@ -21,6 +22,12 @@ struct AppDependencyHandler: DependencyRegistrable {
         self.configureTabBarController()
       }
     }
+    
+    dependencyHandler.register(key: DependencyKey.App.moveToSplashViewController) {
+      Task { @MainActor in
+        self.moveToSplashViewController()
+      }
+    }
   }
 
   private func configureTabBarController() {
@@ -38,8 +45,18 @@ struct AppDependencyHandler: DependencyRegistrable {
     ]
     UIApplication.shared.activeWindow?.rootViewController = tabBarController
   }
+  
+  private func moveToSplashViewController() {
+    let router = OnboardingRouter()
+    let splashViewController = SplashViewcontroller(viewModel: SplashViewModel(), router: router)
+
+    let navigationController = UINavigationController(rootViewController: splashViewController)
+
+    UIApplication.shared.activeWindow?.rootViewController = navigationController
+  }
 }
 
+
 extension UIApplication {
   fileprivate var activeWindow: UIWindow? {
     return

Common/Auth/Sources/DeviceUUIDManager.swift

@@ -33,7 +33,7 @@ final class DeviceUUIDManager {
     return newUUID
   }
 
-  func deleteUUID() {
+  func deleteUUID() throws {
     try? KeyChainService.remove(forKey: Constant.uuidKey)
   }
 }

Common/Auth/Sources/UserDataManager.swift

@@ -66,6 +66,15 @@ public final class UserDataManager {
       throw error
     }
   }
+  
+  public func delete() async throws {
+    do {
+      try deviceUUIDManager.deleteUUID()
+      user = nil
+    } catch {
+      throw error
+    }
+  }
 
   public func getPublisher() -> AnyPublisher<Void, Never> {
     userPublisher

Common/Base/Sources/BaseViewController.swift

@@ -130,8 +130,7 @@ extension BaseViewController {
 
 extension BaseViewController {
   public func showErrorPopup(action: @escaping () -> Void) {
-    errorPopup.update(
-      titile: "문제가 발생하였소", description: "잠시 후 다시 시도해 주시오.", actionButtonTitle: "확인")
+    errorPopup.update(popUpModel: PopUpModel(title: "문제가 발생하였소", description: "잠시 후 다시 시도해 주시오.", actionButtonTitle: "확인", outButtonTitle: "취소"))
     errorPopup.update(style: .one)
     errorPopup.isHidden = false
 

Common/Base/Sources/empty.swift

@@ -11,5 +11,6 @@ public enum DependencyKey {
 
   public enum App {
     public static let configureTabBarController = "configureTabBarController"
+    public static let moveToSplashViewController = "moveToSplashViewController"
   }
 }

Common/Lib/Sources/Router/DependencyKey.swift

@@ -9,6 +9,27 @@ import SnapKit
 import Then
 import UIKit
 
+public struct PopUpModel {
+  let title: String
+  let description: String?
+  let actionButtonTitle: String
+  let outButtonTitle: String
+  
+  public init(title: String, description: String?, actionButtonTitle: String, outButtonTitle: String) {
+    self.title = title
+    self.description = description
+    self.actionButtonTitle = actionButtonTitle
+    self.outButtonTitle = outButtonTitle
+  }
+  
+  public init(title: String, actionButtonTitle: String, outButtonTitle: String) {
+    self.title = title
+    self.description = nil
+    self.actionButtonTitle = actionButtonTitle
+    self.outButtonTitle = outButtonTitle
+  }
+}
+
 public final class PopUp: UIView {
 
   public enum Style: CaseIterable {
@@ -29,7 +50,7 @@ public final class PopUp: UIView {
     $0.alignment = .center
   }
 
-  private(set) lazy var deleteButton = UIButton().then {
+  public private(set) lazy var deleteButton = UIButton().then {
     $0.setImage(STImages.xMark.image, for: .normal)
   }
 
@@ -111,17 +132,14 @@ public final class PopUp: UIView {
     }
   }
 
-  public func update(
-    titile: String, description: String? = nil, actionButtonTitle: String,
-    outButtonTitle: String = "취소"
-  ) {
-    titleLabel.styledText = titile
-    descriptionLabel.styledText = description
+  public func update(popUpModel: PopUpModel) {
+    titleLabel.styledText = popUpModel.title
+    descriptionLabel.styledText = popUpModel.description
     let style = Typography.Body_16_B
     style.color = STColors.white.color
-    actionButton.setAttributedTitle(actionButtonTitle.set(style: style), for: .normal)
+    actionButton.setAttributedTitle(popUpModel.actionButtonTitle.set(style: style), for: .normal)
     style.color = STColors.gray1.color
-    outButton.setAttributedTitle(outButtonTitle.set(style: style), for: .normal)
+    outButton.setAttributedTitle(popUpModel.outButtonTitle.set(style: style), for: .normal)
   }
 
   public func update(style: Style) {
@@ -139,13 +157,12 @@ public final class PopUp: UIView {
   }
 
   let popup = PopUp().then {
-    $0.update(titile: "제목", description: "설명 텍스트입니다.", actionButtonTitle: "확인")
+    $0.update(popUpModel : PopUpModel(title: "제목", description: "설명 텍스트입니다.", actionButtonTitle: "확인", outButtonTitle: "취소"))
     $0.update(style: .one)
   }
 
   let popupTwo = PopUp().then {
-    $0.update(
-      titile: "제목", description: "설명 \n텍스트입니다.", actionButtonTitle: "확인", outButtonTitle: "취소")
+    $0.update(popUpModel : PopUpModel(title: "제목", description: "설명 텍스트입니다.", actionButtonTitle: "확인", outButtonTitle: "취소"))
     $0.update(style: .two)
   }
 

DesignSystem/DesignSystem/Sources/PopUp.swift

@@ -87,6 +87,14 @@ public final class HomeViewController: BaseViewController {
         self?.collectionView.reloadData()
       }
       .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)
   }
 
   private func createLayout() -> UICollectionViewCompositionalLayout {

Feature/Home/Sources/Home/HomeViewController.swift

@@ -22,6 +22,7 @@ public final class HomeViewModel {
   struct Output {
     let isLoading = CurrentValueSubject<Bool, Never>(false)
     let sections = CurrentValueSubject<[any HomeCellModel], Never>([])
+    let showError = PassthroughSubject<()->Void, Never>()
   }
 
   @Injected var homeService: HomeService
@@ -76,6 +77,8 @@ public final class HomeViewModel {
             to: HomeRoute.lottoResult, how: .push(hidesBottomBarWhenPushed: true),
             with: ["round": homeService.round as Any])
         }
+        
+        fetchResult()
       }
     }
   }
@@ -89,8 +92,11 @@ extension HomeViewModel {
         let sections = try await homeService.fetch()
         output.sections.send(sections)
       } catch {
-        // TODO: 에러 처리
-        print(error)
+        output.isLoading.send(false)
+        output.showError.send {[weak self] in
+          guard let self else { return }
+          self.fetch()
+        }
       }
       output.isLoading.send(false)
     }
@@ -103,10 +109,28 @@ extension HomeViewModel {
         let sections = try await homeService.fetchLottoRecommendation()
         output.sections.send(sections)
       } catch {
-        // TODO: 에러 처리
-        print(error)
+        output.isLoading.send(false)
+        output.showError.send {[weak self] in
+          guard let self else { return }
+          self.fetchRecommendation()
+        }
       }
       output.isLoading.send(false)
     }
   }
+  
+  fileprivate func fetchResult() {
+    let name = userDataManager.user?.name ?? ""
+    var sections : [any HomeCellModel] = []
+    
+    output.sections.value.forEach { section in
+      if let _ = section as? HomeRecommendationCollectionViewCellModel {
+        sections.append(HomeRecommendationCollectionViewCellModel(title: "\(name)님을 위한 로또 번호 추천", state: .needsRecommendation))
+      } else {
+        sections.append(section)
+      }
+    }
+    
+    output.sections.send(sections)
+  }
 }

Feature/Home/Sources/Home/HomeViewModel.swift

@@ -152,6 +152,14 @@ final class LottoResultViewController: BaseViewController {
         }
       }
       .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)
 
     viewModel.output.back
       .receive(on: DispatchQueue.main)