refactor: 테스트 코드를 바탕으로 Todo의 soft deletion와 동일한 형태로 undo 로직 개선

opficdev · opficdev · commit af8912d0faf8 · 2026-04-06T18:18:33.000+09:00
diff --git a/DevLog/Infra/Service/PushNotificationService.swift b/DevLog/Infra/Service/PushNotificationService.swift
@@ -193,9 +193,7 @@ final class PushNotificationService {
                 }
 
                 guard let snapshot else { return }
-                let unreadPushCount = snapshot.documents.filter { document in
-                    !(document.data()[PushNotificationFieldKey.deletingAt.rawValue] is Timestamp)
-                }.count
+                let unreadPushCount = snapshot.documents.count
                 subject.send(unreadPushCount)
             }
 
@@ -304,8 +302,7 @@ private extension PushNotificationService {
 
     func makeResponse(from snapshot: QueryDocumentSnapshot) -> PushNotificationResponse? {
         let data = snapshot.data()
-        if data[PushNotificationFieldKey.deletingAt.rawValue] is Timestamp ||
-            (data[PushNotificationFieldKey.isDeleted.rawValue] as? Bool) == true {
+        if (data[PushNotificationFieldKey.isDeleted.rawValue] as? Bool) == true {
             return nil
         }
         guard
@@ -336,7 +333,6 @@ private extension PushNotificationService {
         case isRead
         case todoId
         case todoCategory
-        case deletingAt // 삭제 요청으로 앱의 로컬 데이터에서 deletion이 된 상태
         case isDeleted  // 삭제 요청으로 서버에서 soft deletion이 된 상태
     }
 }
diff --git a/DevLog/Infra/Service/WebPageService.swift b/DevLog/Infra/Service/WebPageService.swift
@@ -125,9 +125,6 @@ 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
             (data[WebPageFieldKey.isDeleted.rawValue] as? Bool) != true,
             let title = data[WebPageFieldKey.title.rawValue] as? String,
@@ -151,7 +148,6 @@ private extension WebPageService {
         case url
         case displayURL
         case imageURL
-        case deletingAt // 삭제 요청으로 앱의 로컬 데이터에서 deletion이 된 상태
         case isDeleted  // 삭제 요청으로 서버에서 soft deletion이 된 상태
     }
 }
diff --git a/Firebase/functions/src/index.ts b/Firebase/functions/src/index.ts
@@ -52,8 +52,7 @@ import {
 
 import {
     requestPushNotificationDeletion,
-    undoPushNotificationDeletion,
-    completePushNotificationDeletion
+    undoPushNotificationDeletion
 } from "./notification/deletion";
 
 import {
@@ -65,8 +64,7 @@ import {
 
 import {
     requestWebPageDeletion,
-    undoWebPageDeletion,
-    completeWebPageDeletion
+    undoWebPageDeletion
 } from "./webPage/deletion";
 
 import {
@@ -121,10 +119,8 @@ export {
     undoTodoDeletion,
     requestPushNotificationDeletion,
     undoPushNotificationDeletion,
-    completePushNotificationDeletion,
     cleanupSoftDeletedNotifications,
     requestWebPageDeletion,
     undoWebPageDeletion,
-    completeWebPageDeletion,
     cleanupSoftDeletedWebPages
 };
diff --git a/Firebase/functions/src/notification/deletion.ts b/Firebase/functions/src/notification/deletion.ts
@@ -1,18 +1,11 @@
 import { onCall, HttpsError } from "firebase-functions/v2/https";
-import { onTaskDispatched } from "firebase-functions/v2/tasks";
-import { getFunctions } from "firebase-admin/functions";
+import { FieldValue } from "firebase-admin/firestore";
 import * as admin from "firebase-admin";
 import * as logger from "firebase-functions/logger";
 import { toError } from "../common/error";
 import { FirestorePath } from "../common/firestorePath";
 
 const LOCATION = "asia-northeast3";
-const DELETE_DELAY_SECONDS = 5;
-
-type NotificationDeletionPayload = {
-    userId: string;
-    notificationId: string;
-};
 
 export const requestPushNotificationDeletion = onCall({
         cors: true,
@@ -42,30 +35,23 @@ export const requestPushNotificationDeletion = onCall({
 
         try {
             await notificationRef.set({
-                // deletingAt: 삭제 요청은 되었지만, 5초 유예 후 최종 삭제되기 전 상태를 의미한다.
-                deletingAt: admin.firestore.FieldValue.serverTimestamp(),
-                isDeleted: false
+                deletingAt: FieldValue.delete(),
+                isDeleted: true
             }, {merge: true});
-
-            const queue = getFunctions().taskQueue(
-                `locations/${LOCATION}/functions/completePushNotificationDeletion`
-            );
-            await queue.enqueue(
-                { userId, notificationId },
-                {scheduleDelaySeconds: DELETE_DELAY_SECONDS}
-            );
         } catch (error) {
-            const currentNotificationSnapshot = await notificationRef.get();
-            if (currentNotificationSnapshot.exists && currentNotificationSnapshot.data()?.isDeleted !== true) {
-                await notificationRef.update({
-                    deletingAt: admin.firestore.FieldValue.delete()
-                });
+            try {
+                const currentNotificationSnapshot = await notificationRef.get();
+                if (currentNotificationSnapshot.exists && currentNotificationSnapshot.data()?.isDeleted === true) {
+                    await notificationRef.update({
+                        deletingAt: FieldValue.delete(),
+                        isDeleted: false
+                    });
+                }
+            } catch (cleanupError) {
+                logger.error("푸시 알림 삭제 요청 cleanup 실패", toError(cleanupError), { userId, notificationId });
             }
 
-            logger.error("푸시 알림 삭제 요청 실패", toError(error), {
-                userId,
-                notificationId
-            });
+            logger.error("푸시 알림 삭제 요청 실패", toError(error), { userId, notificationId });
             throw new HttpsError("internal", "푸시 알림 삭제 요청에 실패했습니다.");
         }
 
@@ -95,9 +81,9 @@ export const undoPushNotificationDeletion = onCall({
 
         try {
             const notificationSnapshot = await notificationRef.get();
-            if (notificationSnapshot.exists && notificationSnapshot.data()?.isDeleted !== true) {
+            if (notificationSnapshot.exists && notificationSnapshot.data()?.isDeleted === true) {
                 await notificationRef.update({
-                    deletingAt: admin.firestore.FieldValue.delete(),
+                    deletingAt: FieldValue.delete(),
                     isDeleted: false
                 });
             }
@@ -112,61 +98,3 @@ export const undoPushNotificationDeletion = onCall({
         return {success: true};
     }
 );
-
-export const completePushNotificationDeletion = onTaskDispatched({
-        maxInstances: 5,
-        region: LOCATION,
-        retryConfig: { maxAttempts: 3, minBackoffSeconds: 5},
-        rateLimits: { maxDispatchesPerSecond: 5 },
-    },
-    async (request) => {
-        const payload = parseDeletionPayload(request.data);
-        if (!payload) {
-            logger.warn("유효하지 않은 푸시 알림 삭제 payload", request.data);
-            return;
-        }
-
-        const { userId, notificationId } = payload;
-
-        const notificationRef = admin.firestore().doc(FirestorePath.notification(userId, notificationId));
-
-        try {
-            const notificationSnapshot = await notificationRef.get();
-            const deletingAt = notificationSnapshot.data()?.deletingAt;
-            const isDeleted = notificationSnapshot.data()?.isDeleted === true;
-
-            if (!notificationSnapshot.exists || !deletingAt || isDeleted) {
-                return;
-            }
-
-            await notificationRef.set({
-                deletingAt: admin.firestore.FieldValue.delete(),
-                isDeleted: true
-            }, { merge: true });
-        } catch (error) {
-            logger.error("푸시 알림 최종 삭제 실패", toError(error), {
-                userId,
-                notificationId
-            });
-            throw error;
-        }
-    }
-);
-
-function parseDeletionPayload(data: unknown): NotificationDeletionPayload | null {
-    const userId = typeof (data as NotificationDeletionPayload | undefined)?.userId === "string" ?
-        (data as NotificationDeletionPayload).userId.trim() :
-        "";
-    const notificationId = typeof (data as NotificationDeletionPayload | undefined)?.notificationId === "string" ?
-        (data as NotificationDeletionPayload).notificationId.trim() :
-        "";
-
-    if (!userId || !notificationId) {
-        return null;
-    }
-
-    return {
-        userId,
-        notificationId
-    };
-}
diff --git a/Firebase/functions/src/webPage/deletion.ts b/Firebase/functions/src/webPage/deletion.ts
@@ -1,18 +1,11 @@
 import { onCall, HttpsError } from "firebase-functions/v2/https";
-import { onTaskDispatched } from "firebase-functions/v2/tasks";
-import { getFunctions } from "firebase-admin/functions";
+import { FieldValue } from "firebase-admin/firestore";
 import * as admin from "firebase-admin";
 import * as logger from "firebase-functions/logger";
 import { toError } from "../common/error";
 import { FirestorePath } from "../common/firestorePath";
 
 const LOCATION = "asia-northeast3";
-const DELETE_DELAY_SECONDS = 5;
-
-type WebPageDeletionPayload = {
-    userId: string;
-    urlString: string;
-};
 
 export const requestWebPageDeletion = onCall({
         cors: true,
@@ -47,23 +40,22 @@ export const requestWebPageDeletion = onCall({
 
         try {
             await webPageRef.set({
-                // deletingAt: 삭제 요청은 되었지만, 5초 유예 후 최종 soft delete 되기 전 상태를 의미한다.
-                deletingAt: admin.firestore.FieldValue.serverTimestamp(),
-                isDeleted: false
+                deletingAt: FieldValue.delete(),
+                isDeleted: true
             }, { merge: true });
-
-            const queue = getFunctions().taskQueue(
-                `locations/${LOCATION}/functions/completeWebPageDeletion`
-            );
-            await queue.enqueue(
-                { userId, urlString },
-                { scheduleDelaySeconds: DELETE_DELAY_SECONDS }
-            );
         } catch (error) {
-            const currentWebPageSnapshot = await webPageRef.get();
-            if (currentWebPageSnapshot.exists && currentWebPageSnapshot.data()?.isDeleted !== true) {
-                await webPageRef.update({
-                    deletingAt: admin.firestore.FieldValue.delete()
+            try {
+                const currentWebPageSnapshot = await webPageRef.get();
+                if (currentWebPageSnapshot.exists && currentWebPageSnapshot.data()?.isDeleted === true) {
+                    await webPageRef.update({
+                        deletingAt: FieldValue.delete(),
+                        isDeleted: false
+                    });
+                }
+            } catch (cleanupError) {
+                logger.error("웹페이지 삭제 요청 cleanup 실패", toError(cleanupError), {
+                    userId,
+                    urlString
                 });
             }
 
@@ -110,9 +102,9 @@ export const undoWebPageDeletion = onCall({
 
         try {
             const currentWebPageSnapshot = await webPageRef.get();
-            if (currentWebPageSnapshot.exists && currentWebPageSnapshot.data()?.isDeleted !== true) {
+            if (currentWebPageSnapshot.exists && currentWebPageSnapshot.data()?.isDeleted === true) {
                 await webPageRef.update({
-                    deletingAt: admin.firestore.FieldValue.delete(),
+                    deletingAt: FieldValue.delete(),
                     isDeleted: false
                 });
             }
@@ -127,69 +119,3 @@ export const undoWebPageDeletion = onCall({
         return { success: true };
     }
 );
-
-export const completeWebPageDeletion = onTaskDispatched({
-        maxInstances: 5,
-        region: LOCATION,
-        retryConfig: { maxAttempts: 3, minBackoffSeconds: 5 },
-        rateLimits: { maxDispatchesPerSecond: 5 },
-    },
-    async (request) => {
-        const payload = parseDeletionPayload(request.data);
-        if (!payload) {
-            logger.warn("유효하지 않은 웹페이지 삭제 payload", request.data);
-            return;
-        }
-
-        const { userId, urlString } = payload;
-        const webPageSnapshot = await admin.firestore()
-            .collection(FirestorePath.webPages(userId))
-            .where("url", "==", urlString)
-            .limit(1)
-            .get();
-        if (webPageSnapshot.empty) {
-            return;
-        }
-
-        const webPageRef = webPageSnapshot.docs[0].ref;
-
-        try {
-            const currentWebPageSnapshot = await webPageRef.get();
-            const deletingAt = currentWebPageSnapshot.data()?.deletingAt;
-            const isDeleted = currentWebPageSnapshot.data()?.isDeleted === true;
-
-            if (!currentWebPageSnapshot.exists || !deletingAt || isDeleted) {
-                return;
-            }
-
-            await webPageRef.set({
-                deletingAt: admin.firestore.FieldValue.delete(),
-                isDeleted: true
-            }, { merge: true });
-        } catch (error) {
-            logger.error("웹페이지 최종 soft delete 실패", toError(error), {
-                userId,
-                urlString
-            });
-            throw error;
-        }
-    }
-);
-
-function parseDeletionPayload(data: unknown): WebPageDeletionPayload | null {
-    const userId = typeof (data as WebPageDeletionPayload | undefined)?.userId === "string" ?
-        (data as WebPageDeletionPayload).userId.trim() :
-        "";
-    const urlString = typeof (data as WebPageDeletionPayload | undefined)?.urlString === "string" ?
-        (data as WebPageDeletionPayload).urlString.trim() :
-        "";
-
-    if (!userId || !urlString) {
-        return null;
-    }
-
-    return {
-        userId,
-        urlString
-    };
-}

Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,7 @@ final class PushNotificationService {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`guard let snapshot else { return }`
`196`		`- let unreadPushCount = snapshot.documents.filter { document in`
`197`		`- !(document.data()[PushNotificationFieldKey.deletingAt.rawValue] is Timestamp)`
`198`		`- }.count`
	`196`	`+ let unreadPushCount = snapshot.documents.count`
`199`	`197`	`subject.send(unreadPushCount)`
`200`	`198`	`}`
`201`	`199`
`@@ -304,8 +302,7 @@ private extension PushNotificationService {`
`304`	`302`
`305`	`303`	`func makeResponse(from snapshot: QueryDocumentSnapshot) -> PushNotificationResponse? {`
`306`	`304`	`let data = snapshot.data()`
`307`		`- if data[PushNotificationFieldKey.deletingAt.rawValue] is Timestamp \|\|`
`308`		`- (data[PushNotificationFieldKey.isDeleted.rawValue] as? Bool) == true {`
	`305`	`+ if (data[PushNotificationFieldKey.isDeleted.rawValue] as? Bool) == true {`
`309`	`306`	`return nil`
`310`	`307`	`}`
`311`	`308`	`guard`
`@@ -336,7 +333,6 @@ private extension PushNotificationService {`
`336`	`333`	`case isRead`
`337`	`334`	`case todoId`
`338`	`335`	`case todoCategory`
`339`		`- case deletingAt // 삭제 요청으로 앱의 로컬 데이터에서 deletion이 된 상태`
`340`	`336`	`case isDeleted // 삭제 요청으로 서버에서 soft deletion이 된 상태`
`341`	`337`	`}`
`342`	`338`	`}`