Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion api/src/main/kotlin/controller/FriendController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
}
9 changes: 9 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down