From 550e4ac9ceb14b3c4e9abbd2d1c3d1c17097c00d Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 28 Aug 2025 19:50:20 +0900
Subject: [PATCH] =?UTF-8?q?fix(character-main):=20=EC=B5=9C=EA=B7=BC=20?=
 =?UTF-8?q?=EB=8C=80=ED=99=94=20=EC=BA=90=EB=A6=AD=ED=84=B0=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=EC=97=90=EC=84=9C=20roomId=20=EB=8C=80=EC=8B=A0=20cha?=
 =?UTF-8?q?racterId=20=EB=B0=98=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/character/controller/ChatCharacterController.kt       | 2 +-
 .../sodalive/chat/character/dto/CharacterHomeResponse.kt       | 2 +-
 .../kr/co/vividnext/sodalive/chat/room/dto/ChatRoomDto.kt      | 2 ++
 .../sodalive/chat/room/repository/ChatRoomRepository.kt        | 3 ++-
 .../co/vividnext/sodalive/chat/room/service/ChatRoomService.kt | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/controller/ChatCharacterController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/controller/ChatCharacterController.kt
index 7e7deaa..6b780f0 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/controller/ChatCharacterController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/controller/ChatCharacterController.kt
@@ -57,7 +57,7 @@ class ChatCharacterController(
             chatRoomService.listMyChatRooms(member, 0, 10)
                 .map { room ->
                     RecentCharacter(
-                        roomId = room.chatRoomId,
+                        characterId = room.characterId,
                         name = room.title,
                         imageUrl = room.imageUrl
                     )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/dto/CharacterHomeResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/dto/CharacterHomeResponse.kt
index 745d2d2..b471315 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/dto/CharacterHomeResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/dto/CharacterHomeResponse.kt
@@ -22,7 +22,7 @@ data class Character(
 )
 
 data class RecentCharacter(
-    val roomId: Long,
+    val characterId: Long,
     val name: String,
     val imageUrl: String
 )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/dto/ChatRoomDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/dto/ChatRoomDto.kt
index df80d89..95d9378 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/dto/ChatRoomDto.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/dto/ChatRoomDto.kt
@@ -24,6 +24,7 @@ data class CreateChatRoomResponse(
  */
 data class ChatRoomListItemDto(
     val chatRoomId: Long,
+    val characterId: Long,
     val title: String,
     val imageUrl: String,
     val opponentType: String,
@@ -61,6 +62,7 @@ data class ChatMessagesPageResponse(
 
 data class ChatRoomListQueryDto(
     val chatRoomId: Long,
+    val characterId: Long,
     val title: String,
     val imagePath: String?,
     val characterType: CharacterType,
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/repository/ChatRoomRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/repository/ChatRoomRepository.kt
index a5f3d6c..07d4a69 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/repository/ChatRoomRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/repository/ChatRoomRepository.kt
@@ -39,6 +39,7 @@ interface ChatRoomRepository : JpaRepository<ChatRoom, Long> {
         value = """
             SELECT new kr.co.vividnext.sodalive.chat.room.dto.ChatRoomListQueryDto(
                 r.id,
+                pc.character.id,
                 r.title,
                 pc.character.imagePath,
                 pc.character.characterType,
@@ -54,7 +55,7 @@ interface ChatRoomRepository : JpaRepository<ChatRoom, Long> {
               AND pc.isActive = true
               AND r.isActive = true
               AND m.isActive = true
-            GROUP BY r.id, r.title, r.createdAt, pc.character.imagePath, pc.character.characterType
+            GROUP BY r.id, r.title, r.createdAt, pc.character.id, pc.character.imagePath, pc.character.characterType
             ORDER BY MAX(m.createdAt) DESC
         """
     )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/service/ChatRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/service/ChatRoomService.kt
index ddf4279..9b24ba9 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/service/ChatRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/room/service/ChatRoomService.kt
@@ -270,6 +270,7 @@ class ChatRoomService(
 
             ChatRoomListItemDto(
                 chatRoomId = q.chatRoomId,
+                characterId = q.characterId,
                 title = q.title,
                 imageUrl = imageUrl,
                 opponentType = opponentType,