[#60] 수정된 알림 조회 response 적용 및 알림 조회 수정

Funital · Funital · commit f2237cda11ff · 2026-02-07T02:30:02.000+09:00
#60
diff --git a/Codive/Features/Notification/Data/DTOs/NotificationDTO.swift b/Codive/Features/Notification/Data/DTOs/NotificationDTO.swift
@@ -7,51 +7,48 @@
 
 import Foundation
 
+enum NotificationType: String {
+    case follow = "FOLLOW"
+    case followRequest = "FOLLOW_REQUEST"
+    case comment = "COMMENT"
+    case reply = "REPLY"
+    case like = "LIKE"
+    case temperatureDaily = "TEMPERATURE_DAILY"
+    case unknown = "UNKNOWN"
+}
+
+enum ReadStatus: String {
+    case read = "READ"
+    case notRead = "NOT_READ"
+}
+
+enum NotificationRedirectType: String {
+    case none = "NONE"
+    case historyRedirect = "HISTORY_REDIRECT"
+    case memberRedirect = "MEMBER_REDIRECT"
+}
+
+// MARK: - DTO
+
 /// 알림 목록 조회
 struct NotificationListResponseDTO {
     let content: [NotificationListResponseItem]
     let isLast: Bool
 }
 
+struct NotificationActionDTO {
+    let redirectType: NotificationRedirectType
+    let redirectInfo: String
+}
+
 struct NotificationListResponseItem {
     let notificationId: Int64
     let notificationImageUrl: String
     let notificationContent: String
-    let redirectInfo: String
-    let redirectType: String
-    let readStatus: String
+    let notificationType: NotificationType
+    let action: NotificationActionDTO
+    let readStatus: ReadStatus
     let createdAt: String
-    
-    enum CodingKeys: String, CodingKey {
-        case notificationId
-        case notificationImageUrl
-        case notificationContent
-        case redirectInfo
-        case redirectType
-        case readStatus
-        case createdAt
-    }
-    
-    private func parseDate(_ dateString: String) -> Date {
-        let formatter = ISO8601DateFormatter()
-        formatter.formatOptions = [
-            .withInternetDateTime,
-            .withFractionalSeconds
-        ]
-        return formatter.date(from: dateString) ?? Date()
-    }
-    
-    func toEntity() -> NotificationEntity {
-        return NotificationEntity(
-            notificationId: notificationId,
-            notificationImageUrl: notificationImageUrl,
-            notificationContent: notificationContent,
-            redirectInfo: redirectInfo,
-            redirectType: RedirectType(rawValue: redirectType) ?? .member,
-            readStatus: ReadStatus(rawValue: readStatus) ?? .unread,
-            createdAt: createdAt
-        )
-    }
 }
 
 struct NotificationExistAPIResponseDTO {
diff --git a/Codive/Features/Notification/Data/Repositories/NotificationRepositoryImpl.swift b/Codive/Features/Notification/Data/Repositories/NotificationRepositoryImpl.swift
@@ -23,16 +23,14 @@ final class NotificationRepositoryImpl: NotificationRepository {
         try await datasource.patchAllNotification()
     }
     
-    func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> (content: [NotificationEntity], isLast: Bool) {
-        let dto = try await datasource.fetchNotificationList(
+    func fetchNotificationList(
+        lastNotificationId: Int64?,
+        size: Int32
+    ) async throws -> NotificationListResponseDTO {
+        return try await datasource.fetchNotificationList(
             lastNotificationId: lastNotificationId,
             size: size
         )
-        
-        return (
-            content: dto.content.map { $0.toEntity() },
-            isLast: dto.isLast
-        )
     }
     
     func fetchNotificationExist() async throws -> NotificationExistAPIResponseDTO {
diff --git a/Codive/Features/Notification/Data/Services/NotificationAPIService.swift b/Codive/Features/Notification/Data/Services/NotificationAPIService.swift
@@ -25,10 +25,10 @@ protocol NotificationAPIServiceProtocol {
 }
 
 final class NotificationAPIService: NotificationAPIServiceProtocol {
-
+    
     private let client: Client
     private let jsonDecoder: JSONDecoder
-
+    
     init(tokenProvider: TokenProvider = KeychainTokenProvider()) {
         self.client = CodiveAPIProvider.createClient(
             middlewares: [CodiveAuthMiddleware(provider: tokenProvider)]
@@ -41,7 +41,7 @@ extension NotificationAPIService {
     func patchEachNotification(notificationId: Int64) async throws {
         let input = Operations.updateReadStatus.Input(path: .init(notificationId: notificationId))
         let response = try await client.updateReadStatus(input)
-
+        
         switch response {
         case .ok:
             return
@@ -64,18 +64,11 @@ extension NotificationAPIService {
 }
 
 extension NotificationAPIService {
-    private func formatDate(_ date: Date?) -> String {
-        guard let date else { return "" }
+    func fetchNotificationList(
+        lastNotificationId: Int64?,
+        size: Int32
+    ) async throws -> NotificationListResponseDTO {
         
-        let formatter = ISO8601DateFormatter()
-        formatter.formatOptions = [
-            .withInternetDateTime,
-            .withFractionalSeconds
-        ]
-        return formatter.string(from: date)
-    }
-    
-    func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> NotificationListResponseDTO {
         let input = Operations.Notification_getNotificationList.Input(
             query: .init(
                 lastNotificationId: lastNotificationId,
@@ -87,26 +80,32 @@ extension NotificationAPIService {
         
         switch response {
         case .ok(let okResponse):
-            let data = try await Data(collecting: okResponse.body.any, upTo: .max)
-
-            let decoded = try jsonDecoder.decode(Components.Schemas.BaseResponseSliceResponseNotificationListResponse.self, from: data)
-
-            let content: [NotificationListResponseItem] = decoded.result?.content?.map { item in
-                NotificationListResponseItem(
-                    notificationId: item.notificationId ?? 0,
-                    notificationImageUrl: item.notificationImageUrl ?? "",
-                    notificationContent: item.notificationContent ?? "",
-                    redirectInfo: item.action?.redirectInfo ?? "",
-                    redirectType: item.action?.redirectType?.rawValue ?? "NONE",
-                    readStatus: item.readStatus?.rawValue ?? "NOT_READ",
-                    createdAt: formatDate(item.createdAt)
-                )
-            } ?? []
-
-            return NotificationListResponseDTO(content: content, isLast: decoded.result?.isLast ?? true)
-
+            let data = try await Data(
+                collecting: okResponse.body.any,
+                upTo: .max
+            )
+            
+            let decoded = try jsonDecoder.decode(
+                Components.Schemas.BaseResponseSliceResponseNotificationListResponse.self,
+                from: data
+            )
+            
+            guard let result = decoded.result else {
+                throw NotificationAPIError.invalidResponse
+            }
+            
+            let content = mapNotificationItems(result.content)
+            
+            return NotificationListResponseDTO(
+                content: content,
+                isLast: result.isLast ?? true
+            )
+            
         case .undocumented(statusCode: let code, _):
-            throw NotificationAPIError.serverError(statusCode: code, message: "알림 목록 조회 실패")
+            throw NotificationAPIError.serverError(
+                statusCode: code,
+                message: "알림 목록 조회 실패"
+            )
         }
     }
     
@@ -124,7 +123,7 @@ extension NotificationAPIService {
             guard let item = decoded.result else {
                 throw NotificationAPIError.invalidResponse
             }
-
+            
             return ReportReceivedAPIResponseDTO(
                 isReported: item.isReported ?? false,
                 targetType: item.targetType.flatMap { ReportType(rawValue: $0.rawValue) }
@@ -137,7 +136,6 @@ extension NotificationAPIService {
 }
 
 extension NotificationAPIService {
-    
     func fetchNotificationExist() async throws -> NotificationExistAPIResponseDTO {
         
         let input = Operations.Notification_existsUnreadNotification.Input()
@@ -163,6 +161,50 @@ extension NotificationAPIService {
     }
 }
 
+
+extension NotificationAPIService {
+    private func mapNotificationItems(
+        _ items: [Components.Schemas.NotificationListResponse]?
+    ) -> [NotificationListResponseItem] {
+        items?.map { item in
+            let notificationType = NotificationType(
+                rawValue: item.notificationType?.rawValue ?? ""
+            ) ?? .unknown
+            
+            let readStatus = ReadStatus(
+                rawValue: item.readStatus?.rawValue ?? ""
+            ) ?? .notRead
+            
+            let redirectType = NotificationRedirectType(
+                rawValue: item.action?.redirectType?.rawValue ?? ""
+            ) ?? .none
+            
+            return NotificationListResponseItem(
+                notificationId: item.notificationId ?? 0,
+                notificationImageUrl: item.notificationImageUrl ?? "",
+                notificationContent: item.notificationContent ?? "",
+                notificationType: notificationType,
+                action: NotificationActionDTO(
+                    redirectType: redirectType,
+                    redirectInfo: item.action?.redirectInfo ?? ""
+                ),
+                readStatus: readStatus,
+                createdAt: formatDate(item.createdAt)
+            )
+        } ?? []
+    }
+    
+    private func formatDate(_ date: Date?) -> String {
+        guard let date else { return "" }
+        
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [
+            .withInternetDateTime,
+            .withFractionalSeconds
+        ]
+        return formatter.string(from: date)
+    }
+}
 // MARK: - ClothAPIError
 
 enum NotificationAPIError: LocalizedError {
@@ -172,7 +214,7 @@ enum NotificationAPIError: LocalizedError {
     case s3UploadFailed(statusCode: Int)
     case noClothIdsReturned
     case serverError(statusCode: Int, message: String)
-
+    
     var errorDescription: String? {
         switch self {
         case .presignedUrlMismatch:
diff --git a/Codive/Features/Notification/Domain/Entities/NotificationEntity.swift b/Codive/Features/Notification/Domain/Entities/NotificationEntity.swift
@@ -7,32 +7,6 @@
 
 import Foundation
 
-/// 알림 유형
-enum RedirectType: String, Codable {
-    case member = "MEMBER_REDIRECT"
-    case history = "HISTORY_REDIRECT"
-    case weather = "WEATHER_REDIRECT"
-}
-
-/// 알림 읽음/읽지 않음 유형
-enum ReadStatus: String, Codable {
-    case read = "READ"
-    case unread = "NOT_READ"
-}
-
-/// 알림 목록 조회 api
-struct NotificationEntity: Codable, Identifiable {
-    let notificationId: Int64
-    let notificationImageUrl: String?
-    let notificationContent: String
-    let redirectInfo: String
-    let redirectType: RedirectType
-    var readStatus: ReadStatus
-    let createdAt: String
-
-    var id: Int64 { notificationId }
-}
-
 /// 신고 접수 유형
 enum ReportType: String, Codable {
     case HISTORY = "HISTORY"
diff --git a/Codive/Features/Notification/Domain/Protocols/NotificationRepository.swift b/Codive/Features/Notification/Domain/Protocols/NotificationRepository.swift
@@ -8,7 +8,7 @@
 protocol NotificationRepository {
     func patchEachNotification(notificationId: Int64) async throws
     func patchAllNotification() async throws
-    func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> (content: [NotificationEntity], isLast: Bool)
+    func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> NotificationListResponseDTO
     func fetchNotificationExist() async throws -> NotificationExistAPIResponseDTO
     func fetchReportReceived() async throws -> ReportReceivedAPIResponseDTO
 }
diff --git a/Codive/Features/Notification/Domain/UseCases/NotificationUseCase.swift b/Codive/Features/Notification/Domain/UseCases/NotificationUseCase.swift
@@ -23,7 +23,7 @@ final class NotificationUseCase {
         try await repository.patchAllNotification()
     }
     
-    func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> (content: [NotificationEntity], isLast: Bool) {
+    func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> NotificationListResponseDTO {
         return try await repository.fetchNotificationList(
             lastNotificationId: lastNotificationId,
             size: size
@@ -33,8 +33,4 @@ final class NotificationUseCase {
     func fetchReportReceived() async throws -> ReportReceivedAPIResponseDTO {
         return try await repository.fetchReportReceived()
     }
-    
-//    func fetchReportStatus() -> ReportEntity {
-//        return false
-//    }
 }
diff --git a/Codive/Features/Notification/Presentation/Component/NotificationRow.swift b/Codive/Features/Notification/Presentation/Component/NotificationRow.swift
diff --git a/Codive/Features/Notification/Presentation/View/NotificationView.swift b/Codive/Features/Notification/Presentation/View/NotificationView.swift
diff --git a/Codive/Features/Notification/Presentation/ViewModel/NotificationViewModel.swift b/Codive/Features/Notification/Presentation/ViewModel/NotificationViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`protocol NotificationRepository {`
`9`	`9`	`func patchEachNotification(notificationId: Int64) async throws`
`10`	`10`	`func patchAllNotification() async throws`
`11`		`- func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> (content: [NotificationEntity], isLast: Bool)`
	`11`	`+ func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> NotificationListResponseDTO`
`12`	`12`	`func fetchNotificationExist() async throws -> NotificationExistAPIResponseDTO`
`13`	`13`	`func fetchReportReceived() async throws -> ReportReceivedAPIResponseDTO`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ final class NotificationUseCase {`
`23`	`23`	`try await repository.patchAllNotification()`
`24`	`24`	`}`
`25`	`25`
`26`		`- func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> (content: [NotificationEntity], isLast: Bool) {`
	`26`	`+ func fetchNotificationList(lastNotificationId: Int64?, size: Int32) async throws -> NotificationListResponseDTO {`
`27`	`27`	`return try await repository.fetchNotificationList(`
`28`	`28`	`lastNotificationId: lastNotificationId,`
`29`	`29`	`size: size`
`@@ -33,8 +33,4 @@ final class NotificationUseCase {`
`33`	`33`	`func fetchReportReceived() async throws -> ReportReceivedAPIResponseDTO {`
`34`	`34`	`return try await repository.fetchReportReceived()`
`35`	`35`	`}`
`36`		`-`
`37`		`-// func fetchReportStatus() -> ReportEntity {`
`38`		`-// return false`
`39`		`-// }`
`40`	`36`	`}`