refactor: 위젯 스냅샷 데이터 모델 분리

opficdev · opficdev · commit d765fc261b4a · 2026-05-17T11:58:45.000+09:00
diff --git a/Application/DevLogData/Sources/DTO/TodoDTO.swift b/Application/DevLogData/Sources/DTO/TodoDTO.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import DevLogDomain
 
 public struct TodoRequest: Encodable {
     public let id: String
@@ -102,3 +101,34 @@ public struct TodoResponse {
         self.category = category
     }
 }
+
+public struct WidgetTodoSnapshot: Equatable {
+    public let id: String
+    public let number: Int?
+    public let title: String
+    public let isPinned: Bool
+    public let createdAt: Date
+    public let completedAt: Date?
+    public let deletedAt: Date?
+    public let dueDate: Date?
+
+    public init(
+        id: String,
+        number: Int?,
+        title: String,
+        isPinned: Bool,
+        createdAt: Date,
+        completedAt: Date?,
+        deletedAt: Date?,
+        dueDate: Date?
+    ) {
+        self.id = id
+        self.number = number
+        self.title = title
+        self.isPinned = isPinned
+        self.createdAt = createdAt
+        self.completedAt = completedAt
+        self.deletedAt = deletedAt
+        self.dueDate = dueDate
+    }
+}
diff --git a/Application/DevLogData/Sources/Mapper/TodoMapping.swift b/Application/DevLogData/Sources/Mapper/TodoMapping.swift
@@ -57,6 +57,21 @@ public extension TodoResponse {
     }
 }
 
