시스템 메세지 DB에 저장

Author: heavyiron02

app/models/chat.py

@@ -1,3 +1,4 @@
+#app/models/chat.py
 from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, UniqueConstraint, func
 from sqlalchemy.orm import relationship
 from app.core.db import Base
@@ -17,12 +18,14 @@ class ChatMessage(Base):
     __tablename__ = "chat_messages"
     id = Column(Integer, primary_key=True, index=True)
     room_id = Column(Integer, ForeignKey("chat_rooms.id", ondelete="CASCADE"), nullable=False, index=True)
-    sender_id = Column(Integer, ForeignKey("users.userId", ondelete="CASCADE"), nullable=False, index=True)
+    sender_id = Column(Integer, ForeignKey("users.userId", ondelete="CASCADE"), nullable=True, index=True)  # ✅ 변경
     type = Column(String(20), nullable=False)
     content = Column(Text, nullable=False)
     created_at = Column(DateTime(timezone=True), server_default=func.now(), nullable=False)
     room = relationship("ChatRoom", back_populates="messages")
 
+
+
 class ChatRead(Base):
     __tablename__ = "chat_reads"
     id = Column(Integer, primary_key=True)

app/routers/chat_rest.py

@@ -70,8 +70,13 @@ def list_messages(
 
     messages: List[MessageItem] = []
     for m in rows:
-        is_mine = m.sender_id == me.user_id
-        read = db.query(ChatRead).filter(ChatRead.message_id == m.id).count() > 0
+        if m.type == "SYSTEM":
+            is_mine = False
+            read = True   # 시스템 메세지는 그냥 항상 읽은 걸로 취급
+        else:
+            is_mine = (m.sender_id == me.user_id)
+            read = db.query(ChatRead).filter(ChatRead.message_id == m.id).count() > 0
+
         messages.append(
             MessageItem(
                 messageId=m.id,
@@ -151,19 +156,34 @@ async def update_deal_status(
     db.refresh(posting)
 
     nick = me.nickname or "사용자"
-    if new_status == "RESERVED":
+
+    if prev_status == "RESERVED" and new_status == "ACTIVE":
+        msg_text = f"{nick}님이 예약을 취소했습니다"
+    elif new_status == "RESERVED":
         msg_text = f"{nick}님이 예약을 요청했습니다"
     elif new_status == "COMPLETED":
         msg_text = f"{nick}님이 거래를 완료했습니다"
     else:
         msg_text = f"{nick}님이 거래 상태를 변경했습니다"
 
-    # ✅ 여기! 이제는 그냥 await로 보내기
+    # ✅ 시스템 메시지를 ChatMessage 로 저장
+    system_msg = ChatMessage(
+        room_id=room.id,
+        sender_id=None,        # 시스템이라서 보낸 사람 없음
+        type="SYSTEM",
+        content=msg_text,
+    )
+    db.add(system_msg)
+    db.commit()
+    db.refresh(system_msg)
+
+    # ✅ 기존처럼 브로드캐스트 (필요하면 messageId도 같이 넘겨도 됨)
     await chat_ws.broadcast_deal_update(
         chat_id=room.id,
         deal_status=new_status,
         post_status=posting.status,
         system_message=msg_text,
+        # 필요하면 system_message_id=system_msg.id 이런 식으로 확장
     )
 
     return DealStatusOut(
@@ -175,4 +195,4 @@ async def update_deal_status(
         postStatus=posting.status,
         changedBy=me.user_id,
         changedAt=changed_at,
-    )
+    )

app/routers/chat_ws.py

@@ -146,10 +146,15 @@ async def websocket_chat(websocket: WebSocket, chat_id: int, db: Session = Depen
 # REST API(update_deal_status)에서 호출함
 async def broadcast_deal_update(chat_id: int, deal_status: str, post_status: str, system_message: str):
     data = {
-        "type": "deal_update",
+        "type": "DEAL_UPDATE",
         "chatId": chat_id,
         "dealStatus": deal_status,
         "postStatus": post_status,
-        "systemMessage": system_message,
+        "systemMessage": {
+            "messageId": system_msg.id,
+            "content": system_msg.content,
+            "sendAt": system_msg.created_at.isoformat()
+        }
     }
-    await broadcast(chat_id, data, exclude=None)  # 자기 포함 모두에게 전송
+
+    await broadcast(chat_id, data)