refactor: todo 삭제 실행 취소를 firebase function으로 처리

Author: opficdev

DevLog/App/Assembler/DomainAssembler.swift

@@ -66,6 +66,10 @@ private extension DomainAssembler {
         container.register(DeleteTodoUseCase.self) {
             DeleteTodoUseCaseImpl(container.resolve(TodoRepository.self))
         }
+
+        container.register(UndoDeleteTodoUseCase.self) {
+            UndoDeleteTodoUseCaseImpl(container.resolve(TodoRepository.self))
+        }
     }
 
     func registerUserDataUseCases(_ container: DIContainer) {

DevLog/Data/Repository/TodoRepositoryImpl.swift

@@ -33,4 +33,8 @@ final class TodoRepositoryImpl: TodoRepository {
     func deleteTodo(_ todoId: String) async throws {
         try await todoService.deleteTodo(todoId: todoId)
     }
+
+    func undoDeleteTodo(_ todoId: String) async throws {
+        try await todoService.undoDeleteTodo(todoId: todoId)
+    }
 }

DevLog/Domain/Protocol/TodoRepository.swift

@@ -12,4 +12,5 @@ protocol TodoRepository {
     func fetchTodo(_ todoId: String) async throws -> Todo
     func upsertTodo(_ todo: Todo) async throws
     func deleteTodo(_ todoId: String) async throws
+    func undoDeleteTodo(_ todoId: String) async throws
 }

DevLog/Domain/UseCase/Todo/Delete/UndoDeleteTodoUseCase.swift

@@ -0,0 +1,10 @@
+//
+//  UndoDeleteTodoUseCase.swift
+//  DevLog
+//
+//  Created by opfic on 3/15/26.
+//
+
+protocol UndoDeleteTodoUseCase {
+    func execute(_ todoId: String) async throws
+}

DevLog/Domain/UseCase/Todo/Delete/UndoDeleteTodoUseCaseImpl.swift

@@ -0,0 +1,18 @@
+//
+//  UndoDeleteTodoUseCaseImpl.swift
+//  DevLog
+//
+//  Created by opfic on 3/15/26.
+//
+
+final class UndoDeleteTodoUseCaseImpl: UndoDeleteTodoUseCase {
+    private let repository: TodoRepository
+
+    init(_ repository: TodoRepository) {
+        self.repository = repository
+    }
+
+    func execute(_ todoId: String) async throws {
+        try await repository.undoDeleteTodo(todoId)
+    }
+}

DevLog/Infra/Service/TodoService.swift

@@ -188,6 +188,22 @@ final class TodoService {
         }
     }
 
+    func undoDeleteTodo(todoId: String) async throws {
+        guard Auth.auth().currentUser?.uid != nil else { throw AuthError.notAuthenticated }
+
+        logger.info("Undoing todo deletion: \(todoId)")
+
+        do {
+            let function = functions.httpsCallable("undoTodoDeletion")
+            _ = try await function.call(["todoId": todoId])
+
+            logger.info("Successfully undone todo deletion")
+        } catch {
+            logger.error("Failed to undo todo deletion", error: error)
+            throw error
+        }
+    }
+
     func fetchTodo(todoId: String) async throws -> TodoResponse {
         guard let uid = Auth.auth().currentUser?.uid else { throw AuthError.notAuthenticated }
 

DevLog/Presentation/ViewModel/TodoListViewModel.swift

@@ -70,6 +70,7 @@ final class TodoListViewModel: Store {
         case search(String)
         case upsert(Todo)
         case delete(TodoListItem, Int)
+        case undoDelete(String)
         case toggleCompleted(TodoListItem)
         case togglePinned(TodoListItem)
     }
@@ -81,6 +82,7 @@ final class TodoListViewModel: Store {
     private let fetchTodoByIdUseCase: FetchTodoByIdUseCase
     private let upsertTodoUseCase: UpsertTodoUseCase
     private let deleteTodoUseCase: DeleteTodoUseCase
+    private let undoDeleteTodoUseCase: UndoDeleteTodoUseCase
     private var pendingTask: (TodoListItem, Int)?
     private var nextCursor: TodoCursor?
 
@@ -89,12 +91,14 @@ final class TodoListViewModel: Store {
         fetchTodoByIdUseCase: FetchTodoByIdUseCase,
         upsertTodoUseCase: UpsertTodoUseCase,
         deleteTodoUseCase: DeleteTodoUseCase,
+        undoDeleteTodoUseCase: UndoDeleteTodoUseCase,
         kind: TodoKind
     ) {
         self.fetchTodosUseCase = fetchTodosUseCase
         self.fetchTodoByIdUseCase = fetchTodoByIdUseCase
         self.upsertTodoUseCase = upsertTodoUseCase
         self.deleteTodoUseCase = deleteTodoUseCase
+        self.undoDeleteTodoUseCase = undoDeleteTodoUseCase
         self.state = State(
             kind: kind,
             query: TodoQuery(kind: kind)
@@ -225,6 +229,15 @@ final class TodoListViewModel: Store {
                     send(.setAlert(true))
                 }
             }
+        case .undoDelete(let todoId):
+            Task {
+                do {
+                    try await undoDeleteTodoUseCase.execute(todoId)
+                } catch {
+                    send(.setAlert(true))
+                    send(.refresh)
+                }
+            }
         }
     }
 }
