[#368] LoadingView 띄우는 형태를 LoadingState()로 관리하여 즉시 뜨는게 아닌 일정 시간 딜레이 후 그 동안에도 비동기 로딩 중이면 뜨도록 개선한다 (#369)

opficdev · web-flow · commit 339257636ad5 · 2026-04-07T15:10:27.000+09:00
* refactor: 0.3초로 딜레이 수정

* refactor: .immediate 대신 .delay로 교체

* refactor: LoadingState 적용

* refactor: .immediate에서 .delay로 수정 및 디바운스 작업도 같이 끝나도록 개선

* chore: PR 템플릿 추가

* fix: Task가 취소되지 않았을 경우 로딩을 끝내버릴 수 있는 이슈 해결
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+## 🔗 연관된 이슈
+> 이슈 번호를 입력해주세요. (예: #12)
+> 이슈가 완전히 해결되었다면 아래에 예약어를 남겨주세요.
+- closed #이슈번호
+
+## 📝 작업 내용
+
+### 📌 요약
+
+### 🔍 상세
+
+## 📸 영상 / 이미지 (Optional)
diff --git a/DevLog/Presentation/Common/LoadingState.swift b/DevLog/Presentation/Common/LoadingState.swift
@@ -25,7 +25,7 @@ final class LoadingState {
     private var visibleDelayedTargets = Set<AnyHashable>()
     private var visibleTargets = Set<AnyHashable>()
 
-    init(delay: Duration = .milliseconds(500)) {
+    init(delay: Duration = .seconds(0.3)) {
         self.delay = delay
     }
 
diff --git a/DevLog/Presentation/ViewModel/HomeViewModel.swift b/DevLog/Presentation/ViewModel/HomeViewModel.swift
@@ -157,10 +157,10 @@ final class HomeViewModel: Store {
     func run(_ effect: SideEffect) {
         switch effect {
         case .fetchTodoCategoryPreferences:
-            beginLoading(for: .preferences, mode: .immediate)
+            beginLoading(for: .preferences, mode: .delayed)
             Task {
                 do {
-                    defer { endLoading(for: .preferences, mode: .immediate) }
+                    defer { endLoading(for: .preferences, mode: .delayed) }
                     let preferences = try await fetchPreferencesUseCase.execute()
                     send(.setTodoCategory(preferences.map(TodoCategoryItem.init(from:))))
                 } catch {
@@ -192,10 +192,10 @@ final class HomeViewModel: Store {
                 }
             }
         case .fetchRecentTodos:
-            beginLoading(for: .recentTodos, mode: .immediate)
+            beginLoading(for: .recentTodos, mode: .delayed)
             Task {
                 do {
-                    defer { endLoading(for: .recentTodos, mode: .immediate) }
+                    defer { endLoading(for: .recentTodos, mode: .delayed) }
                     let page = try await fetchRecentTodos()
                     let items = page.items
                         .filter { $0.createdAt != $0.updatedAt }
@@ -254,10 +254,10 @@ final class HomeViewModel: Store {
                 }
             }
         case .fetchWebPages:
-            beginLoading(for: .webPage, mode: .immediate)
+            beginLoading(for: .webPage, mode: .delayed)
             Task {
                 do {
-                    defer { endLoading(for: .webPage, mode: .immediate) }
+                    defer { endLoading(for: .webPage, mode: .delayed) }
                     let pages = try await fetchWebPagesUseCase.execute("")
                     send(.updateWebPages(pages.map { WebPageItem(from: $0) }))
                 } catch {
diff --git a/DevLog/Presentation/ViewModel/LoginViewModel.swift b/DevLog/Presentation/ViewModel/LoginViewModel.swift
@@ -27,6 +27,7 @@ final class LoginViewModel: Store {
     }
 
     private let signInUseCase: SignInUseCase
+    private let loadingState = LoadingState()
 
     private(set) var state = State()
 
@@ -54,12 +55,12 @@ final class LoginViewModel: Store {
     }
 
     func run(_ effect: SideEffect) {
-        send(.setLoading(true))
         switch effect {
         case .signIn(let authProvider):
+            beginLoading(.immediate)
             Task {
                 do {
-                    defer { send(.setLoading(false)) }
+                    defer { endLoading(.immediate) }
                     try await self.signInUseCase.execute(authProvider)
                 } catch {
                     if error.isSocialLoginCancelled { return }
@@ -79,4 +80,16 @@ private extension LoginViewModel {
         state.alertMessage = String(localized: "common_error_message")
         state.showAlert = isPresented
     }
+
+    func beginLoading(_ mode: LoadingState.Mode) {
+        loadingState.begin(mode: mode) { [weak self] isLoading in
+            self?.send(.setLoading(isLoading))
+        }
+    }
+
+    func endLoading(_ mode: LoadingState.Mode) {
+        loadingState.end(mode: mode) { [weak self] isLoading in
+            self?.send(.setLoading(isLoading))
+        }
+    }
 }
diff --git a/DevLog/Presentation/ViewModel/ProfileViewModel.swift b/DevLog/Presentation/ViewModel/ProfileViewModel.swift
@@ -201,10 +201,10 @@ final class ProfileViewModel: Store {
                 }
             }
         case .fetchActivityQuarter(let quarterStart):
-            beginLoading(mode: .immediate)
+            beginLoading(mode: .delayed)
             Task {
                 do {
-                    defer { endLoading(mode: .immediate) }
+                    defer { endLoading(mode: .delayed) }
                     let quarterActivityData = try await fetchQuarterActivityData(from: quarterStart)
                     send(
                         .setActivityQuarter(
diff --git a/DevLog/Presentation/ViewModel/PushNotificationListViewModel.swift b/DevLog/Presentation/ViewModel/PushNotificationListViewModel.swift
@@ -118,10 +118,10 @@ final class PushNotificationListViewModel: Store {
             if cursor == nil {
                 stopObservingNotifications()
             }
-            beginLoading(.immediate)
+            beginLoading(.delayed)
             Task {
                 do {
-                    defer { endLoading(.immediate) }
+                    defer { endLoading(.delayed) }
                     let existingCount = cursor == nil ? 0 : self.state.notifications.count
 
                     let page = try await fetchUseCase.execute(query, cursor: cursor)
@@ -160,7 +160,7 @@ final class PushNotificationListViewModel: Store {
             beginLoading(.delayed)
             Task {
                 // endLoading(.delayed)를 defer로 두지 않는 이유
-                // send(.fetchNotifications)가 같은 턴에서 beginLoading(.immediate)를 먼저 올린 뒤
+                // send(.fetchNotifications)가 같은 턴에서 beginLoading(.delayed)를 먼저 올린 뒤
                 // delayed 로딩을 내려야 같은 isLoading이 끊기지 않기 때문
                 do {
                     try await undoDeleteUseCase.execute(notificationId)
diff --git a/DevLog/Presentation/ViewModel/PushNotificationSettingsViewModel.swift b/DevLog/Presentation/ViewModel/PushNotificationSettingsViewModel.swift
@@ -107,10 +107,10 @@ final class PushNotificationSettingsViewModel: Store {
     func run(_ effect: SideEffect) {
         switch effect {
         case .fetchPushNotificationSettings:
-            beginLoading(.immediate)
+            beginLoading(.delayed)
             Task {
                 do {
-                    defer { endLoading(.immediate) }
+                    defer { endLoading(.delayed) }
                     let settings = try await fetchPushSettingsUseCase.execute()
                     self.send(.setPushNotificationEnable(settings.isEnabled))
                     if let hour = settings.scheduledTime.hour,
diff --git a/DevLog/Presentation/ViewModel/SearchViewModel.swift b/DevLog/Presentation/ViewModel/SearchViewModel.swift
@@ -43,16 +43,22 @@ final class SearchViewModel: Store {
         case fetch(String)
     }
 
+    private enum SearchTaskKind: Hashable {
+        case debounce
+        case request
+    }
+
     private(set) var state: State = .init()
     private let fetchWebPagesUseCase: FetchWebPagesUseCase
     private let fetchTodosUseCase: FetchTodosUseCase
     private let fetchRecentSearchQueriesUseCase: FetchRecentSearchQueriesUseCase
     private let updateRecentSearchQueriesUseCase: UpdateRecentSearchQueriesUseCase
+    private let loadingState = LoadingState()
     let contentsLimit: Int = 5
 
     private let maxRecentQueries = 20
     private let searchDebounceDelay: Double = 0.4
-    private var searchDebounceTask: Task<Void, Never>?
+    private var searchTasks: [SearchTaskKind: Task<Void, Never>] = [:]
 
     init(
         fetchWebPagesUseCase: FetchWebPagesUseCase,
@@ -104,22 +110,16 @@ final class SearchViewModel: Store {
             state.showAllWebPages = false
             let trimmed = query.trimmingCharacters(in: .whitespacesAndNewlines)
             if trimmed.isEmpty {
-                cancelDebounce()
+                cancelSearch()
                 state.webPages = []
                 state.todos = []
-                state.isLoading = false
             } else {
-                state.isLoading = true
-                scheduleDebouncedQuery(query)
+                cancelSearch()
+                beginLoading(.immediate)
+                scheduleDebouncedFetch(trimmed)
             }
         case .applySearchQuery(let query):
-            let trimmed = query.trimmingCharacters(in: .whitespacesAndNewlines)
-            if trimmed.isEmpty {
-                state.webPages = []
-                state.todos = []
-            } else {
-                effects = [.fetch(trimmed)]
-            }
+            effects = [.fetch(query)]
         case .setShowAllTodos(let shouldShowAll):
             state.showAllTodos = shouldShowAll
         case .setShowAllWebPages(let shouldShowAll):
@@ -133,10 +133,16 @@ final class SearchViewModel: Store {
     func run(_ effect: SideEffect) {
         switch effect {
         case .fetch(let query):
-            Task {
+            searchTasks[.request]?.cancel()
+            let requestTask = Task { [weak self] in
+                guard let self else { return }
                 do {
-                    send(.setLoading(true))
-                    defer { send(.setLoading(false)) }
+                    defer {
+                        self.searchTasks[.request] = nil
+                        if !Task.isCancelled {
+                            self.endLoading(.immediate)
+                        }
+                    }
                     let searchesTodoOnly = searchesTodoOnly(query)
                     async let todos = fetchTodosUseCase.execute(TodoQuery(keyword: query), cursor: nil)
                     async let webPageItems = fetchWebPageItems(
@@ -145,12 +151,15 @@ final class SearchViewModel: Store {
                     )
                     let todoItems = try await todos.items.compactMap { TodoListItem(from: $0) }
                     let resolvedWebPageItems = try await webPageItems
+                    if Task.isCancelled { return }
                     send(.fetchTodos(todoItems))
                     send(.fetchWebPage(resolvedWebPageItems))
                 } catch {
+                    if error is CancellationError { return }
                     send(.setAlert(true))
                 }
             }
+            searchTasks[.request] = requestTask
         }
     }
 }
@@ -165,21 +174,36 @@ private extension SearchViewModel {
         state.showAlert = isPresented
     }
 
-    func scheduleDebouncedQuery(_ query: String) {
-        searchDebounceTask?.cancel()
-        searchDebounceTask = Task { [weak self] in
+    func scheduleDebouncedFetch(_ query: String) {
+        searchTasks[.debounce]?.cancel()
+        let debounceTask = Task { [weak self] in
             guard let self else { return }
             try? await Task.sleep(for: .seconds(searchDebounceDelay))
             if Task.isCancelled { return }
             await MainActor.run {
+                self.searchTasks[.debounce] = nil
                 self.send(.applySearchQuery(query))
             }
         }
+        searchTasks[.debounce] = debounceTask
+    }
+
+    func cancelSearch() {
+        searchTasks.values.forEach { $0.cancel() }
+        searchTasks = [:]
+        endLoading(.immediate)
     }
 
-    func cancelDebounce() {
-        searchDebounceTask?.cancel()
-        searchDebounceTask = nil
+    func beginLoading(_ mode: LoadingState.Mode) {
+        loadingState.begin(mode: mode) { [weak self] isLoading in
+            self?.send(.setLoading(isLoading))
+        }
+    }
+
+    func endLoading(_ mode: LoadingState.Mode) {
+        loadingState.end(mode: mode) { [weak self] isLoading in
+            self?.send(.setLoading(isLoading))
+        }
     }
 
     func searchesTodoOnly(_ query: String) -> Bool {
diff --git a/DevLog/Presentation/ViewModel/TodayViewModel.swift b/DevLog/Presentation/ViewModel/TodayViewModel.swift
@@ -189,10 +189,10 @@ final class TodayViewModel: Store {
     func run(_ effect: SideEffect) {
         switch effect {
         case .fetchTodos:
-            beginLoading(.immediate)
+            beginLoading(.delayed)
             Task {
                 do {
-                    defer { endLoading(.immediate) }
+                    defer { endLoading(.delayed) }
                     async let todosWithDueDatePage = fetchTodosUseCase.execute(
                         TodoQuery(
                             completionFilter: .incomplete,
diff --git a/DevLog/Presentation/ViewModel/TodoDetailViewModel.swift b/DevLog/Presentation/ViewModel/TodoDetailViewModel.swift
@@ -95,10 +95,10 @@ final class TodoDetailViewModel: Store {
     func run(_ effect: SideEffect) {
         switch effect {
         case .fetchTodo:
-            beginLoading(.immediate)
+            beginLoading(.delayed)
             Task {
                 do {
-                    defer { endLoading(.immediate) }
+                    defer { endLoading(.delayed) }
                     let todo = try await fetchTodoUseCase.execute(todoId)
                     send(.setTodo(todo))
                 } catch {
diff --git a/DevLog/Presentation/ViewModel/TodoListViewModel.swift b/DevLog/Presentation/ViewModel/TodoListViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class LoadingState {`
`25`	`25`	`private var visibleDelayedTargets = Set<AnyHashable>()`
`26`	`26`	`private var visibleTargets = Set<AnyHashable>()`
`27`	`27`
`28`		`- init(delay: Duration = .milliseconds(500)) {`
	`28`	`+ init(delay: Duration = .seconds(0.3)) {`
`29`	`29`	`self.delay = delay`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -201,10 +201,10 @@ final class ProfileViewModel: Store {`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`case .fetchActivityQuarter(let quarterStart):`
`204`		`- beginLoading(mode: .immediate)`
	`204`	`+ beginLoading(mode: .delayed)`
`205`	`205`	`Task {`
`206`	`206`	`do {`
`207`		`- defer { endLoading(mode: .immediate) }`
	`207`	`+ defer { endLoading(mode: .delayed) }`
`208`	`208`	`let quarterActivityData = try await fetchQuarterActivityData(from: quarterStart)`
`209`	`209`	`send(`
`210`	`210`	`.setActivityQuarter(`