From bba3139291818755f046799e88a65c2046e5900a Mon Sep 17 00:00:00 2001 From: Zoe Date: Sat, 20 Jul 2024 00:25:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Fix/#375]=20=EC=83=81=ED=83=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift | 6 +++--- YELLO-iOS/YELLO-iOS/Network/Base/NetworkResult.swift | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift b/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift index 8ffdb5bb..4b8c09e1 100644 --- a/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift +++ b/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift @@ -55,9 +55,9 @@ class APIRequestLoader { private func judgeStatus(by statusCode: Int, _ data: Data, type: M.Type) -> NetworkResult { switch statusCode { - case 200...299: return isValidData(data: data, type: M.self) - case 400, 402...499: return isValidData(data: data, type: M.self) - case 500: return .serverErr + case 200...299, 403: return isValidData(data: data, type: M.self) + case 400, 405...499: return .requestErr(statusCode: statusCode) + case 500: return .serverErr(statusCode: statusCode) case 401: return .failure default: return .networkErr } diff --git a/YELLO-iOS/YELLO-iOS/Network/Base/NetworkResult.swift b/YELLO-iOS/YELLO-iOS/Network/Base/NetworkResult.swift index f6f989d7..75595081 100644 --- a/YELLO-iOS/YELLO-iOS/Network/Base/NetworkResult.swift +++ b/YELLO-iOS/YELLO-iOS/Network/Base/NetworkResult.swift @@ -9,9 +9,9 @@ import Foundation enum NetworkResult { case success(T) // 서버 통신 성공 - case requestErr(T) // 요청에러 발생 + case requestErr(statusCode: Int) // 요청에러 발생 case pathErr // 경로 에러 - case serverErr // 서버 내부 에러 + case serverErr(statusCode: Int) // 서버 내부 에러 case networkErr // 네트워크 연결 실패 case failure // 실패 } From a2520c91f2130dd85fa7b8df8ba82774d298b85c Mon Sep 17 00:00:00 2001 From: Zoe Date: Sat, 20 Jul 2024 00:26:20 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Feat/#375]=20=EC=B6=94=EC=B2=9C=EC=9D=B8?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=98=A4=EB=A5=98=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=20=EC=8B=9C=20code=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewController/RecommendIdViewController.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Onboarding/ViewController/RecommendIdViewController.swift b/YELLO-iOS/YELLO-iOS/Presentation/Onboarding/ViewController/RecommendIdViewController.swift index 64d02943..8b936f9a 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Onboarding/ViewController/RecommendIdViewController.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Onboarding/ViewController/RecommendIdViewController.swift @@ -169,6 +169,14 @@ class RecommendIdViewController: OnboardingBaseViewController { Amplitude.instance().setUserProperties(userProperties) self.didPostUserInfo = true self.navigationController?.pushViewController(pushViewController, animated: false) + case .requestErr(let statusCode): + self.view.showToast(message: "오류가 발생했습니다. code: \(statusCode)", at: 180.adjusted) + case .serverErr(let statusCode): + self.view.showToast(message: "오류가 발생했습니다. code: \(statusCode)", at: 180.adjusted) + let sceneDelegate = UIApplication.shared.connectedScenes.first?.delegate as! SceneDelegate + kakaoLoginViewController.isFromOnboarding = true + sceneDelegate.window?.rootViewController = UINavigationController(rootViewController: kakaoLoginViewController) + return default: self.isFail = true self.view.showToast(message: "오류가 발생했습니다. 잠시후 다시 시도해주세요.") From 872782bf1a06e3b448e75fb252821aaa7a26d9ea Mon Sep 17 00:00:00 2001 From: Zoe Date: Sat, 20 Jul 2024 00:35:33 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Fix/#375]=20status=20Code=20=EB=B2=94?= =?UTF-8?q?=EC=9C=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift b/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift index 4b8c09e1..7c8ec973 100644 --- a/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift +++ b/YELLO-iOS/YELLO-iOS/Network/Base/APIRequestLoader.swift @@ -55,8 +55,8 @@ class APIRequestLoader { private func judgeStatus(by statusCode: Int, _ data: Data, type: M.Type) -> NetworkResult { switch statusCode { - case 200...299, 403: return isValidData(data: data, type: M.self) - case 400, 405...499: return .requestErr(statusCode: statusCode) + case 200...299, 403, 404: return isValidData(data: data, type: M.self) + case 400, 402, 405...499: return .requestErr(statusCode: statusCode) case 500: return .serverErr(statusCode: statusCode) case 401: return .failure default: return .networkErr