홈 및 알림 화면 개선

SOOUM/SOOUM/App/AppDelegate.swift

@@ -16,6 +16,7 @@ import FirebaseMessaging
 import RxSwift
 
 import CocoaLumberjack
+import Kingfisher
 
 
 @main
@@ -45,6 +46,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Initalize token
         self.initializeTokenWhenFirstLaunch()
 
+        // Set Kinfisher caching limit
+        self.setupKingfisherCacheLimit()
+
         FirebaseApp.configure()
         // 파이어베이스 Meesaging 설정
         Messaging.messaging().delegate = self
@@ -188,6 +192,19 @@ extension AppDelegate {
         AuthKeyChain.shared.delete(.refreshToken)
     }
 
+    private func setupKingfisherCacheLimit() {
+        let cache = ImageCache.default
+
+        /// 500MB
+        let diskLimit: UInt = 500 * 1024 * 1024
+        cache.diskStorage.config.sizeLimit = diskLimit
+        /// 디스크 캐시는 일주일 제한
+        cache.diskStorage.config.expiration = .days(7)
+        /// 100MB
+        let memoryLimit: Int = 100 * 1024 * 1024
+        cache.memoryStorage.config.totalCostLimit = memoryLimit
+    }
+
     private func setupOnboardingWhenTransferSuccessed(_ userInfo: [AnyHashable: Any]?) {
         // guard let infoDic = userInfo as? [String: Any] else { return }
 

SOOUM/SOOUM/Data/Managers/NetworkManager/DefinedError.swift

@@ -17,6 +17,7 @@ enum DefinedError: Error, LocalizedError {
     case forbidden
     case notFound
     case teapot
+    case invlid
     case locked
     case invalidMethod(HTTPMethod)
     case unknown(Int)
@@ -35,6 +36,8 @@ enum DefinedError: Error, LocalizedError {
             return .notFound
         case 418:
             return .teapot
+        case 422:
+            return .invlid
         case 423:
             return .locked
         default:
@@ -56,6 +59,8 @@ enum DefinedError: Error, LocalizedError {
             return "Not Found: HTTP 404 received"
         case .teapot:
             return "Stop using RefreshToken: HTTP 418 received."
+        case .invlid:
+            return "Invlid Image: HTTP 422 received."
         case .locked:
             return "LOCKED: HTTP 423 received."
         case let .invalidMethod(httpMethod):
@@ -73,6 +78,7 @@ enum DefinedError: Error, LocalizedError {
         case .forbidden: 403
         case .notFound: 404
         case .teapot: 418
+        case .invlid: 422
         case .locked: 423
         case .invalidMethod: -99
         case let .unknown(statusCode): statusCode

SOOUM/SOOUM/Data/Managers/NetworkManager/NetworkManagerConfiguration.swift

@@ -38,10 +38,15 @@ struct NetworkManagerConfiguration: ManagerConfiguration {
             self.sessionDelegate = sessionDelegate
             self.sessionDelegateQueue = sessionDelegateQueue
 
+            let formatter = DateFormatter()
+            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
+            formatter.locale = .Korea
+            formatter.timeZone = .Korea
+
             self.decoder = JSONDecoder()
-            self.decoder.dateDecodingStrategy = .iso8601
+            self.decoder.dateDecodingStrategy = .formatted(formatter)
             self.encoder = JSONEncoder()
-            self.encoder.dateEncodingStrategy = .iso8601
+            self.encoder.dateEncodingStrategy = .formatted(formatter)
         }
     }
 

SOOUM/SOOUM/Data/Models/Responses/BlockedNotificationInfoResponse.swift

@@ -7,7 +7,7 @@
 
 import Alamofire
 
-struct BlockedNotificationInfoResponse {
+struct BlockedNotificationInfoResponse: Hashable, Equatable {
 
     let notificationInfo: CommonNotificationInfo
     let blockExpirationDateTime: Date

SOOUM/SOOUM/Data/Models/Responses/CompositeNotificationInfoResponse.swift

@@ -0,0 +1,20 @@
+//
+//  CompositeNotificationInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 9/26/25.
+//
+
+import Alamofire
+
+struct CompositeNotificationInfoResponse: Decodable {
+
+    let notificationInfo: [CompositeNotificationInfo]
+}
+
+extension CompositeNotificationInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> CompositeNotificationInfoResponse {
+        CompositeNotificationInfoResponse(notificationInfo: [])
+    }
+}

SOOUM/SOOUM/Data/Models/Responses/DeleteNotificationInfoResponse.swift → SOOUM/SOOUM/Data/Models/Responses/DeletedNotificationInfoResponse.swift

@@ -7,19 +7,19 @@
 
 import Alamofire
 
-struct DeleteNotificationInfoResponse {
+struct DeletedNotificationInfoResponse: Hashable, Equatable {
 
     let notificationInfo: CommonNotificationInfo
 }
 
-extension DeleteNotificationInfoResponse: EmptyResponse {
+extension DeletedNotificationInfoResponse: EmptyResponse {
 
-    static func emptyValue() -> DeleteNotificationInfoResponse {
-        DeleteNotificationInfoResponse(notificationInfo: CommonNotificationInfo.defaultValue)
+    static func emptyValue() -> DeletedNotificationInfoResponse {
+        DeletedNotificationInfoResponse(notificationInfo: CommonNotificationInfo.defaultValue)
     }
 }
 
-extension DeleteNotificationInfoResponse: Decodable {
+extension DeletedNotificationInfoResponse: Decodable {
 
     init(from decoder: any Decoder) throws {
         let singleContainer = try decoder.singleValueContainer()

SOOUM/SOOUM/Data/Models/Responses/FollowNotificationInfoResponse.swift

@@ -0,0 +1,44 @@
+//
+//  FollowNotificationInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 9/26/25.
+//
+
+import Alamofire
+
+struct FollowNotificationInfoResponse: Hashable, Equatable {
+
+    let notificationInfo: CommonNotificationInfo
+    let nickname: String
+    let userId: String
+}
+
+extension FollowNotificationInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> FollowNotificationInfoResponse {
+        FollowNotificationInfoResponse(
+            notificationInfo: CommonNotificationInfo.defaultValue,
+            nickname: "",
+            userId: ""
+        )
+    }
+}
+
+extension FollowNotificationInfoResponse: Decodable {
+
+    enum CodingKeys: CodingKey {
+        case notificationInfo
+        case nickname
+        case userId
+    }
+
+    init(from decoder: any Decoder) throws {
+        let singleContainer = try decoder.singleValueContainer()
+        self.notificationInfo = try singleContainer.decode(CommonNotificationInfo.self)
+
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.nickname = try container.decode(String.self, forKey: .nickname)
+        self.userId = String(try container.decode(Int64.self, forKey: .userId))
+    }
+}

SOOUM/SOOUM/Data/Models/Responses/HomeCardInfoResponse.swift

@@ -0,0 +1,32 @@
+//
+//  HomeCardInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 9/28/25.
+//
+
+import Alamofire
+
+struct HomeCardInfoResponse {
+
+    let cardInfos: [BaseCardInfo]
+}
+
+extension HomeCardInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> HomeCardInfoResponse {
+        HomeCardInfoResponse(cardInfos: [])
+    }
+}
+
+extension HomeCardInfoResponse: Decodable {
+
+    enum CodingKeys: String, CodingKey {
+        case cardInfos
+    }
+
+    init(from decoder: any Decoder) throws {
+        let singleContainer = try decoder.singleValueContainer()
+        self.cardInfos = try singleContainer.decode([BaseCardInfo].self)
+    }
+}

SOOUM/SOOUM/Data/Models/Responses/NoticeInfoResponse.swift

@@ -0,0 +1,32 @@
+//
+//  NoticeInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 9/26/25.
+//
+
+import Alamofire
+
+struct NoticeInfoResponse {
+
+    let noticeInfos: [NoticeInfo]
+}
+
+extension NoticeInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> NoticeInfoResponse {
+        NoticeInfoResponse(noticeInfos: [])
+    }
+}
+
+extension NoticeInfoResponse: Decodable {
+
+    enum CodingKeys: String, CodingKey {
+        case noticeInfos
+    }
+
+    init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.noticeInfos = try container.decode([NoticeInfo].self, forKey: .noticeInfos)
+    }
+}

SOOUM/SOOUM/Data/Models/Responses/NotificationInfoResponse.swift

@@ -7,7 +7,7 @@
 
 import Alamofire
 
-struct NotificationInfoResponse {
+struct NotificationInfoResponse: Hashable, Equatable {
 
     let notificationInfo: CommonNotificationInfo
     let targetCardId: String
@@ -38,7 +38,7 @@ extension NotificationInfoResponse: Decodable {
         self.notificationInfo = try singleContainer.decode(CommonNotificationInfo.self)
 
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.targetCardId = String(try container.decode(Int.self, forKey: .targetCardId))
+        self.targetCardId = String(try container.decode(Int64.self, forKey: .targetCardId))
         self.nickName = try container.decode(String.self, forKey: .nickName)
     }
 }

SOOUM/SOOUM/Data/Repositories/CardRepositoryImpl.swift

@@ -0,0 +1,34 @@
+//
+//  CardRepositoryImpl.swift
+//  SOOUM
+//
+//  Created by 오현식 on 9/28/25.
+//
+
+import Foundation
+
+import RxSwift
+
+class CardRepositoryImpl: CardRepository {
+
+    private let remoteDataSource: CardRemoteDataSource
+
+    init(remoteDataSource: CardRemoteDataSource) {
+        self.remoteDataSource = remoteDataSource
+    }
+
+    func latestCard(lastId: String?, latitude: String?, longitude: String?) -> Observable<HomeCardInfoResponse> {
+
+        return self.remoteDataSource.latestCard(lastId: lastId, latitude: latitude, longitude: longitude)
+    }
+
+    func popularCard(latitude: String?, longitude: String?) -> Observable<HomeCardInfoResponse> {
+
+        return self.remoteDataSource.popularCard(latitude: latitude, longitude: longitude)
+    }
+
+    func distanceCard(lastId: String?, latitude: String, longitude: String, distanceFilter: String) -> Observable<HomeCardInfoResponse> {
+
+        return self.remoteDataSource.distanceCard(lastId: lastId, latitude: latitude, longitude: longitude, distanceFilter: distanceFilter)
+    }
+}

SOOUM/SOOUM/Data/Repositories/NotificationRepositoryImpl.swift

@@ -17,48 +17,23 @@ class NotificationRepositoryImpl: NotificationRepository {
         self.remoteDataSource = remoteDataSource
     }
 
-    func unreadNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
+    func unreadNotifications(lastId: String?) -> Observable<CompositeNotificationInfoResponse> {
 
         return self.remoteDataSource.unreadNotifications(lastId: lastId)
     }
 
-    func unreadCardNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
-
-        return self.remoteDataSource.unreadCardNotifications(lastId: lastId)
-    }
-
-    func unreadFollowNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
-
-        return self.remoteDataSource.unreadFollowNotifications(lastId: lastId)
-    }
-
-    func unreadNoticeNoticeNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
-
-        return self.remoteDataSource.unreadNoticeNoticeNotifications(lastId: lastId)
-    }
-
-    func readNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
+    func readNotifications(lastId: String?) -> Observable<CompositeNotificationInfoResponse> {
 
         return self.remoteDataSource.readNotifications(lastId: lastId)
     }
 
-    func readCardNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
-
-        return self.remoteDataSource.readCardNotifications(lastId: lastId)
-    }
-
-    func readFollowNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
-
-        return self.remoteDataSource.readFollowNotifications(lastId: lastId)
-    }
-
-    func readNoticeNoticeNotifications(lastId: String?) -> Observable<[NotificationInfoResponse]> {
+    func requestRead(notificationId: String) -> Observable<Int> {
 
-        return self.remoteDataSource.readNoticeNoticeNotifications(lastId: lastId)
+        return self.remoteDataSource.requestRead(notificationId: notificationId)
     }
 
-    func requestRead(notificationId: String) -> Observable<Int> {
+    func notices(lastId: String?) -> Observable<NoticeInfoResponse> {
 
-        return self.remoteDataSource.requestRead(notificationId: notificationId)
+        return self.remoteDataSource.notices(lastId: lastId)
     }
 }