diff --git a/app/src/main/resources/config b/app/src/main/resources/config index adc9aae0..14d02be3 160000 --- a/app/src/main/resources/config +++ b/app/src/main/resources/config @@ -1 +1 @@ -Subproject commit adc9aae04d05cebaee5e2b189bba7e92ccea9cc7 +Subproject commit 14d02be3c34c4955a7d6cf58b9ed939f3deb9cb3 diff --git a/app/src/test/kotlin/com/wespot/user/fixture/UserFixture.kt b/app/src/test/kotlin/com/wespot/user/fixture/UserFixture.kt index 0a31bf13..4cb9d7f8 100644 --- a/app/src/test/kotlin/com/wespot/user/fixture/UserFixture.kt +++ b/app/src/test/kotlin/com/wespot/user/fixture/UserFixture.kt @@ -185,10 +185,8 @@ object UserFixture { profile: Profile = Profile(0, "black", "image.png"), ) = UpdateProfileRequest( introduction = introduction, - profile = ProfileRequest( - backgroundColor = profile.backgroundColor, - iconUrl = profile.iconUrl - ) + backgroundColor = profile.backgroundColor, + iconUrl = profile.iconUrl ) fun createUser( diff --git a/app/src/test/kotlin/com/wespot/user/service/UserServiceTest.kt b/app/src/test/kotlin/com/wespot/user/service/UserServiceTest.kt index b25cdfcf..dda6184d 100644 --- a/app/src/test/kotlin/com/wespot/user/service/UserServiceTest.kt +++ b/app/src/test/kotlin/com/wespot/user/service/UserServiceTest.kt @@ -81,8 +81,8 @@ class UserServiceTest : BehaviorSpec({ user.copy( introduction = profileRequest.introduction?.let { UserIntroduction.from(it) } ?: user.introduction, profile = profile.copy( - backgroundColor = profileRequest.profile?.backgroundColor ?: user.profile.backgroundColor, - iconUrl = profileRequest.profile?.iconUrl ?: user.profile.iconUrl + backgroundColor = profileRequest.backgroundColor ?: user.profile.backgroundColor, + iconUrl = profileRequest.iconUrl ?: user.profile.iconUrl ) ) } @@ -93,8 +93,8 @@ class UserServiceTest : BehaviorSpec({ then("프로필이 업데이트 되어야 한다") { user.introduction.introduction shouldBe profileRequest.introduction - user.profile.backgroundColor shouldBe profileRequest.profile?.backgroundColor - user.profile.iconUrl shouldBe profileRequest.profile?.iconUrl + user.profile.backgroundColor shouldBe profileRequest.backgroundColor + user.profile.iconUrl shouldBe profileRequest.iconUrl } } diff --git a/core/src/main/kotlin/com/wespot/user/dto/request/UpdateProfileRequest.kt b/core/src/main/kotlin/com/wespot/user/dto/request/UpdateProfileRequest.kt index dd5a6170..63228e3f 100644 --- a/core/src/main/kotlin/com/wespot/user/dto/request/UpdateProfileRequest.kt +++ b/core/src/main/kotlin/com/wespot/user/dto/request/UpdateProfileRequest.kt @@ -1,8 +1,8 @@ package com.wespot.user.dto.request -import com.wespot.auth.dto.request.ProfileRequest data class UpdateProfileRequest( val introduction: String?, - val profile: ProfileRequest? + val backgroundColor: String?, + val iconUrl: String?, ) diff --git a/core/src/main/kotlin/com/wespot/user/service/UserService.kt b/core/src/main/kotlin/com/wespot/user/service/UserService.kt index 40da5bd0..3871140a 100644 --- a/core/src/main/kotlin/com/wespot/user/service/UserService.kt +++ b/core/src/main/kotlin/com/wespot/user/service/UserService.kt @@ -40,8 +40,8 @@ class UserService( val loginUser = getLoginUser(userPort = userPort) val updatedIntroduction = profile.introduction ?: loginUser.introduction.introduction val updatedProfile = loginUser.profile.update( - backgroundColor = profile.profile?.backgroundColor ?: loginUser.profile.backgroundColor, - iconUrl = profile.profile?.iconUrl ?: loginUser.profile.iconUrl + backgroundColor = profile.backgroundColor ?: loginUser.profile.backgroundColor, + iconUrl = profile.iconUrl ?: loginUser.profile.iconUrl ) val updatedUser = loginUser.copy( diff --git a/domain/src/main/kotlin/com/wespot/message/MessageContent.kt b/domain/src/main/kotlin/com/wespot/message/MessageContent.kt index 0c541d0a..19b1748e 100644 --- a/domain/src/main/kotlin/com/wespot/message/MessageContent.kt +++ b/domain/src/main/kotlin/com/wespot/message/MessageContent.kt @@ -36,7 +36,7 @@ data class MessageContent( return MessageContent("안녕하세요 ${receiverName}님 \n" + "위스팟에 오신 것을 정말 환영해요!\n" + "\n" + - "제가 큐피트가 되어 000님의 소중한 마음들을 전달해 드릴테니 언제든 익명 쪽지함을 찾아와 주세요!\n" + + "제가 큐피트가 되어 ${receiverName}님의 소중한 마음들을 전달해 드릴테니 언제든 익명 쪽지함을 찾아와 주세요!\n" + "\n" + "설레는 시간을 보내시길 바라며..") }