refactor: 푸시알람 리스트 제거 undo 시 별도의 Task 문서를 생성하지 않도록 개선

Author: opficdev

Firebase/functions/src/index.ts

@@ -60,6 +60,10 @@ import {
     completePushNotificationDeletion
 } from "./notification/deletion";
 
+import {
+    cleanupSoftDeletedNotifications
+} from "./notification/cleanup";
+
 import {
     requestWebPageDeletion,
     undoWebPageDeletion,
@@ -120,6 +124,7 @@ export {
     requestPushNotificationDeletion,
     undoPushNotificationDeletion,
     completePushNotificationDeletion,
+    cleanupSoftDeletedNotifications,
     requestWebPageDeletion,
     undoWebPageDeletion,
     completeWebPageDeletion,

Firebase/functions/src/notification/cleanup.ts

@@ -0,0 +1,40 @@
+import { onSchedule } from "firebase-functions/v2/scheduler";
+import * as admin from "firebase-admin";
+import * as logger from "firebase-functions/logger";
+import { normalizeError } from "../common/error";
+
+const LOCATION = "asia-northeast3";
+const CLEANUP_BATCH_SIZE = 200;
+
+export const cleanupSoftDeletedNotifications = onSchedule({
+        maxInstances: 1,
+        region: LOCATION,
+        schedule: "0 0 * * *",
+        timeZone: "UTC"
+    },
+    async () => {
+        try {
+            while (true) {
+                const snapshot = await admin.firestore()
+                    .collectionGroup("notifications")
+                    .where("isDeleted", "==", true)
+                    .limit(CLEANUP_BATCH_SIZE)
+                    .get();
+
+                if (snapshot.empty) { return; }
+
+                const batch = admin.firestore().batch();
+                snapshot.docs.forEach((document) => {
+                    batch.delete(document.ref);
+                });
+                await batch.commit();
+
+                if (snapshot.size < CLEANUP_BATCH_SIZE) { return; }
+            }
+        } catch (error) {
+            logger.error("soft delete Notification cleanup 실패", {
+                error: normalizeError(error)
+            });
+        }
+    }
+);

Firebase/functions/src/notification/deletion.ts

@@ -9,10 +9,9 @@ import { FirestorePath } from "../common/firestorePath";
 const LOCATION = "asia-northeast3";
 const DELETE_DELAY_SECONDS = 5;
 
-type NotificationDeletionTaskData = {
+type NotificationDeletionPayload = {
     userId: string;
     notificationId: string;
-    createdAt?: FirebaseFirestore.Timestamp | Date | null;
 };
 
 export const requestPushNotificationDeletion = onCall({
@@ -37,45 +36,27 @@ export const requestPushNotificationDeletion = onCall({
         const notificationRef = admin.firestore().doc(FirestorePath.notification(userId, notificationId));
         const notificationSnapshot = await notificationRef.get();
 
-        if (!notificationSnapshot.exists) {
+        if (!notificationSnapshot.exists || notificationSnapshot.data()?.isDeleted === true) {
             throw new HttpsError("not-found", "Notification을 찾을 수 없습니다.");
         }
 
-        const taskRef = admin.firestore().collection("notificationDeletionTasks").doc();
-        const taskData = {
-            userId,
-            notificationId,
-            createdAt: admin.firestore.FieldValue.serverTimestamp()
-        };
-
         try {
-            await taskRef.set(taskData);
             await notificationRef.set({
                 // deletingAt: 삭제 요청은 되었지만, 5초 유예 후 최종 삭제되기 전 상태를 의미한다.
-                deletingAt: admin.firestore.FieldValue.serverTimestamp()
+                deletingAt: admin.firestore.FieldValue.serverTimestamp(),
+                isDeleted: false
             }, {merge: true});
 
             const queue = getFunctions().taskQueue(
                 `locations/${LOCATION}/functions/completePushNotificationDeletion`
             );
             await queue.enqueue(
-                {taskId: taskRef.id},
+                { userId, notificationId },
                 {scheduleDelaySeconds: DELETE_DELAY_SECONDS}
             );
         } catch (error) {
-            try {
-                await taskRef.delete();
-            } catch (cleanupError) {
-                logger.warn("notificationDeletionTasks 정리 실패", {
-                    userId,
-                    notificationId,
-                    taskId: taskRef.id,
-                    error: normalizeError(cleanupError)
-                });
-            }
-
             const currentNotificationSnapshot = await notificationRef.get();
-            if (currentNotificationSnapshot.exists) {
+            if (currentNotificationSnapshot.exists && currentNotificationSnapshot.data()?.isDeleted !== true) {
                 await notificationRef.update({
                     deletingAt: admin.firestore.FieldValue.delete()
                 });
@@ -111,28 +92,15 @@ export const undoPushNotificationDeletion = onCall({
         if (!notificationId) {
             throw new HttpsError("invalid-argument", "notificationId가 필요합니다.");
         }
-
-        const taskSnapshot = await admin.firestore()
-            .collection("notificationDeletionTasks")
-            .where("userId", "==", userId)
-            .where("notificationId", "==", notificationId)
-            .get();
         const notificationRef = admin.firestore().doc(FirestorePath.notification(userId, notificationId));
 
         try {
             const notificationSnapshot = await notificationRef.get();
-            if (notificationSnapshot.exists) {
+            if (notificationSnapshot.exists && notificationSnapshot.data()?.isDeleted !== true) {
                 await notificationRef.update({
-                    deletingAt: admin.firestore.FieldValue.delete()
-                });
-            }
-
-            if (!taskSnapshot.empty) {
-                const batch = admin.firestore().batch();
-                taskSnapshot.docs.forEach((document) => {
-                    batch.delete(document.ref);
+                    deletingAt: admin.firestore.FieldValue.delete(),
+                    isDeleted: false
                 });
-                await batch.commit();
             }
         } catch (error) {
             logger.error("푸시 알림 삭제 취소 실패", {
@@ -154,45 +122,54 @@ export const completePushNotificationDeletion = onTaskDispatched({
         rateLimits: {maxDispatchesPerSecond: 200},
     },
     async (request) => {
-        const taskId = typeof request.data?.taskId === "string" ? request.data.taskId.trim() : "";
-        if (!taskId) {
+        const payload = parseDeletionPayload(request.data);
+        if (!payload) {
             logger.warn("유효하지 않은 푸시 알림 삭제 payload", request.data);
             return;
         }
 
-        const taskRef = admin.firestore().collection("notificationDeletionTasks").doc(taskId);
-        const taskSnapshot = await taskRef.get();
-        if (!taskSnapshot.exists) { return; }
-
-        const taskData = taskSnapshot.data() as NotificationDeletionTaskData | undefined;
-        const userId = typeof taskData?.userId === "string" ? taskData.userId : "";
-        const notificationId = typeof taskData?.notificationId === "string" ? taskData.notificationId : "";
-        if (!userId || !notificationId) {
-            logger.warn("notificationDeletionTasks 문서 형식이 올바르지 않습니다.", {taskId});
-            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) {
-                await taskRef.delete();
+            if (!notificationSnapshot.exists || !deletingAt || isDeleted) {
                 return;
             }
 
-            await notificationRef.delete();
-            await taskRef.delete();
+            await notificationRef.set({
+                deletingAt: admin.firestore.FieldValue.delete(),
+                isDeleted: true
+            }, { merge: true });
         } catch (error) {
             logger.error("푸시 알림 최종 삭제 실패", {
                 userId,
                 notificationId,
-                taskId,
                 error: normalizeError(error)
             });
             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
+    };
+}