feature: PUT /users/me #109
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
frankvicky
requested changes
Jul 7, 2023
Comment on lines
30
to
43
| private fun validateNicknameDuplicated(nickname: String) { | ||
| if (userRepository.existsUserByNickname(nickname)) { | ||
| throw PlatformException("invalid nickname: duplicated") | ||
| } | ||
| } | ||
|
|
||
| private fun validateNicknameLength(nickname: String) { | ||
| if (nickname.toByteArray().size < 4) { | ||
| throw PlatformException("invalid nickname: too short") | ||
| } | ||
| if (nickname.toByteArray().size > 16) { | ||
| throw PlatformException("invalid nickname: too long") | ||
| } | ||
| } |
There was a problem hiding this comment.
因為之前的結論是限制字元長度，所以這邊先轉成字元再判斷長度：
最少 4 英文字元 (= 2 中文字)
最長 16 英文字元 (= 8 中文字)
There was a problem hiding this comment.
那可以把 nickname.toByteArray() 宣告成變數 🐣
lohas1107
force-pushed
the
feature/update-user-info
branch
from
cb64692
to
4f2ad30
Compare
Wally5077
requested changes
Jul 7, 2023
application/src/main/kotlin/tw/waterballsa/gaas/application/usecases/UpdateUserUseCase.kt
Outdated
Show resolved
Hide resolved
application/src/main/kotlin/tw/waterballsa/gaas/application/usecases/UpdateUserUseCase.kt
Outdated
Show resolved
Hide resolved
spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/UserController.kt
Outdated
Show resolved
Hide resolved
spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/UserController.kt
Outdated
Show resolved
Hide resolved
spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/presenter/UpdateUserPresenter.kt
Outdated
Show resolved
Hide resolved
spring/src/main/kotlin/tw/waterballsa/gaas/spring/repositories/SpringUserRepository.kt
Outdated
Show resolved
Hide resolved
spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/AbstractSpringBootTest.kt
Outdated
Show resolved
Hide resolved
frankvicky
requested changes
Jul 7, 2023
Comment on lines
14
to
15
| private val nicknameByteSizeMinimum: Int = 4 | ||
| private val nicknameByteSizeMaximum: Int = 16 |
There was a problem hiding this comment.
companion object {
private const val NICK_NAME_MINIMUM_BYTE_SIZE = 4
private const val NICK_NAME_MAXIMUM_BYTE_SIZE = 16
} | private val nicknameByteSizeMaximum: Int = 16 | ||
|
|
||
| fun updateNickname(nickname: String) { | ||
| if (nickname.toByteArray().size < nicknameByteSizeMinimum) { |
There was a problem hiding this comment.
nickname.toByteArray() 用變數接
Comment on lines
47
to
51
| var Jwt.email: String? | ||
| get() = claims["email"] as String? | ||
| set(value) { | ||
| claims["email"] = value | ||
| } |
There was a problem hiding this comment.
private val Jwt.email: String
get() = claims["email"]?.let { it as String }
?: throw PlatformException("JWT email should exist.")
Comment on lines
44
to
47
| fun givenUserNickname_whenUpdateEnglishNickname_thenShouldUpdateNickname() { | ||
| givenUserNickname() | ||
| .whenUpdateUserSelf(UpdateUserRequest("my nick name")) | ||
| .thenShouldUpdateNickname("my nick name") | ||
| } |
There was a problem hiding this comment.
- 這個測試案例可以改成這樣：
fun givenUserNamedNeverever_whenChangeUserNicknameToAbc_thenUserNickNameShouldBeAbc() {
givenUserNickname("Neverever")
.whenChangeUserNickName(UpdateUserRequest("abc"))
.thenShouldUpdateNickname("abc")
}- 下面的測試案例名稱可以依照上方範例檢視然後修改
| private val nicknameByteSizeMinimum: Int = 4 | ||
| private val nicknameByteSizeMaximum: Int = 16 | ||
|
|
||
| fun updateNickname(nickname: String) { |
There was a problem hiding this comment.
fun changeNickname(nickname: String)
Comment on lines
85
to
87
| private fun givenUserNickname(): User { | ||
| val user = User(User.Id("1"), "userA@example.com", "Neverever", mockUser.identities) | ||
| return userRepository.createUser(user) | ||
| } |
| } | ||
|
|
||
| private fun givenAnotherUserNickname(): User { | ||
| val user = User(User.Id("2"), "userB@example.com", "周杰倫", mockUser.identities) |
There was a problem hiding this comment.
ditto，在存進資料庫前不會有任何 UserId 存在
Comment on lines
134
to
135
| .getBody(PlatformViewModel::class.java) | ||
| .also { assertThat(it.message).contains(message) } |
There was a problem hiding this comment.
- 應該可以用
jsonPath比對 - 將
exists()改為value()就可以比對了
| .also { assertThat(it!!.nickname).isEqualTo(nickname) } | ||
| } | ||
|
|
||
| private fun ResultActions.thenShouldUpdateNicknameFailed(message: String) { |
There was a problem hiding this comment.
thenShouldChangeNicknameFailed
| @@ -59,4 +119,20 @@ class UserControllerTest @Autowired constructor( | |||
| .andExpect(jsonPath("$.nickname").doesNotExist()) | |||
| } | |||
|
|
|||
| private fun ResultActions.thenShouldUpdateNickname(nickname: String) { | |||
There was a problem hiding this comment.
thenUserNickNameSholdBeChanged
Wally5077
requested changes
Jul 8, 2023
spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/OAuth2Controller.kt
Outdated
Show resolved
Hide resolved
spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/controllers/UserControllerTest.kt
Outdated
Show resolved
Hide resolved
spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/controllers/UserControllerTest.kt
Outdated
Show resolved
Hide resolved
spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/controllers/UserControllerTest.kt
Outdated
Show resolved
Hide resolved
spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/controllers/UserControllerTest.kt
Outdated
Show resolved
Hide resolved
lohas1107
force-pushed
the
feature/update-user-info
branch
from
6fdde08
to
675f80c
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
frankvicky
approved these changes
Jul 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why need this change? / Root cause:
Changes made:
Test Scope / Change impact:
Issue