refactor, feat: 네트워크 리팩토링, 점검 페이지 구현

Koin/Apps/SceneDelegate.swift

@@ -10,7 +10,16 @@ import UIKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
-    var urlParameters: [String: String]?
+    private var isPresentingErrorViewController = false
+
+    override init() {
+        super.init()
+        NotificationCenter.default.addObserver(self, selector: #selector(presentErrorViewController), name: NSNotification.Name("ServerError"), object: nil)
+    }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
 
     func scene(_ scene: UIScene,
                willConnectTo session: UISceneSession,
@@ -115,5 +124,33 @@ extension SceneDelegate {
         return viewController
     }
 
-
+    @objc private func presentErrorViewController() {
+
+        guard isPresentingErrorViewController == false else {
+            return
+        }
+        isPresentingErrorViewController = true
+
+        if let navigationController = window?.rootViewController as? UINavigationController {
+
+            let homeViewController = makeHomeViewController()
+            let completion: ()->Void = { [weak self] in
+                navigationController.setViewControllers([homeViewController], animated: false)
+                navigationController.dismiss(animated: true) {
+                    self?.isPresentingErrorViewController = false
+                }
+            }
+            let errorViewController = ErrorViewController(completion: completion).then {
+                $0.modalPresentationStyle = .fullScreen
+            }
+
+            if let _ = navigationController.presentedViewController {
+                navigationController.dismiss(animated: true) {
+                    navigationController.present(errorViewController, animated: true)
+                }
+            } else {
+                navigationController.present(errorViewController, animated: true)
+            }
+        }
+    }
 }

Koin/Core/Workers/KeychainWorker.swift

@@ -19,58 +19,89 @@ final class KeychainWorker {
     }
     static let shared = KeychainWorker()
 
-    private init() { }
+    private init() {}
+    private var keychains: [TokenType: String?] = [:]
+    private let lock = NSLock()
 
     func create(key: TokenType, token: String) {
+        lock.lock()
+        defer {
+            lock.unlock()
+        }
+
         let query: NSDictionary = [
             kSecClass: kSecClassGenericPassword,
             kSecAttrAccount: keyType(key: key),
             kSecValueData: token.data(using: .utf8, allowLossyConversion: false) as Any
         ]
         SecItemDelete(query)
+        keychains.removeValue(forKey: key)
 
         let status = SecItemAdd(query, nil)
-        if status != errSecSuccess {
-            print("Failed to save token, status code: \(status)")
+        if status == errSecSuccess {
+            keychains.updateValue(token, forKey: key)
+        } else {
+            print("Failed to save \(key) token,", SecCopyErrorMessageString(status, nil) ?? "")
         }
     }
 
     func read(key: TokenType) -> String? {
+        lock.lock()
+        defer {
+            lock.unlock()
+        }
+
+        if let token: String? = keychains[key] {
+            return token
+        }
+
         let query: NSDictionary = [
             kSecClass: kSecClassGenericPassword,
             kSecAttrAccount: keyType(key: key),
             kSecReturnData: kCFBooleanTrue as Any,
             kSecMatchLimit: kSecMatchLimitOne
         ]
-
         var dataTypeRef: AnyObject?
         let status = SecItemCopyMatching(query, &dataTypeRef)
 
-        if status == errSecSuccess {
-            if let retrievedData: Data = dataTypeRef as? Data {
-                let value = String(data: retrievedData, encoding: String.Encoding.utf8)
-                return value
-            } else { return nil }
+        if status == errSecSuccess,
+           let retrievedData: Data = dataTypeRef as? Data,
+           let value = String(data: retrievedData, encoding: String.Encoding.utf8) {
+            keychains.updateValue(value, forKey: key)
+            return value
+        } else if status == errSecItemNotFound {
+            keychains.updateValue(nil, forKey: key)
+            return nil
         } else {
-            print("failed to loading, status code = \(status)")
+            print("Failed to load \(key) token,", SecCopyErrorMessageString(status, nil) ?? "")
             return nil
         }
     }
 
     func delete(key: TokenType) {
+        lock.lock()
+        defer {
+            lock.unlock()
+        }
+
+        keychains.removeValue(forKey: key)
+
         let query: NSDictionary = [
             kSecClass: kSecClassGenericPassword,
             kSecAttrAccount: keyType(key: key)
         ]
         let status = SecItemDelete(query)
-          if status == errSecSuccess {
-              print("Item successfully deleted")
-          } else if status == errSecItemNotFound {
-              print("Item not found")
-          } else {
-              print("Error deleting the item, status code: \(status)")
-          }
+        if status == errSecSuccess {
+            return
+        } else if status == errSecItemNotFound {
+            print("\(key) token not found")
+        } else {
+            print("Error deleting \(key) token", SecCopyErrorMessageString(status, nil) ?? "")
+        }
     }
+}
+
+extension KeychainWorker {
 
     private func keyType(key: TokenType) -> String {
         let keyType: String
@@ -85,5 +116,4 @@ final class KeychainWorker {
         }
         return keyType
     }
-
 }

Koin/Data/DTOs/Decodable/ErrorResponseDto.swift

@@ -0,0 +1,19 @@
+//
+//  ErrorResponseDto.swift
+//  koin
+//
+//  Created by 김나훈 on 3/18/24.
+//
+
+import Foundation
+
+struct ErrorResponseDto: Decodable {
+    let code: String
+    let message: String
+}
+
+extension ErrorResponseDto {
+    func toDomain(withStatusCode statusCode: Int) -> ErrorResponse {
+        return ErrorResponse(statusCode: statusCode, code: self.code, message: self.message)
+    }
+}

Koin/Data/Repository/DefaultAbTestRepository.swift

@@ -16,6 +16,6 @@ final class DefaultAbTestRepository: AbTestRepository {
     }
 
     func assignAbTest(requestModel: AssignAbTestRequest) -> AnyPublisher<AssignAbTestResponse, ErrorResponse> {
-        return service.assignAbTest(requestModel: requestModel, retry: false)
+        return service.assignAbTest(requestModel: requestModel)
     }
 }

Koin/Data/Repository/DefaultBusRepository.swift

@@ -15,27 +15,27 @@ final class DefaultBusRepository: BusRepository {
         self.service = service
     }
 
-    func searchBusInformation(requestModel: SearchBusInfoRequest) -> AnyPublisher<BusSearchDto, Error> {
+    func searchBusInformation(requestModel: SearchBusInfoRequest) -> AnyPublisher<BusSearchDto, ErrorResponse> {
         return service.searchBusInformation(requestModel: requestModel)
     }
 
-    func fetchShuttleRouteList() -> AnyPublisher<ShuttleRouteDto, Error> {
+    func fetchShuttleRouteList() -> AnyPublisher<ShuttleRouteDto, ErrorResponse> {
         return service.fetchShuttleRouteList()
     }
 
-    func fetchExpressBusTimetableList(requestModel: FetchBusTimetableRequest) -> AnyPublisher<ExpressTimetableDto, Error> {
+    func fetchExpressBusTimetableList(requestModel: FetchBusTimetableRequest) -> AnyPublisher<ExpressTimetableDto, ErrorResponse> {
         return service.fetchExpressTimetableList(requestModel: requestModel)
     }
 
-    func fetchCityBusTimetableList(requestModel: FetchCityBusTimetableRequest) -> AnyPublisher<CityBusTimetableDto, Error> {
+    func fetchCityBusTimetableList(requestModel: FetchCityBusTimetableRequest) -> AnyPublisher<CityBusTimetableDto, ErrorResponse> {
         return service.fetchCityTimetableList(requestModel: requestModel)
     }
 
-    func fetchEmergencyNotice() -> AnyPublisher<BusNoticeDto, Error> {
+    func fetchEmergencyNotice() -> AnyPublisher<BusNoticeDto, ErrorResponse> {
         return service.fetchEmergencyNotice()
     }
 
-    func fetchShuttleBusTimetable(id: String) -> AnyPublisher<ShuttleBusTimetable, Error> {
+    func fetchShuttleBusTimetable(id: String) -> AnyPublisher<ShuttleBusTimetable, ErrorResponse> {
         service.fetchShuttleBusTimetable(id: id)
             .map { $0.toDomain() }
             .eraseToAnyPublisher()

Koin/Data/Repository/DefaultCoreRepository.swift

@@ -15,18 +15,18 @@ final class DefaultCoreRepository: CoreRepository {
         self.service = service
     }
 
-    func fetchVersion() -> AnyPublisher<ForceUpdateResponse, Error> {
+    func fetchVersion() -> AnyPublisher<ForceUpdateResponse, ErrorResponse> {
         return service.fetchVersion()
     }
 
-    func fetBanner() -> AnyPublisher<BannerDto, Error> {
+    func fetBanner() -> AnyPublisher<BannerDto, ErrorResponse> {
         return service.fetchBanner()
     }
-    func fetchClubCategories() -> AnyPublisher<ClubCategoriesDto, Error> {
+    func fetchClubCategories() -> AnyPublisher<ClubCategoriesDto, ErrorResponse> {
         return service.fetchClubCategories()
     }
 
-    func fetchHotClubs() -> AnyPublisher<HotClubDto, Error> {
+    func fetchHotClubs() -> AnyPublisher<HotClubDto, ErrorResponse> {
         return service.fetchHotClubs()
     }
 

Koin/Data/Repository/DefaultDiningRepository.swift

@@ -17,10 +17,10 @@ final class DefaultDiningRepository: DiningRepository {
     }
 
     func fetchDiningList(requestModel: FetchDiningListRequest) -> AnyPublisher<[DiningDto], ErrorResponse> {
-        return diningService.fetchDiningList(requestModel: requestModel, retry: false)
+        return diningService.fetchDiningList(requestModel: requestModel)
     }
 
-    func fetchCoopShopList() -> AnyPublisher<CoopShopDto, Error> {
+    func fetchCoopShopList() -> AnyPublisher<CoopShopDto, ErrorResponse> {
         return diningService.fetchCoopShopList()
     }
 

Koin/Data/Repository/DefaultLandRepository.swift

@@ -15,11 +15,11 @@ final class DefaultLandRepository: LandRepository {
         self.service = service
     }
 
-    func fetchLandList() -> AnyPublisher<LandDto, Error> {
+    func fetchLandList() -> AnyPublisher<LandDto, ErrorResponse> {
         return service.fetchLandList()
     }
 
-    func fetchLandDetail(requestModel: FetchLandDetailRequest) -> AnyPublisher<LandDetailDto, Error> {
+    func fetchLandDetail(requestModel: FetchLandDetailRequest) -> AnyPublisher<LandDetailDto, ErrorResponse> {
         return service.fetchLandDetail(requestModel: requestModel)
     }
 

Koin/Data/Repository/DefaultLostItemRepository.swift

@@ -16,13 +16,13 @@ final class DefaultLostItemRepository: LostItemRepository {
         self.service = service
     }
 
-    func fetchLostItemList(requestModel: FetchLostItemListRequest) -> AnyPublisher<LostItemList, any Error> {
+    func fetchLostItemList(requestModel: FetchLostItemListRequest) -> AnyPublisher<LostItemList, ErrorResponse> {
         return service.fetchLostItemList(requestModel: requestModel)
             .map { $0.toDomain() }
             .eraseToAnyPublisher()
     }
 
-    func fetchLostItemData(id: Int) -> AnyPublisher<LostItemData, Error> {
+    func fetchLostItemData(id: Int) -> AnyPublisher<LostItemData, ErrorResponse> {
         return service.fetchLostItemData(id: id)
             .map { $0.toDomain() }
             .eraseToAnyPublisher()
@@ -32,7 +32,7 @@ final class DefaultLostItemRepository: LostItemRepository {
         return service.changeLostItemState(id: id)
     }
 
-    func deleteLostItem(id: Int) -> AnyPublisher<Void, Error> {
+    func deleteLostItem(id: Int) -> AnyPublisher<Void, ErrorResponse> {
         return service.deleteLostItem(id: id)
     }
 
@@ -42,7 +42,7 @@ final class DefaultLostItemRepository: LostItemRepository {
             .eraseToAnyPublisher()
     }
 
-    func fetchLostItemStats() -> AnyPublisher<LostItemStats, Error> {
+    func fetchLostItemStats() -> AnyPublisher<LostItemStats, ErrorResponse> {
         return service.fetchLostItemStats()
             .map { $0.toDomain() }
             .eraseToAnyPublisher()

Koin/Data/Repository/DefaultNoticeListRepository.swift

@@ -15,8 +15,8 @@ final class DefaultNoticeListRepository: NoticeListRepository {
         self.service = service
     }
 
-    func fetchLostItemArticles(requestModel: FetchLostItemsRequest) -> AnyPublisher<NoticeListDto, Error> {
-        service.fetchLostItemArticles(requestModel: requestModel, retry: false)
+    func fetchLostItemArticles(requestModel: FetchLostItemsRequest) -> AnyPublisher<NoticeListDto, ErrorResponse> {
+        service.fetchLostItemArticles(requestModel: requestModel)
     }
 
 
@@ -33,27 +33,27 @@ final class DefaultNoticeListRepository: NoticeListRepository {
     }
 
     func fetchLostItem(id: Int) -> AnyPublisher<LostArticleDetailDto, ErrorResponse> {
-        service.fetchLostItem(id: id, retry: false)
+        service.fetchLostItem(id: id)
     }
 
 
-    func fetchNoticeArticles(requestModel: FetchNoticeArticlesRequest) -> AnyPublisher<NoticeListDto, Error> {
+    func fetchNoticeArticles(requestModel: FetchNoticeArticlesRequest) -> AnyPublisher<NoticeListDto, ErrorResponse> {
         return service.fetchNoticeArticles(requestModel: requestModel)
     }
 
-    func fetchLostItemList(requestModel: FetchNoticeArticlesRequest) -> AnyPublisher<NoticeListDto, Error> {
+    func fetchLostItemList(requestModel: FetchNoticeArticlesRequest) -> AnyPublisher<NoticeListDto, ErrorResponse> {
         return service.fetchLostItemList(requestModel: requestModel)
     }
 
-    func searchNoticeArticle(requestModel: SearchNoticeArticleRequest) -> AnyPublisher<NoticeListDto, Error> {
+    func searchNoticeArticle(requestModel: SearchNoticeArticleRequest) -> AnyPublisher<NoticeListDto, ErrorResponse> {
         return service.searchNoticeArticle(requestModel: requestModel)
     }
 
-    func fetchNoticeData(requestModel: FetchNoticeDataRequest) -> AnyPublisher<NoticeArticleDto, Error> {
+    func fetchNoticeData(requestModel: FetchNoticeDataRequest) -> AnyPublisher<NoticeArticleDto, ErrorResponse> {
         return service.fetchNoticeData(requestModel: requestModel)
     }
 
-    func fetchHotNoticeArticle() -> AnyPublisher<[NoticeArticleDto], Error> {
+    func fetchHotNoticeArticle() -> AnyPublisher<[NoticeArticleDto], ErrorResponse> {
         return service.fetchHotNoticeArticles()
     }
 
@@ -69,7 +69,7 @@ final class DefaultNoticeListRepository: NoticeListRepository {
         return service.fetchMyNotificationKeyword()
     }
 
-    func fetchRecommendedKeyword(count: Int?) -> AnyPublisher<NoticeRecommendedKeywordDto, Error> {
+    func fetchRecommendedKeyword(count: Int?) -> AnyPublisher<NoticeRecommendedKeywordDto, ErrorResponse> {
         return service.fetchRecommendedKeyword(count: count)
     }