[Refactor] #239 - 네트워크 구조 변경

DO-NOTTO-DO · Mar 11, 2024 · 3c484f3 · 3c484f3
2 parents 4248387 + 92e06e4
commit 3c484f3
Show file tree

Hide file tree

Showing 27 changed files with 548 additions and 796 deletions.
diff --git a/iOS-NOTTODO/iOS-NOTTODO.xcodeproj/project.pbxproj b/iOS-NOTTODO/iOS-NOTTODO.xcodeproj/project.pbxproj
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Global/Enum/DefaultKeys.swift b/iOS-NOTTODO/iOS-NOTTODO/Global/Enum/DefaultKeys.swift
@@ -7,15 +7,8 @@
 
 import Foundation
 
-enum LoginType {
-    case Kakao, Apple
-
-    var social: String {
-        switch self {
-        case .Kakao: return "KAKAO"
-        case .Apple: return "APPLE"
-        }
-    }
+enum LoginType: String, Codable, CaseIterable {
+    case KAKAO, APPLE
 }
 
 struct DefaultKeys {

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Network/API/Achieve/AchieveAPI.swift b/iOS-NOTTODO/iOS-NOTTODO/Network/API/Achieve/AchieveAPI.swift
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Network/API/AddMission/AddMissionAPI.swift b/iOS-NOTTODO/iOS-NOTTODO/Network/API/AddMission/AddMissionAPI.swift
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Network/API/Auth/AuthAPI.swift b/iOS-NOTTODO/iOS-NOTTODO/Network/API/Auth/AuthAPI.swift
@@ -9,7 +9,17 @@ import Foundation
 
 import Moya
 
-final class AuthAPI {
+typealias AuthData = GeneralResponse<AuthResponseDTO>
+typealias EmptyData = GeneralResponse<VoidType>
+
+protocol AuthAPIType {
+    func postKakaoAuth(social: LoginType, request: AuthRequest, completion: @escaping (AuthData?) -> Void)
+    func postAppleAuth(social: LoginType, request: AuthRequest, completion: @escaping (AuthData?) -> Void)
+    func deleteAuth(completion: @escaping (EmptyData?) -> Void)
+    func withdrawalAuth(completion: @escaping (EmptyData?) -> Void)
+}
+
+final class AuthAPI: AuthAPIType {
 
     static let shared: AuthAPI = AuthAPI()
 
@@ -19,13 +29,13 @@ final class AuthAPI {
 
     // MARK: - POST
 
-    func postKakaoAuth(social: String, socialToken: String, fcmToken: String, completion: @escaping (GeneralResponse<AuthResponseDTO>?) -> Void) {
-        authProvider.request(.kakaoAuth(social: social, socialToken: socialToken, fcmToken: fcmToken)) { result in
+    func postKakaoAuth(social: LoginType, request: AuthRequest, completion: @escaping (AuthData?) -> Void) {
+        authProvider.request(.kakaoAuth(social: social, request: request)) { result in
             switch result {
             case .success(let response):
                 do {
-                    guard let authData = try response.map(GeneralResponse<AuthResponseDTO>?.self) else { return }
-                    completion(authData)
+                    let response = try response.map(AuthData?.self)
+                    completion(response)
                 } catch let err {
                     print(err.localizedDescription, 500)
                 }
@@ -36,13 +46,13 @@ final class AuthAPI {
         }
     }
 
-    func postAppleAuth(social: String, socialToken: String, fcmToken: String, name: String, completion: @escaping (GeneralResponse<AuthResponseDTO>?) -> Void) {
-        authProvider.request(.appleAuth(social: social, socialToken: socialToken, fcmToken: fcmToken, name: name)) { result in
+    func postAppleAuth(social: LoginType, request: AuthRequest, completion: @escaping (AuthData?) -> Void) {
+        authProvider.request(.appleAuth(social: social, request: request)) { result in
             switch result {
             case .success(let response):
                 do {
-                    guard let authData = try response.map(GeneralResponse<AuthResponseDTO>?.self) else { return }
-                    completion(authData)
+                    let response = try response.map(AuthData?.self)
+                    completion(response)
                 } catch let err {
                     print(err.localizedDescription, 500)
                 }
@@ -55,15 +65,15 @@ final class AuthAPI {
 
     // MARK: - Delete
 
-    func deleteAuth(completion: @escaping (GeneralResponse<VoidType>?) -> Void) {
+    func deleteAuth(completion: @escaping (EmptyData?) -> Void) {
         authProvider.request(.logout) { _ in
             completion(nil)
         }
     }
 
     // MARK: - Withdrawal
 
-    func withdrawalAuth(completion: @escaping (GeneralResponse<VoidType>?) -> Void) {
+    func withdrawalAuth(completion: @escaping (EmptyData?) -> Void) {
         authProvider.request(.withdrawal) { _ in
             completion(nil)
         }

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Network/API/BaseAPI.swift b/iOS-NOTTODO/iOS-NOTTODO/Network/API/BaseAPI.swift
@@ -0,0 +1,69 @@
+//
+//  BaseAPI.swift
+//  iOS-NOTTODO
+//
+//  Created by JEONGEUN KIM on 3/10/24.
+//
+
+import Foundation
+
+import Moya
+
+enum BaseDomain {
+    case auth
+    case mission
+    case recommend
+}
+
+extension BaseDomain {
+
+    var url: String {
+        switch self {
+        case .auth:
+            return "/auth"
+        case .mission:
+            return "/mission"
+        case .recommend:
+            return "/recommend"
+        }
+    }
+}
+
+protocol BaseService: TargetType {
+    var domain: BaseDomain { get }
+    var urlPath: String { get }
+    var headerType: HeaderType { get }
+}
+
+extension BaseService {
+    var baseURL: URL {
+        return URL(string: Bundle.main.baseURL)!
+    }
+
+    var path: String {
+        return domain.url + urlPath
+    }
+
+    var validationType: ValidationType {
+        return .successCodes
+    }
+
+    var headers: [String: String]? {
+        return headerType.value
+    }
+}
+
+public enum HeaderType {
+    case json
+    case jsonWithToken
+
+    public var value: [String: String] {
+        switch self {
+        case .json:
+            return ["Content-Type": "application/json"]
+        case .jsonWithToken:
+            return ["Content-Type": "application/json",
+                    "Authorization": "\(KeychainUtil.getAccessToken())"]
+        }
+    }
+}