[#275] 토스트를 통해 undo 액션이 구현되어 있을 경우 서버사이드로 책임을 이관하도록 개선한다

DevLog/App/Assembler/DomainAssembler.swift

@@ -95,6 +95,10 @@ private extension DomainAssembler {
             DeletePushNotificationUseCaseImpl(container.resolve(PushNotificationRepository.self))
         }
 
+        container.register(UndoDeletePushNotificationUseCase.self) {
+            UndoDeletePushNotificationUseCaseImpl(container.resolve(PushNotificationRepository.self))
+        }
+
         container.register(FetchPushNotificationsUseCase.self) {
             FetchPushNotificationsUseCaseImpl(container.resolve(PushNotificationRepository.self))
         }
@@ -116,6 +120,10 @@ private extension DomainAssembler {
         container.register(DeleteWebPageUseCase.self) {
             DeleteWebPageUseCaseImpl(container.resolve(WebPageRepository.self))
         }
+
+        container.register(UndoDeleteWebPageUseCase.self) {
+            UndoDeleteWebPageUseCaseImpl(container.resolve(WebPageRepository.self))
+        }
     }
 
     func registerUserPreferencesUseCases(_ container: DIContainer) {

DevLog/Data/Repository/PushNotificationRepositoryImpl.swift

@@ -56,6 +56,10 @@ final class PushNotificationRepositoryImpl: PushNotificationRepository {
         try await service.deleteNotification(notificationID)
     }
 
+    func undoDeleteNotification(_ notificationID: String) async throws {
+        try await service.undoDeleteNotification(notificationID)
+    }
+
     // 푸시 알림 읽음/안읽음 토글
     func toggleNotificationRead(_ todoId: String) async throws {
         try await service.toggleNotificationRead(todoId)

DevLog/Data/Repository/WebPageRepositoryImpl.swift

@@ -57,6 +57,10 @@ final class WebPageRepositoryImpl: WebPageRepository {
         try await webPageService.deleteWebPage(urlString)
         await metadataService.removeCachedImage(for: urlString)
     }
+
+    func undoDelete(_ urlString: String) async throws {
+        try await webPageService.undoDeleteWebPage(urlString)
+    }
 }
 
 private extension WebPageRepositoryImpl {

DevLog/Domain/Protocol/PushNotificationRepository.swift

@@ -21,5 +21,6 @@ protocol PushNotificationRepository {
         limit: Int
     ) throws -> AnyPublisher<PushNotificationPage, Error>
     func deleteNotification(_ notificationID: String) async throws
+    func undoDeleteNotification(_ notificationID: String) async throws
     func toggleNotificationRead(_ todoId: String) async throws
 }

DevLog/Domain/Protocol/WebPageRepository.swift

@@ -9,4 +9,5 @@ protocol WebPageRepository {
     func fetch(_ query: String) async throws -> [WebPage]
     func upsert(_ urlString: String) async throws
     func delete(_ urlString: String) async throws
+    func undoDelete(_ urlString: String) async throws
 }

DevLog/Domain/UseCase/PushNotification/Delete/UndoDeletePushNotificationUseCase.swift

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

DevLog/Domain/UseCase/PushNotification/Delete/UndoDeletePushNotificationUseCaseImpl.swift

@@ -0,0 +1,18 @@
+//
+//  UndoDeletePushNotificationUseCaseImpl.swift
+//  DevLog
+//
+//  Created by opfic on 3/16/26.
+//
+
+final class UndoDeletePushNotificationUseCaseImpl: UndoDeletePushNotificationUseCase {
+    private let repository: PushNotificationRepository
+
+    init(_ repository: PushNotificationRepository) {
+        self.repository = repository
+    }
+
+    func execute(_ notificationID: String) async throws {
+        try await repository.undoDeleteNotification(notificationID)
+    }
+}

DevLog/Domain/UseCase/WebPage/Upsert/UndoDeleteWebPageUseCase.swift

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

DevLog/Domain/UseCase/WebPage/Upsert/UndoDeleteWebPageUseCaseImpl.swift

@@ -0,0 +1,18 @@
+//
+//  UndoDeleteWebPageUseCaseImpl.swift
+//  DevLog
+//
+//  Created by opfic on 3/16/26.
+//
+
+final class UndoDeleteWebPageUseCaseImpl: UndoDeleteWebPageUseCase {
+    private let repository: WebPageRepository
+
+    init(_ repository: WebPageRepository) {
+        self.repository = repository
+    }
+
+    func execute(_ urlString: String) async throws {
+        try await repository.undoDelete(urlString)
+    }
+}

DevLog/Infra/Service/PushNotificationService.swift

@@ -8,9 +8,16 @@
 import FirebaseAuth
 import Combine
 import FirebaseFirestore
+import FirebaseFunctions
 
 final class PushNotificationService {
+    private enum FunctionName: String {
+        case requestPushNotificationDeletion
+        case undoPushNotificationDeletion
+    }
+
     private let store = Firestore.firestore()
+    private let functions = Functions.functions(region: "asia-northeast3")
     private let logger = Logger(category: "PushNotificationService")
 
     /// 푸시 알림 On/Off 설정
@@ -174,13 +181,24 @@ final class PushNotificationService {
     /// 푸시 알림 기록 삭제
     func deleteNotification(_ notificationID: String) async throws {
         do {
-            guard let uid = Auth.auth().currentUser?.uid else { throw AuthError.notAuthenticated }
+            guard Auth.auth().currentUser?.uid != nil else { throw AuthError.notAuthenticated }
 
-            let docRef = store.collection("users/\(uid)/notifications").document(notificationID)
+            let function = functions.httpsCallable(FunctionName.requestPushNotificationDeletion)
+            _ = try await function.call(["notificationId": notificationID])
+        } catch {
+            logger.error("Failed to request notification deletion", error: error)
+            throw error
+        }
+    }
+
+    func undoDeleteNotification(_ notificationID: String) async throws {
+        do {
+            guard Auth.auth().currentUser?.uid != nil else { throw AuthError.notAuthenticated }
 
-            try await docRef.delete()
+            let function = functions.httpsCallable(FunctionName.undoPushNotificationDeletion)
+            _ = try await function.call(["notificationId": notificationID])
         } catch {
-            logger.error("Failed to delete notification", error: error)
+            logger.error("Failed to undo notification deletion", error: error)
             throw error
         }
     }

DevLog/Infra/Service/WebPageService.swift

@@ -7,9 +7,16 @@
 
 import FirebaseAuth
 import FirebaseFirestore
+import FirebaseFunctions
 
 final class WebPageService {
+    private enum FunctionName: String {
+        case requestWebPageDeletion
+        case undoWebPageDeletion
+    }
+
     private let store = Firestore.firestore()
+    private let functions = Functions.functions(region: "asia-northeast3")
     private let encoder = Firestore.Encoder()
     private let logger = Logger(category: "WebPageService")
 
@@ -67,21 +74,37 @@ final class WebPageService {
     }
 
     func deleteWebPage(_ urlString: String) async throws {
-        logger.info("Deleting web page: \(urlString)")
+        logger.info("Requesting web page deletion: \(urlString)")
 
-        guard let uid = Auth.auth().currentUser?.uid else {
+        guard Auth.auth().currentUser?.uid != nil else {
+            logger.error("User not authenticated")
+            throw AuthError.notAuthenticated
+        }
+
+        do {
+            let function = functions.httpsCallable(FunctionName.requestWebPageDeletion)
+            _ = try await function.call(["urlString": urlString])
+            logger.info("Successfully requested web page deletion")
+        } catch {
+            logger.error("Failed to request web page deletion", error: error)
+            throw error
+        }
+    }
+
+    func undoDeleteWebPage(_ urlString: String) async throws {
+        logger.info("Undoing web page deletion: \(urlString)")
+
+        guard Auth.auth().currentUser?.uid != nil else {
             logger.error("User not authenticated")
             throw AuthError.notAuthenticated
         }
 
         do {
-            let documentID = documentID(for: urlString)
-            let docRef = store
-                .document("users/\(uid)/webPages/\(documentID)")
-            try await docRef.delete()
-            logger.info("Successfully deleted web page")
+            let function = functions.httpsCallable(FunctionName.undoWebPageDeletion)
+            _ = try await function.call(["urlString": urlString])
+            logger.info("Successfully undone web page deletion")
         } catch {
-            logger.error("Failed to delete web page", error: error)
+            logger.error("Failed to undo web page deletion", error: error)
             throw error
         }
     }
@@ -101,6 +124,9 @@ final class WebPageService {
 private extension WebPageService {
     func makeResponse(from snapshot: QueryDocumentSnapshot) -> WebPageResponse? {
         let data = snapshot.data()
+        if data[WebPageFieldKey.deletingAt.rawValue] is Timestamp {
+            return nil
+        }
         guard
             let title = data[WebPageFieldKey.title.rawValue] as? String,
             let url = data[WebPageFieldKey.url.rawValue] as? String,
@@ -123,5 +149,6 @@ private extension WebPageService {
         case url
         case displayURL
         case imageURL
+        case deletingAt // 삭제 요청은 되었지만, 5초 유예 후 최종 삭제되기 전 상태
     }
 }