[#148] 데이터와 인프라 간 DTO 및 Mapper을 확인한다

DevLog/Infra/DTO/PushNotificationCursorDTO.swift → DevLog/Data/DTO/PushNotificationCursorDTO.swift

@@ -5,9 +5,9 @@
 //  Created by 최윤진 on 2/27/26.
 //
 
-import FirebaseFirestore
+import Foundation
 
 struct PushNotificationCursorDTO {
-    let receivedAt: Timestamp
+    let receivedAt: Date
     let documentID: String
 }

DevLog/Infra/DTO/PushNotificationResponse.swift → DevLog/Data/DTO/PushNotificationResponse.swift

@@ -5,13 +5,13 @@
 //  Created by 최윤진 on 2/10/26.
 //
 
-import FirebaseFirestore
+import Foundation
 
-struct PushNotificationResponse: Decodable {
-    @DocumentID var id: String?
+struct PushNotificationResponse {
+    let id: String
     let title: String
     let body: String
-    let receivedAt: Timestamp
+    let receivedAt: Date
     let isRead: Bool
     let todoID: String
     let todoKind: String

DevLog/Data/DTO/TodoCursorDTO.swift

@@ -0,0 +1,13 @@
+//
+//  TodoCursorDTO.swift
+//  DevLog
+//
+//  Created by opfic on 2/21/26.
+//
+
+import Foundation
+
+struct TodoCursorDTO {
+    let createdAt: Date
+    let documentID: String
+}

DevLog/Data/DTO/TodoDTO.swift

@@ -0,0 +1,37 @@
+//
+//  TodoDTO.swift
+//  DevLog
+//
+//  Created by 최윤진 on 12/14/25.
+//
+
+import Foundation
+
+struct TodoRequest: Dictionaryable {
+    let id: String
+    let isPinned: Bool
+    let isCompleted: Bool
+    let isChecked: Bool
+    let title: String
+    let content: String
+    let createdAt: Date
+    let updatedAt: Date
+    let dueDate: Date?
+    let tags: [String]
+    let kind: TodoKind
+
+}
+
+struct TodoResponse {
+    let id: String
+    let isPinned: Bool
+    let isCompleted: Bool
+    let isChecked: Bool
+    let title: String
+    let content: String
+    let createdAt: Date
+    let updatedAt: Date
+    let dueDate: Date?
+    let tags: [String]
+    let kind: String
+}

DevLog/Infra/DTO/TodoPageResponse.swift → DevLog/Data/DTO/TodoPageResponse.swift

@@ -7,5 +7,5 @@
 
 struct TodoPageResponse {
     let items: [TodoResponse]
-    let nextCursor: TodoCursorResponse?
+    let nextCursor: TodoCursorDTO?
 }

DevLog/Infra/DTO/WebPageDTO.swift → DevLog/Data/DTO/WebPageDTO.swift

@@ -5,7 +5,7 @@
 //  Created by 최윤진 on 2/9/26.
 //
 
-import FirebaseFirestore
+import Foundation
 
 struct WebPageRequest: Encodable {
     let title: String
@@ -14,8 +14,8 @@ struct WebPageRequest: Encodable {
     let imageURL: String
 }
 
-struct WebPageResponse: Decodable {
-    @DocumentID var id: String?
+struct WebPageResponse {
+    let id: String
     let title: String
     let url: String
     let displayURL: String

DevLog/Data/Mapper/PushNotificationMapping.swift

@@ -5,13 +5,8 @@
 //  Created by 최윤진 on 2/27/26.
 //
 
-import FirebaseFirestore
-
 extension PushNotificationResponse {
     func toDomain() throws -> PushNotification {
-        guard let id = self.id else {
-            throw DataError.invalidData("PushNotificationResponse.id is nil")
-        }
         guard let todoKind = TodoKind(rawValue: self.todoKind) else {
             throw DataError.invalidData("PushNotificationResponse.todoKind is invalid: \(self.todoKind)")
         }
@@ -20,7 +15,7 @@ extension PushNotificationResponse {
             id: id,
             title: self.title,
             body: self.body,
-            receivedAt: self.receivedAt.dateValue(),
+            receivedAt: self.receivedAt,
             isRead: self.isRead,
             todoID: self.todoID,
             todoKind: todoKind
@@ -31,14 +26,14 @@ extension PushNotificationResponse {
 extension PushNotificationCursorDTO {
     func toDomain() -> PushNotificationCursor {
         PushNotificationCursor(
-            receivedAt: self.receivedAt.dateValue(),
+            receivedAt: self.receivedAt,
             documentID: self.documentID
         )
     }
 
     static func fromDomain(_ cursor: PushNotificationCursor) -> Self {
         PushNotificationCursorDTO(
-            receivedAt: Timestamp(date: cursor.receivedAt),
+            receivedAt: cursor.receivedAt,
             documentID: cursor.documentID
         )
     }

DevLog/Data/Mapper/TodoMapping.swift

@@ -5,8 +5,6 @@
 //  Created by 최윤진 on 2/19/26.
 //
 
-import FirebaseFirestore
-
 extension TodoRequest {
     static func fromDomain(_ entity: Todo) -> Self {
         TodoRequest(
@@ -27,9 +25,6 @@ extension TodoRequest {
 
 extension TodoResponse {
     func toDomain() throws -> Todo {
-        guard let id = self.id else {
-            throw DataError.invalidData("TodoResponse.id is nil")
-        }
         guard let kind = TodoKind(rawValue: self.kind) else {
             throw DataError.invalidData("TodoResponse.kind is invalid: \(self.kind)")
         }
@@ -50,17 +45,17 @@ extension TodoResponse {
     }
 }
 
-extension TodoCursorResponse {
+extension TodoCursorDTO {
     func toDomain() -> TodoCursor {
         TodoCursor(
-            createdAt: createdAt.dateValue(),
+            createdAt: createdAt,
             documentID: documentID
         )
     }
 
     static func fromDomain(_ cursor: TodoCursor) -> Self {
-        TodoCursorResponse(
-            createdAt: Timestamp(date: cursor.createdAt),
+        TodoCursorDTO(
+            createdAt: cursor.createdAt,
             documentID: cursor.documentID
         )
     }

DevLog/Data/Repository/TodoRepositoryImpl.swift

@@ -15,7 +15,7 @@ final class TodoRepositoryImpl: TodoRepository {
     }
 
     func fetchTodos(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage {
-        let responseCursor = cursor.map { TodoCursorResponse.fromDomain($0) }
+        let responseCursor = cursor.map { TodoCursorDTO.fromDomain($0) }
         let response = try await todoService.fetchTodos(query, cursor: responseCursor)
         return try response.toDomain()
     }

DevLog/Infra/Extension/FirebaseAuthUser.swift

@@ -9,7 +9,7 @@ import Foundation
 import FirebaseAuth
 
 extension FirebaseAuth.User {
-    func toResponse(
+    func makeResponse(
         providerID: AuthProviderID,
         fcmToken: String,
         accessToken: String? = nil

DevLog/Infra/Service/PushNotificationService.swift

@@ -115,7 +115,7 @@ final class PushNotificationService {
 
         if let cursor {
             firestoreQuery = firestoreQuery.start(after: [
-                cursor.receivedAt,
+                Timestamp(date: cursor.receivedAt),
                 cursor.documentID
             ])
         }
@@ -124,17 +124,15 @@ final class PushNotificationService {
             .limit(to: query.pageSize)
             .getDocuments()
 
-        let items = try snapshot.documents.compactMap { document in
-            try document.data(as: PushNotificationResponse.self)
-        }
+        let items = snapshot.documents.compactMap { makeResponse(from: $0) }
 
         let nextCursor: PushNotificationCursorDTO? = snapshot.documents.last.map { document in
             guard let receivedAt = document.data()["receivedAt"] as? Timestamp else {
                 return nil
             }
 
             return PushNotificationCursorDTO(
-                receivedAt: receivedAt,
+                receivedAt: receivedAt.dateValue(),
                 documentID: document.documentID
             )
         } ?? nil
@@ -177,3 +175,28 @@ final class PushNotificationService {
         logger.info("Successfully toggled notification read")
     }
 }
+
+private extension PushNotificationService {
+    func makeResponse(from snapshot: QueryDocumentSnapshot) -> PushNotificationResponse? {
+        let data = snapshot.data()
+        guard
+            let title = data["title"] as? String,
+            let body = data["body"] as? String,
+            let receivedAt = data["receivedAt"] as? Timestamp,
+            let isRead = data["isRead"] as? Bool,
+            let todoID = data["todoID"] as? String,
+            let todoKind = data["todoKind"] as? String else {
+            return nil
+        }
+
+        return PushNotificationResponse(
+            id: snapshot.documentID,
+            title: title,
+            body: body,
+            receivedAt: receivedAt.dateValue(),
+            isRead: isRead,
+            todoID: todoID,
+            todoKind: todoKind
+        )
+    }
+}

DevLog/Infra/Service/SocialLogin/AppleAuthenticationService.swift

@@ -81,7 +81,7 @@ final class AppleAuthenticationService: AuthenticationService {
             let fcmToken = try await messaging.token()
 
             logger.info("Successfully signed in with Apple")
-            return result.user.toResponse(providerID: .apple, fcmToken: fcmToken)
+            return result.user.makeResponse(providerID: .apple, fcmToken: fcmToken)
         } catch {
             logger.error("Failed to sign in with Apple", error: error)
             throw error

DevLog/Infra/Service/SocialLogin/GithubAuthenticationService.swift

@@ -56,7 +56,7 @@ final class GithubAuthenticationService: NSObject, AuthenticationService {
             let fcmToken = try await messaging.token()
 
             logger.info("Successfully signed in with GitHub")
-            return result.user.toResponse(
+            return result.user.makeResponse(
                 providerID: .gitHub,
                 fcmToken: fcmToken,
                 accessToken: accessToken

DevLog/Infra/Service/SocialLogin/GoogleAuthenticationService.swift

@@ -54,7 +54,7 @@ final class GoogleAuthenticationService: AuthenticationService {
             let fcmToken = try await messaging.token()
 
             logger.info("Successfully signed in with Google")
-            return result.user.toResponse(providerID: .google, fcmToken: fcmToken)
+            return result.user.makeResponse(providerID: .google, fcmToken: fcmToken)
         } catch {
             logger.error("Failed to sign in with Google", error: error)
             throw error