biasa

app/services/scheduler_service.py

@@ -49,93 +49,146 @@ device_tokens = set()
 
 # 🚀 HELPER MENGAMBIL USERNAME & CHAT HISTORY DARI FIRESTORE
 # 🚀 FIX PENCARIAN USER CONTEXT TERBAIK (Mendukung UID, FCM Token, maupun Email)
-def _get_user_context(user_id_or_token: str, limit: int = 4) -> Tuple[str, str, str]:
+def _get_user_context(
+    user_id_or_token: str,
+    limit: int = 4
+) -> Tuple[str, str, str]:
     """
-    Mengembalikan: (username, history_text, actual_user_id)
+    Mengembalikan:
+    (display_name, history_text, actual_user_id)
     """
+
     try:
         db = firestore.client()
+
         target_doc = None
         target_uid = None
 
-        # 1. Coba cari dokumen langsung jika parameter adalah UID (Document ID Firestore)
-        doc_ref = db.collection("users").document(user_id_or_token).get()
+        # 1. Prioritas utama: parameter dianggap sebagai UID
+        doc_ref = (
+            db.collection("users")
+            .document(user_id_or_token)
+            .get()
+        )
+
         if doc_ref.exists:
             target_doc = doc_ref
             target_uid = doc_ref.id
-        else:
-            # 2. Jika bukan UID, cari berdasarkan field fcm_token
-            users_by_token = list(db.collection("users").where(filter=FieldFilter("fcm_token", "==", user_id_or_token)).stream())
-            if users_by_token:
-                target_doc = users_by_token[0]
-                target_uid = target_doc.id
-            else:
-                # 3. Cari berdasarkan field username / prefix email
-                users_by_display_name = list(
-    db.collection("users")
-    .where(
-        filter=FieldFilter(
-            "displayName",
-            "==",
-            user_id_or_token
-        )
-    )
-    .stream()
-)
 
-        if users_by_display_name:
-            target_doc = users_by_display_name[0]
-            target_uid = target_doc.id
         else:
-            users_by_username = list(
+            # 2. Cari berdasarkan FCM token
+            users_by_token = list(
                 db.collection("users")
                 .where(
                     filter=FieldFilter(
-                        "username",
+                        "fcm_token",
                         "==",
                         user_id_or_token
                     )
                 )
+                .limit(1)
                 .stream()
             )
 
-            if users_by_username:
-                target_doc = users_by_username[0]
+            if users_by_token:
+                target_doc = users_by_token[0]
                 target_uid = target_doc.id
 
-        # Jika dokumen user ditemukan
-        if target_doc and target_doc.exists:
+            else:
+                # 3. Cari berdasarkan displayName akun baru
+                users_by_display_name = list(
+                    db.collection("users")
+                    .where(
+                        filter=FieldFilter(
+                            "displayName",
+                            "==",
+                            user_id_or_token
+                        )
+                    )
+                    .limit(1)
+                    .stream()
+                )
+
+                if users_by_display_name:
+                    target_doc = users_by_display_name[0]
+                    target_uid = target_doc.id
+
+                else:
+                    # 4. Fallback akun lama berdasarkan username
+                    users_by_username = list(
+                        db.collection("users")
+                        .where(
+                            filter=FieldFilter(
+                                "username",
+                                "==",
+                                user_id_or_token
+                            )
+                        )
+                        .limit(1)
+                        .stream()
+                    )
+
+                    if users_by_username:
+                        target_doc = users_by_username[0]
+                        target_uid = target_doc.id
+
+        # Jika dokumen pengguna berhasil ditemukan
+        if target_doc is not None and target_doc.exists:
             data = target_doc.to_dict() or {}
+
             display_name = (
                 data.get("displayName")
                 or data.get("username")
                 or data.get("email", "").split("@")[0]
                 or "Baka"
-)
-            
-            # Ambil riwayat chat MURNI dari sub-koleksi chats milik UID user ini
-            chats_ref = db.collection("users").document(target_uid).collection("chats")
-            docs = chats_ref.order_by("id", direction=firestore.Query.DESCENDING).limit(limit).stream()
-            
+            )
+
+            chats_ref = (
+                db.collection("users")
+                .document(target_uid)
+                .collection("chats")
+            )
+
+            docs = (
+                chats_ref
+                .order_by(
+                    "id",
+                    direction=firestore.Query.DESCENDING
+                )
+                .limit(limit)
+                .stream()
+            )
+
             recent_chats = []
-            for doc in docs:
-                d = doc.to_dict()
+
+            for chat_doc in docs:
+                chat_data = chat_doc.to_dict() or {}
+
                 sender_name = (
                     display_name
-                    if d.get("sender") == "user"
+                    if chat_data.get("sender") == "user"
                     else "Mini-chan"
                 )
-                content = d.get("content", "")
+
+                content = chat_data.get("content", "")
+
                 if content:
-                    recent_chats.append(f"{sender_name}: {content}")
-            
+                    recent_chats.append(
+                        f"{sender_name}: {content}"
+                    )
+
             recent_chats.reverse()
             history_text = "\n".join(recent_chats)
-            
+
             return display_name, history_text, target_uid
 
-        # Fallback jika benar-benar tidak ditemukan (JANGAN AMBIL ALL_USERS[0]!)
-        clean_name = user_id_or_token.split("@")[0] if "@" in user_id_or_token else "Baka"
+        # Fallback jika pengguna tidak ditemukan
+        clean_name = (
+            user_id_or_token.split("@")[0]
+            if "@" in user_id_or_token
+            else "Baka"
+        )
+
         return clean_name, "", user_id_or_token
 
     except Exception as e:
@@ -269,18 +322,18 @@ async def send_proactive_message_task(
     user_data = user_doc.to_dict() or {}
     latest_fcm_token = user_data.get("fcm_token")
 
-    if not latest_fcm_token:
-        print(
-            f"⏸️ Pengguna {actual_uid} sedang logout "
-            f"atau token FCM tidak tersedia."
-        )
-        return
-
+   if latest_fcm_token:
     await _send_fcm(
         latest_fcm_token,
         "Pesan dari Mini-chan! 😤",
         message
     )
+else:
+    print(
+        f"⏸️ Pengguna {actual_uid} sedang logout "
+        f"atau token FCM tidak tersedia. "
+        f"Push tidak dikirim, tetapi chat tetap disimpan."
+    )
 
     wib_now = datetime.now(timezone.utc) + timedelta(hours=7)
     now_time = wib_now.strftime("%H:%M")