[#130] Firebase로 dueDate가 하루 남은 Todo에 대해서 해당 계정으로 푸시 알람을 보내고 저장하는 기능을 구현한다

DevLog/App/Delegate/AppDelegate.swift

@@ -8,6 +8,8 @@
 import Combine
 import UIKit
 import Firebase
+import FirebaseAuth
+import FirebaseFirestore
 import FirebaseMessaging
 import GoogleSignIn
 import UserNotifications
@@ -39,7 +41,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
                 }
             }
         }
-
+
+        // 앱이 온그라운드로 되었을 때, 로그인 세션이 존재한다면 현재 유저의 timeZone 저장
+        updateUserTimeZone()
+
         // Firebase Messaging 설정
         Messaging.messaging().delegate = self
 
@@ -76,6 +81,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
             NotificationCenter.default.post(name: .fcmToken, object: nil, userInfo: ["fcmToken": fcmToken])
         }
     }
+
+    private func updateUserTimeZone() {
+        Task {
+            do {
+                guard let uid = Auth.auth().currentUser?.uid else { return }
+                let settingsRef = Firestore.firestore().document("users/\(uid)/userData/settings")
+
+                try await settingsRef.setData(["timeZone": TimeZone.autoupdatingCurrent.identifier], merge: true)
+            } catch {
+                print("Failed to update timeZone: \(error)")
+            }
+        }
+    }
 }
 
 extension AppDelegate: UNUserNotificationCenterDelegate {

DevLog/Infra/Service/UserService.swift

@@ -22,18 +22,17 @@ final class UserService {
             logger.error("User not authenticated")
             throw AuthError.notAuthenticated
         }
+
+        let userRef = store.document("users/\(user.uid)")
         let infoRef = store.document("users/\(user.uid)/userData/info")
         let tokensRef = store.document("users/\(user.uid)/userData/tokens")
         let settingsRef = store.document("users/\(user.uid)/userData/settings")
-        
+
         // 사용자 기본 정보
         var userField: [String: Any] = [
-            "statusMsg": "",
-            "lastLogin": FieldValue.serverTimestamp()
+            "currentProvider": response.providerID
         ]
 
-        userField["currentProvider"] = response.providerID
-
         // 공급자 이슈로 인한 nil 방지
         if let email = user.email {
             userField["email"] = email
@@ -48,22 +47,45 @@ final class UserService {
             user.displayName != nil && user.displayName != "" {
             userField["appleName"] = user.displayName
         }
-
-        try await infoRef.setData(userField, merge: true)
+
+        let userDocument = try await userRef.getDocument()
+        if !userDocument.exists {
+            userField["statusMsg"] = ""
+        }
 
         var settingField = ["fcmToken": response.fcmToken]
 
         // 깃헙 로그인 시 추가 정보 저장
         if response.providerID == "github.com", let accessToken = response.accessToken {
             settingField["githubAccessToken"] = accessToken
         }
-
-        try await tokensRef.setData(settingField, merge: true)
 
-        try await settingsRef.setData([
-            "allowPushNotification": true,
-            "pushNotificationHour": 9,
-            "pushNotificationMinute": 0], merge: true)
+        // Reference to capture ~ in concurrently-executing code; Swift 6 lang mode의 경고 해결
+        let userFieldSnapshot = userField
+        let settingFieldSnapshot = settingField
+        // -----------------------------------------------------
+
+        async let userUpdate: Void = userRef.setData(
+            ["updatedAt": FieldValue.serverTimestamp()],
+            merge: true
+        )
+        async let infoUpdate: Void = infoRef.setData(userFieldSnapshot, merge: true)
+        async let tokensUpdate: Void = tokensRef.setData(settingFieldSnapshot, merge: true)
+
+        let settingsDocument = try await settingsRef.getDocument()
+        var settingsField: [String: Any] = [
+            "timeZone": TimeZone.autoupdatingCurrent.identifier
+        ]
+        if !settingsDocument.exists {
+            settingsField["allowPushNotification"] = true
+            settingsField["pushNotificationHour"] = 9
+            settingsField["pushNotificationMinute"] = 0
+        }
+
+        let settingsFieldSnapshot = settingsField
+        async let settingsUpdate: Void = settingsRef.setData(settingsFieldSnapshot, merge: true)
+
+        _ = try await (userUpdate, infoUpdate, tokensUpdate, settingsUpdate)
 
         logger.info("Successfully upserted user: \(user.uid)")
     }

Firebase/functions/src/fcm/notification.ts

@@ -2,44 +2,162 @@ import { onTaskDispatched } from "firebase-functions/v2/tasks";
 import * as admin from "firebase-admin";
 import * as logger from "firebase-functions/logger";
 
+type TaskPayload = {
+    userId: string;
+    todoId: string;
+    todoKind: string;
+    dueDateKey: string;
+    title: string;
+    body: string;
+};
+
+type FirestoreErrorLike = {
+    code?: unknown;
+};
+
 // Cloud Tasks에 의해 트리거되는 함수
-export const sendPushNotification = onTaskDispatched({  
+export const sendPushNotification = onTaskDispatched({
         region: "asia-northeast3",
-        retryConfig: { maxAttempts: 1, minBackoffSeconds: 5 },
-        rateLimits: { maxDispatchesPerSecond: 500 },
+        retryConfig: { maxAttempts: 3, minBackoffSeconds: 5 },
+        rateLimits: { maxDispatchesPerSecond: 200 },
     },
     async (req) => {
-        const { userId, title, body } = req.data; // 예약 시 보냈던 데이터
-        logger.info(`[${userId}]에게 알림 발송 작업을 시작합니다: ${title}`);
+        const taskId = req.data?.taskId;
+        if (!isValidTaskId(taskId)) {
+            logger.warn("유효하지 않은 푸시 알림 payload", req.data);
+            return;
+        }
 
+        const taskDocRef = admin.firestore().collection("notificationTasks").doc(taskId);
         try {
+            const taskDoc = await taskDocRef.get();
+            if (!taskDoc.exists) {
+                logger.warn("notificationTask 문서를 찾을 수 없습니다.", { taskId });
+                return;
+            }
+
+            const parsed = parseTaskPayload(taskDoc.data());
+            if (!parsed) {
+                logger.warn("notificationTask 문서 형식이 올바르지 않습니다.", { taskId });
+                return;
+            }
+            const { userId, todoId, todoKind, dueDateKey, title, body } = parsed;
+
+            const settingsDoc = await admin.firestore().doc(`users/${userId}/userData/settings`).get();
+            const allowPushNotification = settingsDoc.data()?.allowPushNotification ?? true;
+            if (!allowPushNotification) {
+                return;
+            }
+
+            const notificationDocId = `${todoId}_${dueDateKey}`;
+            const notificationDocRef = admin.firestore().doc(`users/${userId}/notifications/${notificationDocId}`);
+
+            const notificationData = {
+                title: "Todo 알림",
+                body,
+                receivedAt: admin.firestore.FieldValue.serverTimestamp(),
+                isRead: false,
+                todoID: todoId,
+                todoKind: todoKind
+            };
+            try {
+                await notificationDocRef.create(notificationData);
+            } catch (error) {
+                if (isAlreadyExistsError(error)) {
+                    return;
+                }
+                throw error;
+            }
+
             // 1. 사용자 FCM 토큰 가져오기
             const tokenDoc = await admin.firestore().doc(`users/${userId}/userData/tokens`).get();
             const fcmToken = tokenDoc.data()?.fcmToken;
 
             if (!fcmToken) {
-                logger.warn(`사용자 ${userId}의 fcmToken이 없어 알림을 보낼 수 없습니다.`);
+                logger.warn(`사용자 ${userId}의 fcmToken이 없어 푸시 발송은 건너뜁니다. Firestore에는 기록했습니다.`);
                 return;
             }
 
-            // 2. 알림 발송 및 Firestore에 기록
+            // 2. 푸시 알림 발송
             const message = {
                 notification: { title, body },
+                data: {
+                    todoID: todoId,
+                    todoId: todoId,
+                    todoKind: todoKind
+                },
                 apns: { payload: { aps: { sound: "default" } } },
                 token: fcmToken,
             };
-            await admin.messaging().send(message);
-
-            const notificationData = {
-                title, body, sentAt: admin.firestore.FieldValue.serverTimestamp(), isRead: false, type: 'reminder'
-            };
-            await admin.firestore().collection(`users/${userId}/notifications`).add(notificationData);
-
-            logger.info(`[${userId}]에게 알림을 성공적으로 보내고 저장했습니다.`);
+            try {
+                await admin.messaging().send(message);
+            } catch (sendError) {
+                logger.warn(`[${userId}] 푸시 발송 실패. Firestore 기록은 유지됩니다.`, sendError);
+                return;
+            }
 
         } catch (error) {
-            logger.error(`[${userId}]에게 알림 발송 중 오류 발생:`, error);
-            throw error; // 오류를 다시 던져 Cloud Tasks가 재시도하도록 함
+            logger.error("알림 발송 중 오류 발생", {
+                taskId,
+                error
+            });
+        } finally {
+            try {
+                await taskDocRef.delete();
+            } catch (cleanupError) {
+                logger.warn("notificationTask 정리 실패", {
+                    taskId,
+                    cleanupError
+                });
+            }
         }
     }
 );
+
+function isValidTaskId(value: unknown): value is string {
+    return typeof value === "string" && /^[A-Za-z0-9_-]{1,128}$/.test(value);
+}
+
+function hasPathSeparator(value: string): boolean {
+    return value.includes("/");
+}
+
+function parseTaskPayload(data: FirebaseFirestore.DocumentData | undefined): TaskPayload | null {
+    const {
+        userId,
+        todoId,
+        todoKind,
+        dueDateKey,
+        title,
+        body
+    } = data ?? {};
+
+    if (
+        typeof userId !== "string" ||
+        typeof todoId !== "string" ||
+        typeof todoKind !== "string" ||
+        typeof dueDateKey !== "string" ||
+        typeof title !== "string" ||
+        typeof body !== "string"
+    ) {
+        return null;
+    }
+
+    if (hasPathSeparator(userId) || hasPathSeparator(todoId)) {
+        return null;
+    }
+
+    return {
+        userId,
+        todoId,
+        todoKind,
+        dueDateKey,
+        title,
+        body
+    };
+}
+
+function isAlreadyExistsError(error: unknown): boolean {
+    const code = (error as FirestoreErrorLike)?.code;
+    return code === 6 || code === "6" || code === "already-exists";
+}