Skip to content

[#486] TodayViewModel 생성 및 생명주기를 개선한다 #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opficdev merged 3 commits into from
May 26, 2026
Merged

[#486] TodayViewModel 생성 및 생명주기를 개선한다 #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6cd2f6
fix: Today 데이터 fetch 시점을 탭 선택 상태 기준으로 변경
opficdev May 26, 2026
c0a2ace
fix: 초기 탭 선택 상태의 데이터 fetch 누락 방지
opficdev May 26, 2026
4285d7a
refactor: Home 데이터 fetch 액션명 정리
opficdev May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Application/DevLogPresentation/Sources/Home/Home/HomeViewCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ final class HomeViewCoordinator {
)
}

func loadInitialData() {
viewModel.send(.loadInitialData)
func fetchData() {
viewModel.send(.fetchData)
}

func makeTodoManageViewModel() -> TodoManageViewModel {
Expand Down
6 changes: 3 additions & 3 deletions Application/DevLogPresentation/Sources/Home/Home/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class HomeViewModel: Store {
}

enum Action {
case loadInitialData
case fetchData
case networkStatusChanged(Bool)
case setPresentation(Presentation, Bool)
case setAlert(isPresented: Bool, type: AlertType? = nil)
Expand Down Expand Up @@ -145,7 +145,7 @@ final class HomeViewModel: Store {
switch action {
case .networkStatusChanged(let isConnected):
state.isNetworkConnected = isConnected
case .loadInitialData, .setPresentation, .setAlert, .setToast, .refreshWebPages,
case .fetchData, .setPresentation, .setAlert, .setToast, .refreshWebPages,
.tapTodoCategory, .orderTodoCategory, .addTodo, .updateWebPageURLInput,
.addWebPage, .deleteWebPage, .undoDeleteWebPage:
effects = reduceByView(action, state: &state)
Expand Down Expand Up @@ -274,7 +274,7 @@ private extension HomeViewModel {
// swiftlint:disable cyclomatic_complexity
func reduceByView(_ action: Action, state: inout State) -> [SideEffect] {
switch action {
case .loadInitialData:
case .fetchData:
return [.fetchTodoCategoryPreferences, .fetchRecentTodos, .fetchWebPages]
case .refreshWebPages:
return [.fetchWebPages]
Expand Down
6 changes: 4 additions & 2 deletions Application/DevLogPresentation/Sources/Main/MainView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ struct MainView: View {
.onAppear {
coordinator.mainViewModel.send(.onAppear)
}
.onChange(of: selectedTab) { _, newValue in
.onChange(of: selectedTab, initial: true) { _, newValue in
if newValue == .home {
homeViewCoordinator.loadInitialData()
homeViewCoordinator.fetchData()
} else if newValue == .today {
todayViewCoordinator.fetchData()
}
}
.alert(
Expand Down
1 change: 0 additions & 1 deletion Application/DevLogPresentation/Sources/Today/TodayView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ struct TodayView: View {
.toolbar { toolbarContent }
.background(NavigationBarConfigurator())
.refreshable { coordinator.viewModel.send(.refresh) }
.onAppear { coordinator.viewModel.send(.onAppear) }
.alert(
coordinator.viewModel.state.alertTitle,
isPresented: Binding(
Expand Down
4 changes: 4 additions & 0 deletions Application/DevLogPresentation/Sources/Today/TodayViewCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ final class TodayViewCoordinator {
updateTodayDisplayOptionsUseCase: container.resolve(UpdateTodayDisplayOptionsUseCase.self)
)
}

func fetchData() {
viewModel.send(.fetchData)
}
}
6 changes: 3 additions & 3 deletions Application/DevLogPresentation/Sources/Today/TodayViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ final class TodayViewModel: Store {
case resetDisplayOptions
case completeTodo(TodayTodoItem)
case togglePinned(TodayTodoItem)
case onAppear
case fetchData
case fetchTodos([TodayTodoItem])
case setLoading(Bool)
case updateTodo(TodayTodoItem)
Expand Down Expand Up @@ -178,7 +178,7 @@ final class TodayViewModel: Store {
case .refresh, .setAlert, .setSectionScope, .setDueDateVisibility, .setFocusVisibility,
.resetDisplayOptions, .completeTodo, .togglePinned:
effects = reduceByUser(action, state: &state)
case .onAppear:
case .fetchData:
effects = reduceByView(action, state: &state)
case .fetchTodos, .setLoading, .updateTodo, .removeTodo:
effects = reduceByRun(action, state: &state)
Expand Down Expand Up @@ -305,7 +305,7 @@ private extension TodayViewModel {

func reduceByView(_ action: Action, state: inout State) -> [SideEffect] {
switch action {
case .onAppear:
case .fetchData:
return [.fetchTodos]
default:
break
Expand Down