Skip to content

Commit

Permalink
nickname nullable
Browse files Browse the repository at this point in the history
  • Loading branch information
Hank-Choi committed Sep 4, 2023
1 parent 0a7c575 commit a327212
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions core/src/main/kotlin/friend/service/FriendService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class FriendServiceImpl(
}

private suspend fun sendFriendRequestPush(fromUser: User, toUserId: String) {
val fromUserNickname = userNicknameService.getNicknameDto(fromUser.nickname).nickname
val fromUserNickname = userNicknameService.getNicknameDto(fromUser.nickname!!).nickname
val pushMessage = PushMessage(
title = "친구 요청",
body = "'$fromUserNickname'님의 친구 요청을 수락하고 서로의 대표 시간표를 확인해보세요!",
Expand All @@ -106,7 +106,7 @@ class FriendServiceImpl(
}

private suspend fun sendFriendAcceptPush(fromUserId: String, toUser: User) {
val toUserNickname = userNicknameService.getNicknameDto(toUser.nickname).nickname
val toUserNickname = userNicknameService.getNicknameDto(toUser.nickname!!).nickname
val pushMessage = PushMessage(
title = "친구 요청 수락",
body = "'$toUserNickname'님과 친구가 되었어요.",
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/kotlin/users/service/UserService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class UserServiceImpl(

with(userPatchRequest) {
nickname?.let {
val prevNickname = userNicknameService.getNicknameDto(user.nickname).nickname
val prevNickname = userNicknameService.getNicknameDto(user.nickname!!).nickname
if (it != prevNickname) {
user.nickname = userNicknameService.appendNewTag(it)
}
Expand Down

0 comments on commit a327212

Please sign in to comment.