Merge pull request #60 from pirogramming/feat-jh

feat: connected latest msg with ws

Author: inoaole

backend-chat/app/api/chat.py

@@ -1,10 +1,13 @@
 import asyncio
 import json
+import os
+import httpx
 from fastapi import APIRouter, WebSocket, WebSocketDisconnect
 from datetime import datetime
 from app.services.chat_service import chat_manager
 from app.models.chat import ChatMessage
-from app.core.auth import verify_token  # ✅ 추가
+from app.core.auth import verify_token
+from app.core.config import redis_client
 
 router = APIRouter()
 
@@ -98,6 +101,32 @@ async def websocket_endpoint(websocket: WebSocket, room_id: str):
             await chat_manager.save_message(msg_obj)
             await chat_manager.set_room_last_message(room_id, msg_obj)
 
+            # 상대방에게 채팅 목록 갱신 알림 (Redis Publish)
+            try:
+                django_url = os.getenv("DJANGO_API_URL", "http://backend-core:8000")
+                token = auth_msg.get("token", "")
+                async with httpx.AsyncClient(timeout=5.0) as client:
+                    r = await client.get(
+                        f"{django_url}/api/missions/api/chat/room/{room_id}/participants/",
+                        headers={"Authorization": f"Bearer {token}"} if token else {},
+                    )
+                if r.status_code == 200:
+                    resp = r.json()
+                    user_ids = resp.get("user_ids", [])
+                    for uid in user_ids:
+                        if int(uid) != user_id:
+                            payload = {
+                                "type": "chat_update",
+                                "target_id": int(uid),
+                                "room_id": int(room_id),
+                                "last_message": (data or "")[:80],
+                                "created_at": msg_obj.created_at.strftime("%Y-%m-%dT%H:%M:%S"),
+                            }
+                            await redis_client.publish("global_notifications", json.dumps(payload, ensure_ascii=False))
+                            break
+            except Exception as e:
+                print(f"[DEBUG] chat_update publish 실패: {e}")
+
             await chat_manager.publish_message({
                 "type": "TALK",
                 "sender_id": user_id,

backend-chat/app/api/notification.py

@@ -0,0 +1,14 @@
+from fastapi import APIRouter, WebSocket, WebSocketDisconnect
+from app.services.notification_service import notification_manager
+
+router = APIRouter()
+
+
+@router.websocket("/notify/{user_id}")
+async def notify_websocket(websocket: WebSocket, user_id: int):
+    await notification_manager.connect(websocket, user_id)
+    try:
+        while True:
+            await websocket.receive_text()
+    except WebSocketDisconnect:
+        notification_manager.disconnect(user_id)

backend-chat/app/services/notification_service.py

@@ -0,0 +1,47 @@
+import json
+import asyncio
+from fastapi import WebSocket
+from app.core.config import redis_client
+
+CHANNEL = "global_notifications"
+
+
+class NotificationManager:
+    def __init__(self):
+        self.active_connections: dict[int, WebSocket] = {}
+
+    async def connect(self, websocket: WebSocket, user_id: int):
+        await websocket.accept()
+        self.active_connections[int(user_id)] = websocket
+
+    def disconnect(self, user_id: int):
+        uid = int(user_id)
+        if uid in self.active_connections:
+            del self.active_connections[uid]
+
+    async def send_to_user(self, user_id: int, data: dict):
+        uid = int(user_id)
+        if uid in self.active_connections:
+            try:
+                await self.active_connections[uid].send_text(json.dumps(data, ensure_ascii=False))
+            except Exception:
+                pass
+
+    async def start_listener(self):
+        pubsub = redis_client.pubsub()
+        await pubsub.subscribe(CHANNEL)
+        try:
+            async for message in pubsub.listen():
+                if message.get("type") == "message":
+                    try:
+                        data = json.loads(message["data"])
+                        target_id = data.get("target_id")
+                        if target_id is not None:
+                            await self.send_to_user(target_id, data)
+                    except (json.JSONDecodeError, KeyError):
+                        pass
+        except asyncio.CancelledError:
+            await pubsub.unsubscribe(CHANNEL)
+
+
+notification_manager = NotificationManager()

backend-chat/main.py

@@ -1,12 +1,14 @@
+import asyncio
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from app.api.chat import router as chat_router
-from app.api.missions import router as mission_router  # ✨ 추가
+from app.api.missions import router as mission_router
+from app.api.notification import router as notify_router
 from app.services.mission_stream_service import mission_stream_manager
+from app.services.notification_service import notification_manager
 
-app = FastAPI()    
+app = FastAPI()
 
-# CORS 설정 (403 방지)
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["http://localhost", "http://127.0.0.1"],
@@ -16,12 +18,15 @@
 )
 
 app.include_router(chat_router, prefix="/ws")
-app.include_router(mission_router, prefix="/stream")  # ✨ 추가
+app.include_router(notify_router, prefix="/ws")
+app.include_router(mission_router, prefix="/stream")
+
 
 @app.on_event("startup")
 async def startup_event():
-    """서버 시작 시 Redis 리스너 시작"""
     await mission_stream_manager.start()
+    asyncio.create_task(notification_manager.start_listener())
+
 
 @app.get("/health")
 async def health_check():

backend-chat/requirements.txt

@@ -4,4 +4,5 @@ motor
 pydantic>=2.0
 pydantic-settings
 redis[asyncio]>=4.2.0  # ✨ 이렇게 수정
-PyJWT>=2.8.0
+PyJWT>=2.8.0
+httpx

backend-core/missions/urls.py

@@ -14,6 +14,7 @@
     path("<int:mission_id>/edit/", views.mission_update_view, name="mission_update_view"),
     path("location/pick/", views.location_picker, name="location_picker"),
     path("chat/", views.chat_list, name="chat_list"),
+    path("api/chat/room/<int:room_id>/participants/", views.chat_room_participants, name="chat_room_participants"),
     path("api/<int:mission_id>/confirm/", views.mission_confirm_helper, name="mission_confirm_helper_api"),
     path("api/<int:mission_id>/reject/", views.mission_reject_helper, name="mission_reject_helper_api"),
     path("api/<int:mission_id>/complete/", views.mission_complete, name="mission_complete_api"),

backend-core/missions/views.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+from datetime import datetime
 from typing import Any
 
 from django.contrib.auth.decorators import login_required
@@ -526,17 +527,25 @@ def chat_list(request: HttpRequest) -> HttpResponse:
             continue
         # Redis에서 이 방의 마지막 메시지 미리보기 조회
         last_message = None
+        last_message_created_at = None
         try:
             raw = redis_client.get(f"chat:room:{room.id}:last")
             if raw:
                 data = json.loads(raw)
                 last_message = data.get("content") or None
+                created_at_str = data.get("created_at")
+                if created_at_str:
+                    try:
+                        last_message_created_at = datetime.fromisoformat(created_at_str.replace("Z", "+00:00"))
+                    except (ValueError, TypeError):
+                        pass
         except (json.JSONDecodeError, TypeError):
             pass
         mission_groups[room.mission].append({
             "room": room,
             "other_user": other,
             "last_message": last_message,
+            "last_message_created_at": last_message_created_at,
         })
 
     grouped_list = [
@@ -551,6 +560,15 @@ def chat_list(request: HttpRequest) -> HttpResponse:
     )
 
 
+@api_view(['GET'])
+@permission_classes([IsAuthenticated])
+def chat_room_participants(request: HttpRequest, room_id: int) -> Response:
+    """채팅방 참여자 user_id 목록 (FastAPI 목록 갱신 알림용)"""
+    room = get_object_or_404(ChatRoom, id=room_id)
+    if request.user not in (room.user1, room.user2):
+        return Response({"error": "권한 없음"}, status=status.HTTP_403_FORBIDDEN)
+    return Response({"user_ids": [room.user1_id, room.user2_id]})
+
 @api_view(['GET'])
 @permission_classes([IsAuthenticated])
 def my_missions(request):

backend-core/templates/chat/list.html

@@ -30,14 +30,15 @@ <h1 class="page-title">채팅 목록</h1>
 
             <div class="chat-room-content">
                 {% for item in group.rooms %}
-                <a href="{% url 'missions:chat_room' group.mission.id item.room.id %}" class="individual-chat-link">
+                <a href="{% url 'missions:chat_room' group.mission.id item.room.id %}" class="individual-chat-link"
+                    data-room-id="{{ item.room.id }}">
                     <div class="chat-user-avatar">
                         {{ item.other_user.get_display_name|slice:":1" }}
                     </div>
                     <div class="chat-user-info">
                         <div class="user-info-top">
                             <span class="user-name">{{ item.other_user.get_display_name }}</span>
-                            <span class="chat-time">{{ item.room.created_at|date:"A g:i"|default:"최근" }}</span>
+                            <span class="chat-time">{% if item.last_message_created_at %}{{item.last_message_created_at|date:"A g:i" }}{% else %}{{ item.room.created_at|date:"A g:i"|default:"최근" }}{% endif %}</span>
                         </div>
                         <p class="last-preview">{{ item.last_message|default:"대화 내용이 없습니다." }}</p>
                     </div>
@@ -65,5 +66,34 @@ <h1 class="page-title">채팅 목록</h1>
         const group = element.parentElement;
         group.classList.toggle('active');
     }
+
+    (function () {
+        const userId = {{ request.user.id }};
+    const host = "{{ request.get_host }}";
+    const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+    const ws = new WebSocket(protocol + "//" + host + "/ws/notify/" + userId);
+
+    ws.onmessage = function (event) {
+        try {
+            const data = JSON.parse(event.data);
+            if (data.type === "chat_update" && data.room_id != null) {
+                const row = document.querySelector('[data-room-id="' + data.room_id + '"]');
+                if (row) {
+                    const preview = row.querySelector('.last-preview');
+                    const timeEl = row.querySelector('.chat-time');
+                    if (preview) preview.textContent = data.last_message || "대화 내용이 없습니다.";
+                    if (timeEl && data.created_at) {
+                        const d = new Date(data.created_at);
+                        timeEl.textContent = d.toLocaleTimeString("ko-KR", { hour: "numeric", minute: "2-digit" });
+                    }
+                }
+            }
+        } catch (e) { }
+    };
+
+    ws.onclose = function () {
+        console.log("알림 소켓 끊김");
+    };
+    })();
 </script>
 {% endblock %}