@@ -240,19 +253,12 @@ private extension TodoListViewModel {
         case .setShowEditor(let value):
             state.showEditor = value
         case .swipeTodo(let todo):
-            var effects: [SideEffect] = []
-            if let (pendingItem, _) = pendingTask {
-                effects = [.delete(pendingItem.id)]
-            }
-
             if let index = state.todos.firstIndex(where: { $0.id == todo.id }) {
                 pendingTask = (todo, index)
                 state.todos.remove(at: index)
                 setToast(&state, isPresented: true)
                 return [.delete(todo, index)]
             }
-
-            return effects
         case .setSortTarget(let target):
             state.query.sortTarget = target
             self.nextCursor = nil
@@ -293,6 +299,7 @@ private extension TodoListViewModel {
                 state.todos.insert(todo, at: index)
             }
             pendingTask = nil
+            return [.undoDelete(todo.id)]
         default:
             break
         }
@@ -302,11 +309,7 @@ private extension TodoListViewModel {
     func reduceByView(_ action: Action, state: inout State) -> [SideEffect] {
         switch action {
         case .confirmDelete:
-            guard let (item, _) = pendingTask else {
-                return []
-            }
             pendingTask = nil
-            return [.delete(item.id)]
         case .onAppear:
             return [.fetch]
         case .loadNextPage:

DevLog/UI/Home/HomeView.swift

@@ -30,6 +30,7 @@ struct HomeView: View {
                         fetchTodoByIdUseCase: container.resolve(FetchTodoByIdUseCase.self),
                         upsertTodoUseCase: container.resolve(UpsertTodoUseCase.self),
                         deleteTodoUseCase: container.resolve(DeleteTodoUseCase.self),
+                        undoDeleteTodoUseCase: container.resolve(UndoDeleteTodoUseCase.self),
                         kind: todoKind
                     ))
                     .environment(router)

Firebase/functions/src/index.ts

@@ -40,6 +40,7 @@ import {
 
 import {
     requestTodoDeletion,
+    undoTodoDeletion,
     completeTodoDeletion
 } from "./todo/deletion";
 
@@ -84,5 +85,6 @@ export {
     removeCompletedTodoReceipts,
     removeStaleTodoReceipts,
     requestTodoDeletion,
+    undoTodoDeletion,
     completeTodoDeletion
 };

Firebase/functions/src/todo/deletion.ts

@@ -104,6 +104,65 @@ export const requestTodoDeletion = onCall({
     }
 );
 
+export const undoTodoDeletion = onCall({
+        cors: true,
+        maxInstances: 10,
+        region: LOCATION,
+    },
+    async (request) => {
+        const userId = request.auth?.uid;
+        const todoId = typeof request.data?.todoId === "string" ? request.data.todoId.trim() : "";
+
+        if (!userId) {
+            throw new HttpsError("unauthenticated", "인증된 사용자가 아닙니다.");
+        }
+
+        if (!todoId) {
+            throw new HttpsError("invalid-argument", "todoId가 필요합니다.");
+        }
+
+        const taskSnapshot = await admin.firestore()
+            .collection("todoDeletionTasks")
+            .where("userId", "==", userId)
+            .where("todoId", "==", todoId)
+            .get();
+
+        try {
+            const todoRef = admin.firestore().doc(`users/${userId}/todoLists/${todoId}`);
+            const todoSnapshot = await todoRef.get();
+
+            if (todoSnapshot.exists) {
+                await todoRef.update({
+                    deletingAt: admin.firestore.FieldValue.delete()
+                });
+            }
+
+            await updateNotificationsDeletingAt(
+                userId,
+                todoId,
+                admin.firestore.FieldValue.delete()
+            );
+
+            if (!taskSnapshot.empty) {
+                const batch = admin.firestore().batch();
+                taskSnapshot.docs.forEach((document) => {
+                    batch.delete(document.ref);
+                });
+                await batch.commit();
+            }
+        } catch (error) {
+            logger.error("todo 삭제 취소 실패", {
+                userId,
+                todoId,
+                error: normalizeError(error)
+            });
+            throw new HttpsError("internal", "Todo 삭제 취소에 실패했습니다.");
+        }
+
+        return {success: true};
+    }
+);
+
 export const completeTodoDeletion = onTaskDispatched({
         region: LOCATION,
         retryConfig: {maxAttempts: 3, minBackoffSeconds: 5},