Moya 및 Combine을 사용한 Network 리펙토링

Project_Timer/AppDelegate.swift

@@ -12,6 +12,8 @@ import FirebaseAnalytics
 import GoogleMobileAds
 import WidgetKit
 import GoogleSignIn
+import Moya
+import Combine
 
 @UIApplicationMain
 final class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -21,6 +23,8 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     }
     // 화면 회전을 제어할 변수 선언
     var shouldSupportPortraitOrientation = false
+    // Combine binding
+    private var cancellables = Set<AnyCancellable>()
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         self.checkLatestVersion(isLaunch: true)
@@ -101,17 +105,27 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
 
 // MARK: Configure
 extension AppDelegate {
+    /// 최신버전 체크
     private func checkLatestVersion(isLaunch: Bool) {
-        /// 최신버전 체크로직
-        let getLatestVersionUseCase = GetLatestVersionUseCase(repository: AppLatestVersionRepository())
+        // TODO: DI 수정
+        let api = TTProvider<FirebaseAPI>(session: Session(interceptor: NetworkInterceptor.shared))
+        let repository = FirebaseRepository(api: api)
+        let getAppVersionUseCase = GetAppVersionUseCase(repository: repository)
 
-        getLatestVersionUseCase.getLatestVersion { result in
-            switch result {
-            case .success(let latestVersionInfo):
-                let storeVersion = latestVersionInfo.latestVersion
+        getAppVersionUseCase.execute()
+            .sink { [weak self] completion in
+                if case .failure = completion {
+                    // MARK: 버전 불러오기 실패 Alert 표시
+                    let title = Localized.string(.App_Popup_FetchVersionErrorTitle)
+                    let text = Localized.string(.App_Popup_FetchVersionErrorDesc)
+                    let ok = UIAlertAction(title: Localized.string(.Common_Text_OK), style: .default)
+                    self?.showAlert(title: title, text: text, actions: [ok])
+                }
+            } receiveValue: { [weak self] appLatestVersionInfo in
+                let storeVersion = appLatestVersionInfo.latestVersion
                 guard storeVersion.compare(String.currentVersion, options: .numeric) == .orderedDescending else { return }
 
-                if latestVersionInfo.forced == true {
+                if appLatestVersionInfo.forced == true {
                     // MARK: 강제 업데이트 필요 Alert 표시
                     let title = Localized.string(.Update_Popup_HardUpdateTitle)
                     let text = Localized.string(.Update_Popup_HardUpdateDesc)
@@ -124,7 +138,7 @@ extension AppDelegate {
                             }
                         }
                     }
-                    self.showAlert(title: title, text: text, actions: [ok])
+                    self?.showAlert(title: title, text: text, actions: [ok])
                 } else if isLaunch == true && UserDefaultsManager.get(forKey: .updatePushable) as? Bool ?? true {
                     // MARK: 업데이트 Alert 표시
                     let title = Localized.string(.Update_Pupup_SoftUpdateTitle)
@@ -137,13 +151,10 @@ extension AppDelegate {
                             UIApplication.shared.open(url, options: [:])
                         }
                     }
-                    self.showAlert(title: title, text: text, actions: [pass, update])
+                    self?.showAlert(title: title, text: text, actions: [pass, update])
                 }
-
-            case .failure(let networkError):
-                print(networkError.alertMessage)
             }
-        }
+            .store(in: &self.cancellables)
     }
 
     private func showAlert(title: String, text: String?, actions: [UIAlertAction]) {
@@ -217,28 +228,27 @@ extension AppDelegate {
     }
 
     private func checkNotification() {
-        let getNotficationUseCase = GetNotificationUseCase(repository: NotificationRepository())
+        // TODO: DI 수정
+        let api = TTProvider<FirebaseAPI>(session: Session(interceptor: NetworkInterceptor.shared))
+        let repository = FirebaseRepository(api: api)
+        let getNotificationUseCase = GetNotificationUseCase(repository: repository)
         let notificationUseCase = NotificationUseCase()
 
-        getNotficationUseCase.getNoti { result in
-            switch result {
-            case .success(let noti):
-                guard let noti = noti else { return }
+        getNotificationUseCase.execute()
+            .sink { completion in
+                    if case .failure(let networkError) = completion {
+                        print("ERROR", #function, networkError)
+                    }
+            } receiveValue: { notificationInfo in
+                guard let notificationInfo = notificationInfo else { return }
                 guard notificationUseCase.isShowNotification() else { return }
 
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    let notificationVC = NotificationVC(noti: noti, notificationUseCase: notificationUseCase)
+                    let notificationVC = NotificationVC(noti: notificationInfo, notificationUseCase: notificationUseCase)
                     SceneDelegate.sharedWindow?.rootViewController?.present(notificationVC, animated: true)
                 }
-            case .failure(let networkError):
-                switch networkError {
-                case .NOTFOUND(_):
-                    return
-                default:
-                    print(networkError.alertMessage)
-                }
             }
-        }
+            .store(in: &self.cancellables)
     }
 
     private func updateToLastestVersion() {

Project_Timer/Data/Network/Extension/JSONDecoder+Extension.swift → Project_Timer/Core/Extension/Foundation/JSONDecoder+Extension.swift

@@ -2,8 +2,8 @@
 //  JSONDecoder+Extension.swift
 //  Project_Timer
 //
-//  Created by Kang Minsang on 2022/12/23.
-//  Copyright © 2022 FDEE. All rights reserved.
+//  Created by Kang Minsang on 2024/06/29.
+//  Copyright © 2024 FDEE. All rights reserved.
 //
 
 import Foundation

Project_Timer/Core/Localize/TLRen.swift

@@ -31,6 +31,9 @@ struct TLRen {
         case .Common_Popup_Warning: value = "Warning"
         case .Common_Popup_Inform: value = "Inform"
 
+        case .App_Popup_FetchVersionErrorTitle: value = "Failed to fetch the latest version information"
+        case .App_Popup_FetchVersionErrorDesc: value = "If the issue persists, please contact support."
+
         case .System_Noti_StopwatchHourPassed: value = "{}hours passed."
         case .System_Noti_TimerFinished: value = "Timer finished!"
         case .System_Noti_Timer5Left: value = "5 minutes left"

Project_Timer/Core/Localize/TLRkey.swift

@@ -46,6 +46,11 @@ enum TLRkey: String {
     /// 안내
     case Common_Popup_Inform
 
+    /// 최신버전 정보를 불러오지 못했어요
+    case App_Popup_FetchVersionErrorTitle
+    /// 문제가 계속될 경우 문의 부탁드려요.
+    case App_Popup_FetchVersionErrorDesc
+
     /// {}시간 경과되었습니다.
     case System_Noti_StopwatchHourPassed
     /// 타이머가 종료되었습니다!

Project_Timer/Core/Localize/TLRko.swift

@@ -31,6 +31,9 @@ struct TLRko {
         case .Common_Popup_Warning: value = "경고"
         case .Common_Popup_Inform: value = "안내"
 
+        case .App_Popup_FetchVersionErrorTitle: value = "최신버전 정보를 불러오지 못했어요"
+        case .App_Popup_FetchVersionErrorDesc: value = "문제가 계속될 경우 문의 부탁드려요."
+
         case .System_Noti_StopwatchHourPassed: value = "{}시간 경과되었습니다."
         case .System_Noti_TimerFinished: value = "타이머가 종료되었습니다!"
         case .System_Noti_Timer5Left: value = "5분 남았습니다"

Project_Timer/Core/Localize/TLRzh.swift

@@ -31,6 +31,9 @@ struct TLRzh {
         case .Common_Popup_Warning: value = "警告"
         case .Common_Popup_Inform: value = "向导"
 
+        case .App_Popup_FetchVersionErrorTitle: value = "无法获取最新版本信息。"
+        case .App_Popup_FetchVersionErrorDesc: value = "如果问题仍然存在，请联系客服。"
+
         case .System_Noti_StopwatchHourPassed: value = "{}时间已过。"
         case .System_Noti_TimerFinished: value = "计时器已结束 ！"
         case .System_Noti_Timer5Left: value = "还剩5分钟"

Project_Timer/Data/API/API.swift

@@ -0,0 +1,30 @@
+//
+//  API.swift
+//  Project_Timer
+//
+//  Created by Kang Minsang on 2024/04/17.
+//  Copyright © 2024 FDEE. All rights reserved.
+//
+
+import Foundation
+import Moya
+
+extension TargetType {
+    func parameters(from encodable: Encodable) -> [String: Any] {
+        let encoder = JSONEncoder()
+        guard let data = try? encoder.encode(encodable),
+              let dictionary = try? JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any] else {
+            return [:]
+        }
+
+        return dictionary
+    }
+}
+
+extension JSONEncoder {
+    static var dateFormatted: JSONEncoder {
+        let encoder = JSONEncoder()
+        encoder.dateEncodingStrategy = .iso8601
+        return encoder
+    }
+}

Project_Timer/Data/API/AuthAPI.swift

@@ -2,63 +2,65 @@
 //  AuthAPI.swift
 //  Project_Timer
 //
-//  Created by Kang Minsang on 2023/12/15.
-//  Copyright © 2023 FDEE. All rights reserved.
+//  Created by Kang Minsang on 2024/04/17.
+//  Copyright © 2024 FDEE. All rights reserved.
 //
 
 import Foundation
+import Moya
 
-final class AuthAPI {
-    private let network = Network()
-    private var signupURL: String {
-        let base = NetworkURL.shared.serverURL ?? "nil"
-        return base + "/auth/signup"
-    }
-    private var signinURL: String {
-        let base = NetworkURL.shared.serverURL ?? "nil"
-        return base + "/auth/login"
-    }
-    private var checkUsersURL: String {
-        let base = NetworkURL.shared.serverURL ?? "nil"
-        return base + "/auth/users"
-    }
-    private var resetPasswordURL: String {
-        let base = NetworkURL.shared.serverURL ?? "nil"
-        return base + "/auth/users/password"
-    }
-
-    func signup(signupInfo: TestUserSignupInfo, completion: @escaping (NetworkResult) -> Void) {
-        self.network.request(url: self.signupURL, method: .post, param: nil, body: signupInfo) { result in
-            completion(result)
-        }
+enum AuthAPI {
+    case postSignup(TestUserSignupRequest)
+    case postSignin(TestUserSigninRequest)
+    case getCheckUsername(CheckUsernameRequest)
+    case getCheckEmail(CheckEmailExitRequest)
+    case postUpdatePassword(UpdatePasswordRequest)
+}
+
+extension AuthAPI: TargetType {
+    var baseURL: URL {
+        return URL(string: NetworkURL.shared.serverURL ?? "nil")!
     }
 
-    func signin(signinInfo: TestUserSigninInfo, completion: @escaping (NetworkResult) -> Void) {
-        self.network.request(url: self.signinURL, method: .post, param: nil, body: signinInfo) { result in
-            completion(result)
+    var path: String {
+        switch self {
+        case .postSignup:
+            return "/auth/signup"
+        case .postSignin:
+            return "/auth/login"
+        case .getCheckUsername, .getCheckEmail:
+            return "/auth/users"
+        case .postUpdatePassword:
+            return "/auth/users/password"
         }
     }
 
-    func checkUsername(username: String, completion: @escaping (NetworkResult) -> Void) {
-        self.network.request(url: self.checkUsersURL, method: .get, param: [
-            "username": username
-        ]) { result in
-            completion(result)
+    var method: Moya.Method {
+        switch self {
+        case .postSignup, .postSignin, .postUpdatePassword:
+            return .post
+        case .getCheckUsername, .getCheckEmail:
+            return .get
         }
     }
 
-    func checkEmail(username: String, email: String, completion: @escaping (NetworkResult) -> Void) {
-        self.network.request(url: self.checkUsersURL, method: .get, param: [
-            "username": username,
-            "email": email
-        ]) { result in
-            completion(result)
+    var task: Moya.Task {
+        switch self {
+        case .postSignup(let request):
+            return .requestJSONEncodable(request)
+        case .postSignin(let request):
+            return .requestJSONEncodable(request)
+        case .getCheckUsername(let request):
+            return .requestParameters(parameters: self.parameters(from: request), encoding: URLEncoding.queryString)
+        case .getCheckEmail(let request):
+            return .requestParameters(parameters: self.parameters(from: request), encoding: URLEncoding.queryString)
+        case .postUpdatePassword(let request):
+            return .requestJSONEncodable(request)
         }
     }
 
-    func updatePassword(request: ResetPasswordRequest, completion: @escaping (NetworkResult) -> Void) {
-        self.network.request(url: self.resetPasswordURL, method: .post, body: request) { result in
-            completion(result)
-        }
+    var headers: [String: String]? {
+        return nil
     }
 }
+