From dd9da6da1f030fd87a8ad45141714884f9c6dba9 Mon Sep 17 00:00:00 2001
From: Chanyeong Lim <asp345@posteo.net>
Date: Fri, 16 Jan 2026 10:05:38 +0900
Subject: [PATCH 1/2] =?UTF-8?q?acceptFriendByLink=20=EB=B0=98=ED=99=98?=
 =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/src/main/kotlin/controller/FriendController.kt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/api/src/main/kotlin/controller/FriendController.kt b/api/src/main/kotlin/controller/FriendController.kt
index d8b9b3db..726993c9 100644
--- a/api/src/main/kotlin/controller/FriendController.kt
+++ b/api/src/main/kotlin/controller/FriendController.kt
@@ -102,5 +102,15 @@ class FriendController(
     suspend fun acceptFriendByLink(
         @CurrentUser user: User,
         @PathVariable requestToken: String,
-    ) = friendService.acceptFriendByLink(user.id!!, requestToken)
+    ) = friendService
+        .acceptFriendByLink(user.id!!, requestToken)
+        .let { (friend, partner) ->
+            FriendResponse(
+                id = friend.id!!,
+                userId = partner.id!!,
+                displayName = friend.getPartnerDisplayName(user.id!!),
+                nickname = userNicknameService.getNicknameDto(partner.nickname),
+                createdAt = friend.createdAt,
+            )
+        }
 }

From fcac7fd3bb94347a30331b5018b639bd7ee061a6 Mon Sep 17 00:00:00 2001
From: Chanyeong Lim <dlacksdud2@snu.ac.kr>
Date: Sun, 18 Jan 2026 11:24:31 +0900
Subject: [PATCH 2/2] =?UTF-8?q?MongoDB=20Driver=205.5.2=EB=A1=9C=20?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C=20(ByteB?=
 =?UTF-8?q?uf=20leak=20=ED=9A=8C=ED=94=BC)=20(#483)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 57b16d23..afbb791b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,6 +36,15 @@ subprojects {
         imports {
             mavenBom("org.springframework.boot:spring-boot-dependencies:4.0.1")
         }
+        dependencies {
+            // Downgrade MongoDB driver to avoid ByteBuf leak (JAVA-6038)
+            dependency("org.mongodb:mongodb-driver-core:5.5.2")
+            dependency("org.mongodb:mongodb-driver-sync:5.5.2")
+            dependency("org.mongodb:mongodb-driver-reactivestreams:5.5.2")
+            dependency("org.mongodb:bson:5.5.2")
+            dependency("org.mongodb:bson-record-codec:5.5.2")
+            dependency("org.mongodb:bson-kotlin:5.5.2")
+        }
     }
 
     tasks.withType<KotlinCompile> {