[MERGE] API 레이어 분리

[REFACTOR] API 레이어 분리

LionHeart-iOS/LionHeart-iOS/Application/SceneDelegate.swift

@@ -31,7 +31,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         self.window = UIWindow(windowScene: windowScene)
         /// 폰트등록
         Font.registerFonts()
-        let navigationController = UINavigationController(rootViewController: SplashViewController())
+        let navigationController = UINavigationController(rootViewController: SplashViewController(authService: AuthMyPageServiceWrapper(authAPIService: AuthAPI(apiService: APIService()), mypageAPIService: MyPageAPI(apiService: APIService()))))
         self.window?.rootViewController = navigationController
         self.window?.makeKeyAndVisible()
     }

LionHeart-iOS/LionHeart-iOS/Global/Protocols/Serviceable.swift

@@ -36,6 +36,8 @@ extension Serviceable {
         guard !NetworkErrorCode.serverErrorCode.contains(statusCode) else {
             throw NetworkError.serverError
         }
+        print("✅✅✅✅✅✅✅✅✅✅✅✅✅원래 API호출성공✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅")
+        print(model.data)
         return model.data
     }
 }

LionHeart-iOS/LionHeart-iOS/Network/API/AuthAPI.swift

@@ -0,0 +1,96 @@
+//
+//  AuthAPI.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/09/08.
+//
+
+import Foundation
+
+protocol AuthAPIProtocol {
+    func reissueToken(token: Token) async throws -> Token?
+    func login(type: LoginType, kakaoToken: String) async throws
+    func signUp(type: LoginType, onboardingModel: UserOnboardingModel) async throws
+    @discardableResult func logout(token: UserDefaultToken) async throws -> String?
+    func resignUser() async throws
+}
+
+final class AuthAPI: AuthAPIProtocol {
+
+    private let apiService: Requestable
+
+    init(apiService: Requestable) {
+        self.apiService = apiService
+    }
+
+    func reissueToken(token: Token) async throws -> Token? {
+        let urlRequest = try makeReissueTokenUrlRequest(token: token)
+        return try await apiService.request(urlRequest)
+    }
+
+    func login(type: LoginType, kakaoToken: String) async throws {
+        let urlRequest = try makeLoginUrlRequest(type: type, kakaoToken: kakaoToken)
+        userdefaultsSettingWhenUserIn(model: try await apiService.request(urlRequest))
+    }
+
+    func signUp(type: LoginType, onboardingModel: UserOnboardingModel) async throws {
+        let urlRequest = try makeSignUpUrlRequest(type: type, onboardingModel: onboardingModel)
+        userdefaultsSettingWhenUserIn(model: try await apiService.request(urlRequest))
+    }
+
+    func logout(token: UserDefaultToken) async throws -> String? {
+        let urlRequest = try makeLogoutUrlRequest()
+        return try await apiService.request(urlRequest)
+    }
+
+    func resignUser() async throws {
+        let urlRequest = try makeResignUserUrlRequest()
+        _ = try await URLSession.shared.data(for: urlRequest)
+        UserDefaultsManager.tokenKey?.refreshToken = nil
+    }
+}
+
+extension AuthAPI {
+    private func userdefaultsSettingWhenUserIn(model: Token?) {
+        UserDefaultsManager.tokenKey?.accessToken = model?.accessToken
+        UserDefaultsManager.tokenKey?.refreshToken = model?.refreshToken
+    }
+}
+
+extension AuthAPI {
+    func makeResignUserUrlRequest() throws -> URLRequest {
+        return try NetworkRequest(path: "/v1/member", httpMethod: .delete).makeURLRequest(isLogined: true)
+    }
+
+    func makeLogoutUrlRequest() throws -> URLRequest {
+        return try NetworkRequest(path: "/v1/auth/logout", httpMethod: .post).makeURLRequest(isLogined: true)
+    }
+
+    func makeSignUpUrlRequest(type: LoginType, onboardingModel: UserOnboardingModel) throws -> URLRequest {
+        guard let fcmToken = UserDefaultsManager.tokenKey?.fcmToken,
+              let kakaoToken = onboardingModel.kakaoAccessToken,
+              let pregnantWeeks = onboardingModel.pregnacny,
+              let babyNickname = onboardingModel.fetalNickname  else { throw NetworkError.badCasting }
+        let requestModel = SignUpRequest(socialType: type.raw, token: kakaoToken, fcmToken: fcmToken, pregnantWeeks: pregnantWeeks, babyNickname: babyNickname)
+        let param = requestModel.toDictionary()
+        let body = try JSONSerialization.data(withJSONObject: param)
+        return try NetworkRequest(path: "/v1/auth/signup", httpMethod: .post, body: body).makeURLRequest(isLogined: false)
+    }
+
+    func makeReissueTokenUrlRequest(token: Token) throws -> URLRequest {
+        let params = token.toDictionary()
+        let body = try JSONSerialization.data(withJSONObject: params, options: [])
+        return try NetworkRequest(path: "/v1/auth/reissue", httpMethod: .post, body: body)
+            .makeURLRequest(isLogined: false)
+    }
+
+    func makeLoginUrlRequest(type: LoginType, kakaoToken: String) throws -> URLRequest {
+        guard let fcmToken = UserDefaultsManager.tokenKey?.fcmToken else {
+            throw NetworkError.clientError(code: "", message: "\(String(describing: UserDefaultsManager.tokenKey))")
+        }
+        let loginRequest = LoginRequest(socialType: type.raw, token: kakaoToken, fcmToken: fcmToken)
+        let param = loginRequest.toDictionary()
+        let body = try JSONSerialization.data(withJSONObject: param)
+        return try NetworkRequest(path: "/v1/auth/login", httpMethod: .post, body: body).makeURLRequest(isLogined: false)
+    }
+}

