Merge pull request #341 from EAT-SSU/fix/#340

[#340] 날짜 변경 시 메뉴가 제대로 나오지 않던 버그 수정 및 전체적인 네트워크 구조 수정

Author: Hrepay

EATSSU/App/Sources/Data/Network/Foundation/NetworkError.swift

@@ -0,0 +1,35 @@
+//
+//  NetworkError.swift
+//  EATSSU
+//
+//  Created by 황상환 on 10/17/25.
+//
+
+import Foundation
+
+enum NetworkError: Error, LocalizedError {
+    /// 응답은 성공했으나, result 값이 nil일 때 (e.g., Bool 타입 응답)
+    case noData(code: Int)
+
+    /// isSuccess가 false일 때 (서버에서 정의한 에러)
+    case serverError(code: Int, message: String)
+
+    /// 응답 모델 디코딩에 실패했을 때
+    case decodingError(Error)
+
+    /// Moya에서 발생한 근본적인 에러 (e.g., 인터넷 연결 끊김)
+    case underlying(Error)
+
+    var errorDescription: String? {
+        switch self {
+        case .noData:
+            return "응답 데이터가 없습니다."
+        case .serverError(_, let message):
+            return message
+        case .decodingError:
+            return "데이터를 변환하는데 실패했습니다."
+        case .underlying(let error):
+            return error.localizedDescription
+        }
+    }
+}

EATSSU/App/Sources/Data/Network/Service/NetworkService.swift

@@ -0,0 +1,79 @@
+//
+//  NetworkService.swift
+//  EATSSU-DEV
+//
+//  Created by 황상환 on 10/17/25.
+//
+
+import Foundation
+
+import Moya
+import Alamofire
+
+final class NetworkService {
+    
+    // MARK: - Singleton
+    
+    static let shared = NetworkService()
+    
+    private init() {}
+    
+    // MARK: - Providers
+        
+    /// 기본 Provider (로깅만)
+    private func defaultProvider<T: TargetType>() -> MoyaProvider<T> {
+        return MoyaProvider<T>(plugins: [ESMoyaLoggingPlugin()])
+    }
+    
+    /// 인증 Provider (AuthInterceptor + 로깅)
+    private func authProvider<T: TargetType>() -> MoyaProvider<T> {
+        return MoyaProvider<T>(
+            session: Session(interceptor: AuthInterceptor.shared),
+            plugins: [ESMoyaLoggingPlugin()]
+        )
+    }
+    
+    // MARK: - Request Method
+    
+    /// Generic 네트워크 요청 메서드
+    func request<T: TargetType, R: Codable>(
+        _ target: T,
+        responseType: R.Type,
+        useAuth: Bool = false,
+        completion: @escaping (Result<R, Error>) -> Void
+    ) {
+        let provider: MoyaProvider<T> = useAuth ? authProvider() : defaultProvider()
+        
+        provider.request(target) { result in
+            switch result {
+            case .success(let response):
+                do {
+                    let baseResponse = try response.map(BaseResponse<R>.self)
+                    
+                    if baseResponse.isSuccess {
+                        if let data = baseResponse.result {
+                            completion(.success(data))
+                        } else {
+                            if R.self == Bool.self {
+                                guard let successValue = true as? R else {
+                                    completion(.failure(NetworkError.decodingError(NSError(domain: "NetworkService", code: -1, userInfo: [NSLocalizedDescriptionKey: "Bool 타입 변환에 실패했습니다."]))))
+                                    return
+                                }
+                                completion(.success(successValue))
+                            } else {
+                                completion(.failure(NetworkError.noData(code: baseResponse.code)))
+                            }
+                        }
+                    } else {
+                        completion(.failure(NetworkError.serverError(code: baseResponse.code, message: baseResponse.message)))
+                    }
+                } catch {
+                    completion(.failure(NetworkError.decodingError(error)))
+                }
+                
+            case .failure(let error):
+                completion(.failure(NetworkError.underlying(error)))
+            }
+        }
+    }
+}

EATSSU/App/Sources/Presentation/Auth/ViewController/LoginViewController.swift

@@ -19,8 +19,6 @@ final class LoginViewController: BaseViewController {
 
     public static let isVacationPeriod = false
     public var toastMessage: String?
-    private let authProvider = MoyaProvider<AuthRouter>(session: Session(interceptor: AuthInterceptor.shared))
-    private let myProvider = MoyaProvider<MyRouter>(session: Session(interceptor: AuthInterceptor.shared))
 
     // MARK: - UI Components
 
@@ -211,18 +209,25 @@ extension LoginViewController {
 
     /// 카카오 로그인을 위해 서버에 이메일/아이디를 보내는 요청
     private func postKakaoLoginRequest(email: String, id: String) {
-        authProvider.request(.kakaoLogin(param: KakaoLoginRequest(email: email,
-                                                                  providerId: id))) { [weak self] result in
+        NetworkService.shared.request(
+            AuthRouter.kakaoLogin(param: KakaoLoginRequest(email: email, providerId: id)),
+            responseType: SignResponse.self,
+            useAuth: true
+        ) { [weak self] result in
             guard let self else { return }
+            
             switch result {
-            case let .success(moyaResponse):
+            case .success(let signData):
                 #if DEBUG
-                    print("Kakao login response status code: \(moyaResponse.statusCode)")
+                    print("Kakao login success")
                 #endif
-                handleLoginSuccess(moyaResponse: moyaResponse, accountType: .kakao)
-
-            case let .failure(error):
-                presentBottomAlert(error.localizedDescription)
+                storeTokensAndPrintDebugLogs(accessToken: signData.accessToken,
+                                            refreshToken: signData.refreshToken)
+                _ = UserInfoManager.shared.createUserInfo(accountType: .kakao)
+                getMyInfo()
+                
+            case .failure(let error):
+                presentBottomAlert("카카오톡으로 생성된 계정입니다.")
                 #if DEBUG
                     print(error.localizedDescription)
                 #endif
@@ -232,17 +237,25 @@ extension LoginViewController {
 
     /// 전달받은 identity token으로 Apple 로그인 요청
     private func postAppleLoginRequest(token: String) {
-        authProvider.request(.appleLogin(param: AppleLoginRequest(identityToken: token))) { [weak self] result in
+        NetworkService.shared.request(
+            AuthRouter.appleLogin(param: AppleLoginRequest(identityToken: token)),
+            responseType: SignResponse.self,
+            useAuth: true
+        ) { [weak self] result in
             guard let self else { return }
+            
             switch result {
-            case let .success(moyaResponse):
+            case .success(let signData):
                 #if DEBUG
-                    print("Apple 로그인 서버 응답코드: \(moyaResponse.statusCode)")
+                    print("Apple 로그인 성공")
                 #endif
-                handleLoginSuccess(moyaResponse: moyaResponse, accountType: .apple)
-
-            case let .failure(error):
-                presentBottomAlert(error.localizedDescription)
+                storeTokensAndPrintDebugLogs(accessToken: signData.accessToken,
+                                            refreshToken: signData.refreshToken)
+                _ = UserInfoManager.shared.createUserInfo(accountType: .apple)
+                getMyInfo()
+                
+            case .failure(let error):
+                presentBottomAlert("Apple로 생성된 계정입니다.")
                 #if DEBUG
                     print(error.localizedDescription)
                 #endif
@@ -252,25 +265,20 @@ extension LoginViewController {
 
     /// 서버에서 현재 유저 정보를 조회
     private func getMyInfo() {
-        myProvider.request(.myInfo) { [weak self] result in
+        NetworkService.shared.request(
+            MyRouter.myInfo,
+            responseType: MyInfoResponse.self,
+            useAuth: true
+        ) { [weak self] result in
             guard let self else { return }
+            
             switch result {
-            case let .success(moyaResponse):
-                do {
-                    let responseData = try moyaResponse.map(BaseResponse<MyInfoResponse>.self)
-                    guard let responseData = responseData.result else {
-                        return
-                    }
-                    // 디버그 모드일 때만 받아온 유저 정보를 출력합니다.
-//                    #if DEBUG
-                    print("현재 로그인 정보: \(responseData)")
-//                    #endif
-                    handleNicknameCheck(info: responseData)
-                } catch {
-                    print(error.localizedDescription)
-                }
-            case let .failure(error):
-                print(error.localizedDescription)
+            case .success(let myInfo):
+                print("현재 로그인 정보: \(myInfo)")
+                handleNicknameCheck(info: myInfo)
+                
+            case .failure(let error):
+                print("내 정보 조회 실패: \(error.localizedDescription)")
             }
         }
     }