Merge pull request #196 from L-j-h-c/feature/#195-unregisteredWithdrawal

[Feat] #195 - 미등록 비활동 유저 회원탈퇴 처리
sopt-makers · Apr 20, 2023 · 3578d6b · 3578d6b
2 parents 319dcf6 + d06320b
commit 3578d6b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/...S/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift b/...S/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift
@@ -145,6 +145,7 @@ public final class AppMyPageVC: UIViewController, AppMyPageViewControllable {
         headerTitle: I18N.MyPage.etcSectionGroupTitle,
         subviews: [
             self.logoutListItem,
+            self.withDrawalListItem
         ],
         frame: self.view.frame
     )
@@ -280,7 +281,9 @@ extension AppMyPageVC {
         }
 
         self.withDrawalListItem.addTapGestureRecognizer {
-            let viewController = self.factory.makeWithdrawalVC().viewController
+            let viewController = self.factory.makeWithdrawalVC(
+                userType: self.userType
+            ).viewController
             self.navigationController?.pushViewController(viewController, animated: true)
         }
 

diff --git a/...S/Projects/Features/SettingFeature/Interface/Sources/SettingFeatureViewControllable.swift b/...S/Projects/Features/SettingFeature/Interface/Sources/SettingFeatureViewControllable.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2023 SOPT-iOS. All rights reserved.
 //
 
+import Core
+
 import BaseFeatureDependency
 
 public protocol SettingViewControllable: ViewControllable { }
@@ -18,13 +20,15 @@ public protocol PrivacyPolicyViewControllable: ViewControllable { }
 
 public protocol TermsOfServiceViewControllable: ViewControllable { }
 
-public protocol WithdrawalViewControllable: ViewControllable { }
+public protocol WithdrawalViewControllable: ViewControllable {
+    var userType: UserType { get set }
+}
 
 public protocol SettingFeatureViewBuildable {
     func makeSettingVC() -> SettingViewControllable
     func makeNicknameEditVC() -> NicknameEditViewControllable
     func makeSentenceEditVC() -> SentenceEditViewControllable
     func makePrivacyPolicyVC() -> PrivacyPolicyViewControllable
     func makeTermsOfServiceVC() -> TermsOfServiceViewControllable
-    func makeWithdrawalVC() -> WithdrawalViewControllable
+    func makeWithdrawalVC(userType: UserType) -> WithdrawalViewControllable
 }
diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/SettingVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/SettingVC.swift
@@ -156,7 +156,7 @@ extension SettingVC {
 
 extension SettingVC: WithdrawButtonDelegate {
     func withdrawButtonTapped() {
-        let withdrawalVC = factory.makeWithdrawalVC().viewController
+        let withdrawalVC = factory.makeWithdrawalVC(userType: .visitor).viewController
         navigationController?.pushViewController(withdrawalVC, animated: true)
     }
 }

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/WithdrawalVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/WithdrawalVC.swift
@@ -9,6 +9,7 @@
 import UIKit
 import DSKit
 import SafariServices
+import Combine
 
 import Core
 
@@ -23,6 +24,7 @@ public class WithdrawalVC: UIViewController, WithdrawalViewControllable {
     public var viewModel: WithdrawalViewModel!
     public var factory: (AuthFeatureViewBuildable & AlertViewBuildable)!
     private let cancelBag = CancelBag()
+    public var userType: UserType = .active
 
     // MARK: - UI Components
 
@@ -119,6 +121,18 @@ extension WithdrawalVC {
 
         let withdrawalButtonTapped = self.withdrawalButton
             .publisher(for: .touchUpInside)
+            .withUnretained(self)
+            .filter({ owner, _ in
+                guard owner.userType != .unregisteredInactive else {
+                    owner.showLoading()
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) {
+                        owner.showToastAndChangeRootView()
+                        owner.stopLoading()
+                    }
+                    return false
+                }
+                return true
+            })
             .mapVoid()
             .asDriver()
 

diff --git a/SOPT-iOS/Projects/SOPT-iOS/Sources/ModuleFactory/DIContainer.swift b/SOPT-iOS/Projects/SOPT-iOS/Sources/ModuleFactory/DIContainer.swift
@@ -228,13 +228,14 @@ extension DIContainer: Features {
         return termsOfServiceVC
     }
 
-    func makeWithdrawalVC() -> WithdrawalViewControllable {
+    func makeWithdrawalVC(userType: UserType) -> WithdrawalViewControllable {
         let withdrawalVC = WithdrawalVC()
         let repository = SettingRepository(authService: authService, stampService: stampService, userService: userService)
         let useCase = DefaultSettingUseCase(repository: repository)
         let viewModel = WithdrawalViewModel(useCase: useCase)
         withdrawalVC.viewModel = viewModel
         withdrawalVC.factory = self
+        withdrawalVC.userType = userType
         return withdrawalVC
     }