[Feat] #48 - 전체적인 플로우 연결, 유저 플로우 리팩토링, 마이페이지 API 연결

RecorDream-iOS/Projects/Core/Sources/Constants/C.swift → RecorDream-iOS/Projects/Core/Sources/Constants/Constants.swift

@@ -6,9 +6,6 @@
 //  Copyright © 2022 RecorDream. All rights reserved.
 //
 
-public struct C {
+public struct Constants {
     public static let KAKAO_APP_KEY = "000e1e31f022f98fbe16c76ab287abd1"
-    public static let accessToken = "accessToken"
-    public static let refreshToken = "refreshToken"
-    public static let nickname = "nickname"
 }

RecorDream-iOS/Projects/Core/Sources/Constants/Key.swift → RecorDream-iOS/Projects/Core/Sources/Constants/UserDefaultKey.swift

@@ -6,9 +6,17 @@
 //  Copyright © 2022 RecorDream. All rights reserved.
 //
 
-public enum Key: String {
+public enum UserDefaultKey: String {
     case platform = "key.platform"
     case userToken = "key.userToken"
     case accessToken = "key.accessToken"
+    case refreshToken = "key.refreshToken"
     case nickname = "key.nickname"
 }
+
+public extension UserDefaultKey {
+    enum Constants {
+        static var kakao = "kakao"
+        static var apple = "apple"
+    }
+}

RecorDream-iOS/Projects/Core/Sources/Protocols/UserDefaultManager.swift

@@ -9,30 +9,44 @@
 import Foundation
 
 public protocol UserDefaultManager {
-    static func set(value: Any, keyPath: Key.RawValue)
-    static func string(key: Key) -> String?
-    static func int(key: Key) -> Int?
-    static func remove(key: Key)
+    static func set(value: Any, keyPath: UserDefaultKey)
+    static func string(key: UserDefaultKey) -> String?
+    static func int(key: UserDefaultKey) -> Int?
+    static func remove(key: UserDefaultKey)
     static func clearUserData()
 }
 
 public class DefaultUserDefaultManager: UserDefaultManager {
-    public static func set(value: Any, keyPath: Key.RawValue) {
-        UserDefaults.standard.setValue(value, forKeyPath: keyPath)
+    public static func set(value: Any, keyPath: UserDefaultKey) {
+        UserDefaults.standard.setValue(value, forKeyPath: keyPath.rawValue)
     }
-    public static func string(key: Key) -> String? {
+    public static func string(key: UserDefaultKey) -> String? {
         return UserDefaults.standard.string(forKey: key.rawValue)
     }
-    public static func int(key: Key) -> Int? {
+    public static func int(key: UserDefaultKey) -> Int? {
         return UserDefaults.standard.integer(forKey: key.rawValue)
     }
-    public static func remove(key: Key) {
+    public static func remove(key: UserDefaultKey) {
         UserDefaults.standard.removeObject(forKey: key.rawValue)
     }
     public static func clearUserData() {
         self.remove(key: .platform)
-        self.remove(key: .userToken)
         self.remove(key: .accessToken)
+        self.remove(key: .refreshToken)
         self.remove(key: .nickname)
     }
 }
+
+public extension DefaultUserDefaultManager {
+    static var accessToken: String? {
+        return string(key: .accessToken)
+    }
+
+    static var refreshToken: String? {
+        return string(key: .refreshToken)
+    }
+
+    static var isKakaoUser: Bool {
+        return string(key: .platform) == UserDefaultKey.Constants.kakao
+    }
+}

RecorDream-iOS/Projects/Core/Sources/UIKit+/UIApplication+.swift

@@ -9,6 +9,10 @@
 import UIKit
 
 public extension UIApplication {
+    static var topRootViewController: UIViewController? {
+        UIWindow.keyWindowGetter?.rootViewController
+    }
+
     class func getMostTopViewController(base: UIViewController? = nil) -> UIViewController? {
 
         var baseVC: UIViewController?
@@ -33,5 +37,25 @@ public extension UIApplication {
         }
         return baseVC
     }
+
+    static func setRootViewController(window: UIWindow, viewController: UIViewController, withAnimation: Bool) {
+        if !withAnimation {
+            window.rootViewController = viewController
+            window.makeKeyAndVisible()
+            return
+        }
+
+        if let snapshot = window.snapshotView(afterScreenUpdates: true) {
+            viewController.view.addSubview(snapshot)
+            window.rootViewController = viewController
+            window.makeKeyAndVisible()
+
+            UIView.animate(withDuration: 0.4, animations: {
+                snapshot.layer.opacity = 0
+            }, completion: { _ in
+                snapshot.removeFromSuperview()
+            })
+        }
+    }
 }
 

RecorDream-iOS/Projects/Core/Sources/UIKit+/UIWindow+.swift

@@ -0,0 +1,22 @@
+//
+//  UIWindow+.swift
+//  RD-Core
+//
+//  Created by Junho Lee on 2022/12/19.
+//  Copyright © 2022 RecorDream-iOS. All rights reserved.
+//
+
+import UIKit
+
+public extension UIWindow {
+    static var keyWindowGetter: UIWindow? {
+        if #available(iOS 13, *) {
+            return (UIApplication.shared.connectedScenes
+                        .compactMap { $0 as? UIWindowScene }
+                        .flatMap { $0.windows }
+                        .first { $0.isKeyWindow })
+        } else {
+            return UIApplication.shared.keyWindow
+        }
+    }
+}

RecorDream-iOS/Projects/Data/Sources/Network/DataTransform/UserInfoTransform.swift

@@ -0,0 +1,25 @@
+//
+//  UserInfoTransform.swift
+//  Data
+//
+//  Created by Junho Lee on 2022/12/19.
+//  Copyright © 2022 RecorDream-iOS. All rights reserved.
+//
+
+import Domain
+import RD_Network
+
+import Foundation
+
+extension UserInfoResponse {
+    func toDomain() -> MyPageEntity? {
+        var notEmptyName = self.nickname
+        notEmptyName = self.nickname == ""
+        ? "닉네임"
+        : self.nickname
+        return .init(userName: notEmptyName,
+                     email: self.email,
+                     pushOnOff: self.time != nil,
+                     pushTime: self.time)
+    }
+}

RecorDream-iOS/Projects/Data/Sources/Repositories/DefaultAuthRepository.swift

@@ -9,6 +9,7 @@
 import Foundation
 
 import Domain
+import RD_Core
 import RD_Network
 
 import RxSwift
@@ -18,7 +19,7 @@ public final class DefaultAuthRepository {
     private let authService: AuthService
     private let disposeBag = DisposeBag()
 
-    init(authService: AuthService) {
+    public init(authService: AuthService) {
         self.authService = authService
     }
 }
@@ -29,7 +30,36 @@ extension DefaultAuthRepository: AuthRepository {
             self.authService.login(kakaoToken: request.kakaoToken, appleToken: request.appleToken, fcmToken: request.fcmToken)
                 .subscribe(onNext: { response in
                     guard let response = response else { return }
-                    observer.onNext(.init(duplicated: response.duplicated, accessToken: response.accessToken, refreshToken: response.refreshToken))
+                    observer.onNext(.init(duplicated: response.duplicated, accessToken: response.accessToken, refreshToken: response.refreshToken, nickname: response.nickname))
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
+            return Disposables.create()
+        }
+    }
+
+    public func requestReissuance() -> Observable<Bool> {
+        return Observable.create { observer in
+            self.authService.reissuance()
+                .subscribe(onNext: { response in
+                    guard let response = response else {
+                        observer.onNext(false)
+                        return
+                    }
+
+                    if response.status == 403 {
+                        observer.onNext(true)
+                        return
+                    }
+
+                    guard let token = response.data else {
+                        observer.onNext(false)
+                        return
+                    }
+                    DefaultUserDefaultManager.set(value: token.accessToken, keyPath: .accessToken)
+                    DefaultUserDefaultManager.set(value: token.refreshToken, keyPath: .refreshToken)
+                    observer.onNext(true)
                 }, onError: { err in
                     observer.onError(err)
                 })

RecorDream-iOS/Projects/Data/Sources/Repositories/DefaultMyPageRepository.swift

@@ -7,54 +7,134 @@
 //
 
 import Domain
+import RD_Core
 import RD_Network
 
 import RxSwift
 
 public class DefaultMyPageRepository {
-
+    
     private let disposeBag = DisposeBag()
-
-    public init() {
+    private var authService: AuthService
+    private var userService: UserService
 
+    public init(authService: AuthService, userService: UserService) {
+        self.authService = authService
+        self.userService = userService
     }
 }
 
 extension DefaultMyPageRepository: MyPageRepository {
+    public func changeUserNickname(nickname: String) -> RxSwift.Observable<Bool> {
+        return Observable.create { observer in
+            self.userService.changeNickname(nickname: nickname)
+                .subscribe(onNext: { nicknameChangeSuccessed in
+                    guard nicknameChangeSuccessed else {
+                        observer.onNext(false)
+                        return
+                    }
+                    observer.onNext(true)
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
+            return Disposables.create()
+        }
+    }
+
     public func fetchUserInformation() -> Observable<MyPageEntity> {
         return Observable.create { observer in
-            observer.onNext(.init(userName: "샘플닉네임",
-                                  email: "[email protected]",
-                                  pushOnOff: true,
-                                  pushTime: "08:00"))
+            self.userService.fetchUserInfo()
+                .subscribe(onNext: { response in
+                    guard let entity = response?.toDomain() else {
+                        return
+                    }
+                    observer.onNext(entity)
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
             return Disposables.create()
         }
     }
 
     public func userLogout() -> Observable<Bool> {
         return Observable.create { observer in
-            observer.onNext(true)
+            guard let fcmToken = DefaultUserDefaultManager.string(key: UserDefaultKey.userToken) else { return Disposables.create() }
+            self.authService.logout(fcmToken: fcmToken)
+                .subscribe(onNext: { logoutSuccess in
+                    guard logoutSuccess else {
+                        observer.onNext(false)
+                        return
+                    }
+                    DefaultUserDefaultManager.clearUserData()
+                    observer.onNext(true)
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
             return Disposables.create()
         }
     }
 
     public func userWithdrawal() -> Observable<Bool> {
         return Observable.create { observer in
-            observer.onNext(true)
+            self.userService.withDrawal()
+                .subscribe(onNext: { withDrawalSuccess in
+                    guard withDrawalSuccess else {
+                        observer.onNext(false)
+                        return
+                    }
+                    DefaultUserDefaultManager.clearUserData()
+                    observer.onNext(true)
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
             return Disposables.create()
         }
     }
 
-    public func enablePushNotice(time: String) -> Observable<String> {
+    public func enablePushNotice(time: String) -> Observable<Bool> {
         return Observable.create { observer in
-            observer.onNext("AM 08:20")
+            self.userService.changeNoticeStatus(isActive: true)
+                .compactMap { $0?.isActive }
+                .do(onNext: { isActive in
+                    guard isActive else {
+                        observer.onNext(false)
+                        return
+                    }
+                })
+                .filter { $0 }
+                .flatMap { _ in self.userService.postNoticeTime(time: time) }
+                .subscribe(onNext: { changeTimeSuccessed in
+                    guard changeTimeSuccessed else {
+                        observer.onNext(false)
+                        return
+                    }
+                    observer.onNext(true)
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
             return Disposables.create()
         }
     }
 
-    public func disablePushNotice() -> Observable<Void> {
+    public func disablePushNotice() -> Observable<Bool> {
         return Observable.create { observer in
-            observer.onNext(())
+            self.userService.changeNoticeStatus(isActive: false)
+                .subscribe(onNext: { response in
+                    guard let isActive = response?.isActive else {
+                        observer.onNext(false)
+                        return
+                    }
+
+                    observer.onNext(!isActive)
+                }, onError: { err in
+                    observer.onError(err)
+                })
+                .disposed(by: self.disposeBag)
             return Disposables.create()
         }
     }

RecorDream-iOS/Projects/Domain/Sources/Entities/Auth/AuthEntity.swift

@@ -10,10 +10,12 @@ public struct AuthEntity: Codable {
     public let duplicated: Bool
     public let accessToken: String
     public let refreshToken: String
+    public let nickname: String
 
-    public init(duplicated: Bool, accessToken: String, refreshToken: String) {
+    public init(duplicated: Bool, accessToken: String, refreshToken: String, nickname: String) {
         self.duplicated = duplicated
         self.accessToken = accessToken
         self.refreshToken = refreshToken
+        self.nickname = nickname
     }
 }