LionHeart-iOS/LionHeart-iOS/Network/API/MyPageAPI.swift

@@ -0,0 +1,26 @@
+//
+//  MyPageAPI.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/09/10.
+//
+
+import Foundation
+
+protocol MyPageAPIProtocol {
+    func getMyPage() async throws -> MyPageResponse?
+}
+
+final class MyPageAPI: MyPageAPIProtocol {
+
+    private let apiService: Requestable
+
+    init(apiService: Requestable) {
+        self.apiService = apiService
+    }
+
+    func getMyPage() async throws -> MyPageResponse? {
+        let urlRequest = try NetworkRequest(path: "/v1/member/profile", httpMethod: .get).makeURLRequest(isLogined: true)
+        return try await apiService.request(urlRequest)
+    }
+}

LionHeart-iOS/LionHeart-iOS/Network/Base/APIService.swift

@@ -0,0 +1,34 @@
+//
+//  APIService.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/09/08.
+//
+
+import Foundation
+
+protocol Requestable {
+    func request<T: Decodable>(_ request: URLRequest) async throws -> T?
+}
+
+final class APIService: Requestable {
+    func request<T: Decodable>(_ request: URLRequest) async throws -> T? {
+        let (data, _) = try await URLSession.shared.data(for: request)
+        let decoder = JSONDecoder()
+        guard let decodedData = try? decoder.decode(BaseResponse<T>.self, from: data) else {
+            throw NetworkError.jsonDecodingError
+        }
+
+        let statusCode = decodedData.code
+        guard !NetworkErrorCode.clientErrorCode.contains(statusCode) else {
+            throw NetworkError.clientError(code: decodedData.code, message: decodedData.message)
+        }
+
+        guard !NetworkErrorCode.serverErrorCode.contains(statusCode) else {
+            throw NetworkError.serverError
+        }
+
+        print("✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅APIService성공✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅")
+        return decodedData.data
+    }
+}

LionHeart-iOS/LionHeart-iOS/Network/Services/AuthMyPageServiceWrapper.swift

@@ -0,0 +1,47 @@
+//
+//  AuthMyPageServiceWrapper.swift
+//  LionHeart-iOS
+//
+//  Created by 김민재 on 2023/09/07.
+//
+
+import Foundation
+
+final class AuthMyPageServiceWrapper: AuthServiceProtocol, MyPageServiceProtocol {
+
+    private let authAPIService: AuthAPIProtocol
+    private let mypageAPIService: MyPageAPIProtocol
+
+    init(authAPIService: AuthAPIProtocol, mypageAPIService: MyPageAPIProtocol) {
+        self.authAPIService = authAPIService
+        self.mypageAPIService = mypageAPIService
+    }
+
+    func getMyPage() async throws -> MyPageAppData {
+        guard let model = try await mypageAPIService.getMyPage()
+        else { return MyPageAppData.empty }
+        return MyPageAppData(badgeImage: model.level, nickname: model.babyNickname, isAlarm: model.notificationStatus)
+    }
+
+    func reissueToken(token: Token) async throws -> Token? {
+        let model = try await authAPIService.reissueToken(token: token)
+        return try await authAPIService.reissueToken(token: token)
+    }
+
+    func login(type: LoginType, kakaoToken: String) async throws {
+        try await authAPIService.login(type: type, kakaoToken: kakaoToken)
+    }
+
+    func signUp(type: LoginType, onboardingModel: UserOnboardingModel) async throws {
+        try await authAPIService.signUp(type: type, onboardingModel: onboardingModel)
+    }
+
+    func resignUser() async throws {
+        try await authAPIService.resignUser()
+    }
+
+    func logout(token: UserDefaultToken) async throws {
+        try await authAPIService.logout(token: token)
+    }
+
+}