+public extension WidgetTodoSnapshot {
+    static func fromDomain(_ todo: Todo) -> Self {
+        WidgetTodoSnapshot(
+            id: todo.id,
+            number: todo.number,
+            title: todo.title,
+            isPinned: todo.isPinned,
+            createdAt: todo.createdAt,
+            completedAt: todo.completedAt,
+            deletedAt: todo.deletedAt,
+            dueDate: todo.dueDate
+        )
+    }
+}
+
 public extension TodoCursorDTO {
     func toDomain() -> TodoCursor {
         TodoCursor(
diff --git a/Application/DevLogData/Sources/Protocol/WidgetSnapshotUpdater.swift b/Application/DevLogData/Sources/Protocol/WidgetSnapshotUpdater.swift
@@ -7,22 +7,21 @@
 
 import Foundation
 import DevLogCore
-import DevLogDomain
 
 public protocol WidgetSnapshotUpdater {
     func updateTodaySnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         now: Date
     )
     func updateTodaySnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         displayOptions: TodayDisplayOptions,
         now: Date
     )
     func updateHeatmapSnapshot(
-        createdTodos: [Todo],
-        completedTodos: [Todo],
-        deletedTodos: [Todo],
+        createdTodos: [WidgetTodoSnapshot],
+        completedTodos: [WidgetTodoSnapshot],
+        deletedTodos: [WidgetTodoSnapshot],
         quarterStart: Date,
         now: Date
     )
diff --git a/Application/DevLogPersistence/Sources/Persistence/WidgetSnapshotUpdaterImpl.swift b/Application/DevLogPersistence/Sources/Persistence/WidgetSnapshotUpdaterImpl.swift
@@ -8,7 +8,6 @@
 import Foundation
 import WidgetKit
 import DevLogCore
-import DevLogDomain
 import DevLogData
 import DevLogWidgetCore
 
@@ -32,7 +31,7 @@ final class WidgetSnapshotUpdaterImpl: WidgetSnapshotUpdater {
     }
 
     func updateTodaySnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         now: Date = Date()
     ) {
         updateTodaySnapshot(
@@ -43,7 +42,7 @@ final class WidgetSnapshotUpdaterImpl: WidgetSnapshotUpdater {
     }
 
     func updateTodaySnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         displayOptions: TodayDisplayOptions,
         now: Date = Date()
     ) {
@@ -65,9 +64,9 @@ final class WidgetSnapshotUpdaterImpl: WidgetSnapshotUpdater {
     }
 
     func updateHeatmapSnapshot(
-        createdTodos: [Todo],
-        completedTodos: [Todo],
-        deletedTodos: [Todo],
+        createdTodos: [WidgetTodoSnapshot],
+        completedTodos: [WidgetTodoSnapshot],
+        deletedTodos: [WidgetTodoSnapshot],
         quarterStart: Date,
         now: Date = Date()
     ) {
diff --git a/Application/DevLogPersistence/Tests/Persistence/WidgetSnapshotUpdaterTests.swift b/Application/DevLogPersistence/Tests/Persistence/WidgetSnapshotUpdaterTests.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import DevLogCore
-import DevLogDomain
+import DevLogData
 import Testing
 @testable import DevLogPersistence
 @testable import DevLogWidgetCore
@@ -150,22 +150,16 @@ struct WidgetSnapshotUpdaterTests {
         completedAt: Date? = nil,
         deletedAt: Date? = nil,
         dueDate: Date? = nil
-    ) -> Todo {
-        Todo(
+    ) -> WidgetTodoSnapshot {
+        WidgetTodoSnapshot(
             id: id,
-            isPinned: false,
-            isCompleted: completedAt != nil,
-            isChecked: false,
             number: 1,
             title: id,
-            content: "",
+            isPinned: false,
             createdAt: createdAt,
-            updatedAt: createdAt,
             completedAt: completedAt,
             deletedAt: deletedAt,
-            dueDate: dueDate,
-            tags: [],
-            category: .system(.feature)
+            dueDate: dueDate
         )
     }
 }
diff --git a/Widget/DevLogWidgetCore/Sources/Heatmap/HeatmapWidgetSnapshotFactory.swift b/Widget/DevLogWidgetCore/Sources/Heatmap/HeatmapWidgetSnapshotFactory.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import DevLogCore
-import DevLogDomain
 import DevLogData
 
 public struct HeatmapWidgetSnapshotFactory {
@@ -35,9 +34,9 @@ public struct HeatmapWidgetSnapshotFactory {
     }
 
     public func makeSnapshot(
-        createdTodos: [Todo],
-        completedTodos: [Todo],
-        deletedTodos: [Todo],
+        createdTodos: [WidgetTodoSnapshot],
+        completedTodos: [WidgetTodoSnapshot],
+        deletedTodos: [WidgetTodoSnapshot],
         selectedActivityKinds: Set<ActivityKind>,
         quarterStart: Date,
         now: Date = Date()
@@ -79,9 +78,9 @@ public struct HeatmapWidgetSnapshotFactory {
 
 private extension HeatmapWidgetSnapshotFactory {
     func makeDailyCountsByDate(
-        createdTodos: [Todo],
-        completedTodos: [Todo],
-        deletedTodos: [Todo],
+        createdTodos: [WidgetTodoSnapshot],
+        completedTodos: [WidgetTodoSnapshot],
+        deletedTodos: [WidgetTodoSnapshot],
         quarterStart: Date,
         nextQuarterStart: Date
     ) -> [Date: DailyCounts] {
diff --git a/Widget/DevLogWidgetCore/Sources/Sync/WidgetSyncEventHandler.swift b/Widget/DevLogWidgetCore/Sources/Sync/WidgetSyncEventHandler.swift
@@ -64,7 +64,7 @@ private extension WidgetSyncEventHandler {
                 todosWithoutDueDate
             )
             snapshotUpdater.updateTodaySnapshot(
-                todos: todayTodosWithDueDate + todayTodosWithoutDueDate,
+                todos: (todayTodosWithDueDate + todayTodosWithoutDueDate).map(WidgetTodoSnapshot.fromDomain),
                 now: Date()
             )
         } catch {
@@ -104,9 +104,9 @@ private extension WidgetSyncEventHandler {
                 deletedTodos
             )
             snapshotUpdater.updateHeatmapSnapshot(
-                createdTodos: createdTodoItems,
-                completedTodos: completedTodoItems,
-                deletedTodos: deletedTodoItems,
+                createdTodos: createdTodoItems.map(WidgetTodoSnapshot.fromDomain),
+                completedTodos: completedTodoItems.map(WidgetTodoSnapshot.fromDomain),
+                deletedTodos: deletedTodoItems.map(WidgetTodoSnapshot.fromDomain),
                 quarterStart: quarterStart,
                 now: currentDate
             )
diff --git a/Widget/DevLogWidgetCore/Sources/Today/TodayWidgetSnapshotFactory.swift b/Widget/DevLogWidgetCore/Sources/Today/TodayWidgetSnapshotFactory.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import DevLogCore
-import DevLogDomain
 import DevLogData
 
 public struct TodayWidgetSnapshotFactory {
@@ -49,7 +48,7 @@ public struct TodayWidgetSnapshotFactory {
         let isPinned: Bool
         let dueDate: Date?
 
-        init?(from todo: Todo) {
+        init?(from todo: WidgetTodoSnapshot) {
             guard let number = todo.number else { return nil }
             self.id = todo.id
             self.number = number
@@ -71,7 +70,7 @@ public struct TodayWidgetSnapshotFactory {
     }
 
     public func makeSnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         displayOptions: TodayDisplayOptions,
         now: Date = Date()
     ) -> TodayWidgetSnapshot {
diff --git a/Widget/DevLogWidgetCore/Tests/Heatmap/HeatmapWidgetSnapshotFactoryTests.swift b/Widget/DevLogWidgetCore/Tests/Heatmap/HeatmapWidgetSnapshotFactoryTests.swift
@@ -8,7 +8,7 @@
 import Foundation
 import Testing
 import DevLogCore
-import DevLogDomain
+import DevLogData
 @testable import DevLogWidgetCore
 
 struct HeatmapWidgetSnapshotFactoryTests {
@@ -216,22 +216,16 @@ struct HeatmapWidgetSnapshotFactoryTests {
         createdAt: Date,
         completedAt: Date? = nil,
         deletedAt: Date? = nil
-    ) -> Todo {
-        Todo(
+    ) -> WidgetTodoSnapshot {
+        WidgetTodoSnapshot(
             id: id,
-            isPinned: false,
-            isCompleted: completedAt != nil,
-            isChecked: false,
             number: 1,
             title: id,
-            content: "",
+            isPinned: false,
             createdAt: createdAt,
-            updatedAt: createdAt,
             completedAt: completedAt,
             deletedAt: deletedAt,
-            dueDate: nil,
-            tags: [],
-            category: .system(.feature)
+            dueDate: nil
         )
     }
 }
diff --git a/Widget/DevLogWidgetCore/Tests/Sync/WidgetSyncEventHandlerTests.swift b/Widget/DevLogWidgetCore/Tests/Sync/WidgetSyncEventHandlerTests.swift
@@ -247,15 +247,15 @@ private actor WidgetSyncTodoRepositorySpy: TodoRepository {
 
 private final class WidgetSnapshotUpdaterSpy: WidgetSnapshotUpdater {
     struct TodayUpdate {
-        let todos: [Todo]
+        let todos: [WidgetTodoSnapshot]
         let displayOptions: TodayDisplayOptions?
         let now: Date
     }
 
     struct HeatmapUpdate {
-        let createdTodos: [Todo]
-        let completedTodos: [Todo]
-        let deletedTodos: [Todo]
+        let createdTodos: [WidgetTodoSnapshot]
+        let completedTodos: [WidgetTodoSnapshot]
+        let deletedTodos: [WidgetTodoSnapshot]
         let quarterStart: Date
         let now: Date
     }
@@ -286,7 +286,7 @@ private final class WidgetSnapshotUpdaterSpy: WidgetSnapshotUpdater {
     }
 
     func updateTodaySnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         now: Date
     ) {
         appendTodayUpdate(
@@ -299,7 +299,7 @@ private final class WidgetSnapshotUpdaterSpy: WidgetSnapshotUpdater {
     }
 
     func updateTodaySnapshot(
-        todos: [Todo],
+        todos: [WidgetTodoSnapshot],
         displayOptions: TodayDisplayOptions,
         now: Date
     ) {
@@ -313,9 +313,9 @@ private final class WidgetSnapshotUpdaterSpy: WidgetSnapshotUpdater {
     }
 
     func updateHeatmapSnapshot(
-        createdTodos: [Todo],
-        completedTodos: [Todo],
-        deletedTodos: [Todo],
+        createdTodos: [WidgetTodoSnapshot],
+        completedTodos: [WidgetTodoSnapshot],
+        deletedTodos: [WidgetTodoSnapshot],
         quarterStart: Date,
         now: Date
     ) {
diff --git a/Widget/DevLogWidgetCore/Tests/Today/TodayWidgetSnapshotFactoryTests.swift b/Widget/DevLogWidgetCore/Tests/Today/TodayWidgetSnapshotFactoryTests.swift
@@ -8,7 +8,7 @@
 import Foundation
 import Testing
 import DevLogCore
-import DevLogDomain
+import DevLogData
 @testable import DevLogWidgetCore
 
 struct TodayWidgetSnapshotFactoryTests {
@@ -123,7 +123,7 @@ struct TodayWidgetSnapshotFactoryTests {
     private func makeTodayTodos(
         now: Date,
         calendar: Calendar
-    ) throws -> [Todo] {
+    ) throws -> [WidgetTodoSnapshot] {
         let overdueDate = try #require(calendar.date(byAdding: .day, value: -1, to: now))
         let dueSoonDate = try #require(calendar.date(byAdding: .day, value: 3, to: now))
         let laterDate = try #require(calendar.date(byAdding: .day, value: 9, to: now))
@@ -173,22 +173,16 @@ struct TodayWidgetSnapshotFactoryTests {
         title: String,
         isPinned: Bool,
         dueDate: Date?
-    ) -> Todo {
-        Todo(
+    ) -> WidgetTodoSnapshot {
+        WidgetTodoSnapshot(
             id: id,
-            isPinned: isPinned,
-            isCompleted: false,
-            isChecked: false,
             number: number,
             title: title,
-            content: "",
+            isPinned: isPinned,
             createdAt: .now,
-            updatedAt: .now,
             completedAt: nil,
             deletedAt: nil,
-            dueDate: dueDate,
-            tags: [],
-            category: .system(.feature)
+            dueDate: dueDate
         )
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private extension WidgetSyncEventHandler {`
`64`	`64`	`todosWithoutDueDate`
`65`	`65`	`)`
`66`	`66`	`snapshotUpdater.updateTodaySnapshot(`
`67`		`- todos: todayTodosWithDueDate + todayTodosWithoutDueDate,`
	`67`	`+ todos: (todayTodosWithDueDate + todayTodosWithoutDueDate).map(WidgetTodoSnapshot.fromDomain),`
`68`	`68`	`now: Date()`
`69`	`69`	`)`
`70`	`70`	`} catch {`
`@@ -104,9 +104,9 @@ private extension WidgetSyncEventHandler {`
`104`	`104`	`deletedTodos`
`105`	`105`	`)`
`106`	`106`	`snapshotUpdater.updateHeatmapSnapshot(`
`107`		`- createdTodos: createdTodoItems,`
`108`		`- completedTodos: completedTodoItems,`
`109`		`- deletedTodos: deletedTodoItems,`
	`107`	`+ createdTodos: createdTodoItems.map(WidgetTodoSnapshot.fromDomain),`
	`108`	`+ completedTodos: completedTodoItems.map(WidgetTodoSnapshot.fromDomain),`
	`109`	`+ deletedTodos: deletedTodoItems.map(WidgetTodoSnapshot.fromDomain),`
`110`	`110`	`quarterStart: quarterStart,`
`111`	`111`	`now: currentDate`
`112`	`112`	`)`