Merge pull request #58 from pirogramming/feat-jh

Feat jh

Author: inoaole

backend-chat/app/api/chat.py

@@ -96,6 +96,7 @@ async def websocket_endpoint(websocket: WebSocket, room_id: str):
                 content=data,
             )
             await chat_manager.save_message(msg_obj)
+            await chat_manager.set_room_last_message(room_id, msg_obj)
 
             await chat_manager.publish_message({
                 "type": "TALK",

backend-chat/app/services/chat_service.py

@@ -126,4 +126,15 @@ async def get_history(self, room_id: str):
             history.append(doc)
         return history
 
+    async def set_room_last_message(self, room_id: str, msg_obj: ChatMessage):
+        """채팅 목록용: 해당 방의 마지막 메시지를 Redis에 저장 (Django에서 조회)"""
+        key = f"chat:room:{room_id}:last"
+        value = {
+            "content": (msg_obj.content or "")[:80],  # 목록용으로 80자 제한
+            "created_at": msg_obj.created_at.isoformat() if msg_obj.created_at else None,
+            "sender_id": msg_obj.sender_id,
+        }
+        await redis_client.set(key, json.dumps(value, ensure_ascii=False), ex=86400 * 30)
+
+
 chat_manager = ConnectionManager()

backend-core/missions/views.py

@@ -19,9 +19,10 @@
 
 from .forms import MissionCreateForm
 from .models import Mission, MissionImage, Tag, Category, ChatRoom
-from common.utils import publish_chat_event
+from common.utils import publish_chat_event, redis_client
 from common.utils import publish_mission_update  
 from common.utils import acquire_lock, release_lock 
+from collections import defaultdict
 
 
 logger = logging.getLogger(__name__)
@@ -510,27 +511,43 @@ def chat_room(request: HttpRequest, mission_id: int, room_id: int) -> HttpRespon
 
 @login_required
 def chat_list(request: HttpRequest) -> HttpResponse:
-    """내가 참여한 채팅방 목록 (차단된 유저 제외)"""
+    """내가 참여한 채팅방을 미션별로 묶어서 보여줌"""
     rooms = (
         ChatRoom.objects
         .filter(models.Q(user1=request.user) | models.Q(user2=request.user))
         .select_related("mission", "mission__author", "user1", "user2")
         .order_by("-created_at")
     )
-    room_list = []
+
+    mission_groups = defaultdict(list)
     for room in rooms:
         other = room.user2 if room.user1 == request.user else room.user1
         if _is_blocked_between(request.user, other):
             continue
-        room_list.append({
+        # Redis에서 이 방의 마지막 메시지 미리보기 조회
+        last_message = 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
+        except (json.JSONDecodeError, TypeError):
+            pass
+        mission_groups[room.mission].append({
             "room": room,
             "other_user": other,
-            "mission": room.mission,
+            "last_message": last_message,
         })
+
+    grouped_list = [
+        {"mission": mission, "rooms": room_items}
+        for mission, room_items in mission_groups.items()
+    ]
+
     return render(
         request,
         "chat/list.html",
-        {"room_list": room_list},
+        {"grouped_list": grouped_list},
     )
 
 

backend-core/templates/chat/list.html

@@ -15,32 +15,34 @@ <h1 class="page-title">채팅 목록</h1>
     </div>
 
     <section class="chat-section">
-        {% for item in room_list %}
+        {% for group in grouped_list %}
         <div class="chat-toggle-group">
             <div class="chat-mission-header" onclick="toggleChat(this)">
                 <div class="header-left">
-                    <div class="mission-icon">{{ item.mission.category|slice:":1"|default:"미" }}</div>
+                    <div class="mission-icon">{{ group.mission.category|slice:":1"|default:"미" }}</div>
                     <div class="header-text">
-                        <strong class="mission-title">{{ item.mission.title }}</strong>
-                        <span class="participant-count">상대방: {{ item.other_user.get_display_name }}</span>
+                        <strong class="mission-title">{{ group.mission.title }}</strong>
+                        <span class="participant-count">채팅 {{ group.rooms|length }}명</span>
                     </div>
                 </div>
                 <i class="fa-solid fa-chevron-down toggle-icon"></i>
             </div>
 
             <div class="chat-room-content">
-                <a href="{% url 'missions:chat_room' item.mission.id item.room.id %}" class="individual-chat-link">
+                {% for item in group.rooms %}
+                <a href="{% url 'missions:chat_room' group.mission.id item.room.id %}" class="individual-chat-link">
                     <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.updated_at|date:"A g:i"|default:"최근" }}</span>
+                            <span class="chat-time">{{ item.room.created_at|date:"A g:i"|default:"최근" }}</span>
                         </div>
                         <p class="last-preview">{{ item.last_message|default:"대화 내용이 없습니다." }}</p>
                     </div>
                 </a>
+                {% endfor %}
             </div>
         </div>
         {% empty %}