LionHeart-iOS/LionHeart-iOS/Scenes/Article/ArticleCategory/ViewControllers/ArticleCategoryViewController.swift

@@ -104,7 +104,8 @@ private extension ArticleCategoryViewController {
         }
 
         navigationBar.rightSecondBarItemAction {
-            let myPageViewController = MyPageViewController()
+            let wrapper = AuthMyPageServiceWrapper(authAPIService: AuthAPI(apiService: APIService()), mypageAPIService: MyPageAPI(apiService: APIService()))
+            let myPageViewController = MyPageViewController(service: wrapper)
             self.navigationController?.pushViewController(myPageViewController, animated: true)
         }
     }

LionHeart-iOS/LionHeart-iOS/Scenes/Article/ArticleDetail/ViewControllers/ArticleDetailViewController.swift

@@ -110,7 +110,7 @@ extension ArticleDetailViewController: ViewControllerServiceable {
         switch error {
         case .unAuthorizedError:
             guard let window = self.view.window else { return }
-            ViewControllerUtil.setRootViewController(window: window, viewController: SplashViewController(), withAnimation: false)
+            ViewControllerUtil.setRootViewController(window: window, viewController: SplashViewController(authService: AuthMyPageServiceWrapper(authAPIService: AuthAPI(apiService: APIService()), mypageAPIService: MyPageAPI(apiService: APIService()))), withAnimation: false)
         case .clientError(_, let message):
             LHToast.show(message: "\(message)")
         default:

LionHeart-iOS/LionHeart-iOS/Scenes/Article/ArticleListByCategory/ViewControllers/ArticleListByCategoryViewController.swift

@@ -126,11 +126,11 @@ extension ArticleListByCategoryViewController: ViewControllerServiceable {
             LHToast.show(message: "Image Error")
         case .unAuthorizedError:
             guard let window = self.view.window else { return }
-            ViewControllerUtil.setRootViewController(window: window, viewController: SplashViewController(), withAnimation: false)
-        case .clientError(_, _):
-            print("뜨면 위험함")
+            ViewControllerUtil.setRootViewController(window: window, viewController: SplashViewController(authService: AuthMyPageServiceWrapper(authAPIService: AuthAPI(apiService: APIService()), mypageAPIService: MyPageAPI(apiService: APIService()))), withAnimation: false)
+        case .clientError(_, let message):
+            LHToast.show(message: message)
         case .serverError:
-            LHToast.show(message: "승준이 빠따")
+            LHToast.show(message: error.description)
         }
     }
 }

LionHeart-iOS/LionHeart-iOS/Scenes/BookMark/ViewControllers/BookmarkViewController.swift

@@ -106,11 +106,11 @@ extension BookmarkViewController: ViewControllerServiceable {
             LHToast.show(message: "Image Error")
         case .unAuthorizedError:
             guard let window = self.view.window else { return }
-            ViewControllerUtil.setRootViewController(window: window, viewController: SplashViewController(), withAnimation: false)
-        case .clientError(_, _):
-            print("뜨면 위험함")
+            ViewControllerUtil.setRootViewController(window: window, viewController: SplashViewController(authService: AuthMyPageServiceWrapper(authAPIService: AuthAPI(apiService: APIService()), mypageAPIService: MyPageAPI(apiService: APIService()))), withAnimation: false)
+        case .clientError(_, let message):
+            LHToast.show(message: message)
         case .serverError:
-            LHToast.show(message: "승준이 빠따")
+            LHToast.show(message: "server error")
         }
     }
 }