Skip to content

Commit 16ca9d4

Browse files
committed
refactor: 위젯 히트맵 스냅샷 갱신 파라미터 정리
1 parent 51f3a5d commit 16ca9d4

4 files changed

Lines changed: 14 additions & 57 deletions

File tree

Application/DevLogData/Sources/Protocol/WidgetSnapshotUpdater.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,5 @@ public protocol WidgetSnapshotUpdater {
2525
quarterStart: Date,
2626
now: Date
2727
)
28-
func updateHeatmapSnapshot(
29-
createdTodos: [Todo],
30-
completedTodos: [Todo],
31-
deletedTodos: [Todo],
32-
selectedActivityKinds: Set<ActivityKind>,
33-
quarterStart: Date,
34-
now: Date
35-
)
3628
func clear()
3729
}

Application/DevLogPersistence/Sources/Persistence/WidgetSnapshotUpdaterImpl.swift

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,12 @@ final class WidgetSnapshotUpdaterImpl: WidgetSnapshotUpdater {
7070
deletedTodos: [Todo],
7171
quarterStart: Date,
7272
now: Date = Date()
73-
) {
74-
updateHeatmapSnapshot(
75-
createdTodos: createdTodos,
76-
completedTodos: completedTodos,
77-
deletedTodos: deletedTodos,
78-
selectedActivityKinds: preferenceStore.selectedActivityKinds(),
79-
quarterStart: quarterStart,
80-
now: now
81-
)
82-
}
83-
84-
func updateHeatmapSnapshot(
85-
createdTodos: [Todo],
86-
completedTodos: [Todo],
87-
deletedTodos: [Todo],
88-
selectedActivityKinds: Set<ActivityKind>,
89-
quarterStart: Date,
90-
now: Date = Date()
9173
) {
9274
let heatmapWidgetSnapshot = heatmapFactory.makeSnapshot(
9375
createdTodos: createdTodos,
9476
completedTodos: completedTodos,
9577
deletedTodos: deletedTodos,
96-
selectedActivityKinds: selectedActivityKinds,
78+
selectedActivityKinds: preferenceStore.selectedActivityKinds(),
9779
quarterStart: quarterStart,
9880
now: now
9981
)

Application/DevLogPersistence/Tests/Persistence/WidgetSnapshotUpdaterTests.swift

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ struct WidgetSnapshotUpdaterTests {
4141
let completedAt = try #require(calendar.date(from: DateComponents(year: 2026, month: 4, day: 3)))
4242
let deletedAt = try #require(calendar.date(from: DateComponents(year: 2026, month: 4, day: 4)))
4343
let fixture = makeFixture(calendar: calendar)
44+
fixture.preferenceStore.setHeatmapActivityTypes(["created", "completed"])
4445

4546
fixture.updater.updateHeatmapSnapshot(
4647
createdTodos: [
@@ -63,7 +64,6 @@ struct WidgetSnapshotUpdaterTests {
6364
deletedAt: deletedAt
6465
)
6566
],
66-
selectedActivityKinds: [.created, .completed],
6767
quarterStart: quarterStart,
6868
now: now
6969
)
@@ -107,7 +107,6 @@ struct WidgetSnapshotUpdaterTests {
107107
],
108108
completedTodos: [],
109109
deletedTodos: [],
110-
selectedActivityKinds: [.created],
111110
quarterStart: quarterStart,
112111
now: now
113112
)
@@ -122,11 +121,7 @@ struct WidgetSnapshotUpdaterTests {
122121

123122
private func makeFixture(
124123
calendar: Calendar = .current
125-
) -> (
126-
updater: WidgetSnapshotUpdaterImpl,
127-
snapshotStore: WidgetSnapshotStore,
128-
preferenceStore: WidgetSnapshotPreferenceStoreImpl
129-
) {
124+
) -> Fixture {
130125
let suiteName = "WidgetSnapshotUpdaterTests.\(UUID().uuidString)"
131126
let userDefaults = UserDefaults(suiteName: suiteName) ?? .standard
132127
userDefaults.removePersistentDomain(forName: suiteName)
@@ -141,7 +136,11 @@ struct WidgetSnapshotUpdaterTests {
141136
preferenceStore: preferenceStore,
142137
heatmapFactory: HeatmapWidgetSnapshotFactory(calendar: calendar)
143138
)
144-
return (updater, snapshotStore, preferenceStore)
139+
return Fixture(
140+
updater: updater,
141+
snapshotStore: snapshotStore,
142+
preferenceStore: preferenceStore
143+
)
145144
}
146145

147146
private func makeTodo(
@@ -169,3 +168,9 @@ struct WidgetSnapshotUpdaterTests {
169168
)
170169
}
171170
}
171+
172+
private struct Fixture {
173+
let updater: WidgetSnapshotUpdaterImpl
174+
let snapshotStore: WidgetSnapshotStore
175+
let preferenceStore: WidgetSnapshotPreferenceStoreImpl
176+
}

Widget/DevLogWidgetCore/Tests/Sync/WidgetSyncEventHandlerTests.swift

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ final class WidgetSnapshotUpdaterSpy: WidgetSnapshotUpdater {
255255
let createdTodos: [Todo]
256256
let completedTodos: [Todo]
257257
let deletedTodos: [Todo]
258-
let selectedActivityKinds: Set<ActivityKind>?
259258
let quarterStart: Date
260259
let now: Date
261260
}
@@ -324,27 +323,6 @@ final class WidgetSnapshotUpdaterSpy: WidgetSnapshotUpdater {
324323
createdTodos: createdTodos,
325324
completedTodos: completedTodos,
326325
deletedTodos: deletedTodos,
327-
selectedActivityKinds: nil,
328-
quarterStart: quarterStart,
329-
now: now
330-
)
331-
)
332-
}
333-
334-
func updateHeatmapSnapshot(
335-
createdTodos: [Todo],
336-
completedTodos: [Todo],
337-
deletedTodos: [Todo],
338-
selectedActivityKinds: Set<ActivityKind>,
339-
quarterStart: Date,
340-
now: Date
341-
) {
342-
appendHeatmapUpdate(
343-
HeatmapUpdate(
344-
createdTodos: createdTodos,
345-
completedTodos: completedTodos,
346-
deletedTodos: deletedTodos,
347-
selectedActivityKinds: selectedActivityKinds,
348326
quarterStart: quarterStart,
349327
now: now
350328
)

0 commit comments

Comments
 (0)