Skip to content

Commit

Permalink
♻️ :: conflict 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
jyk1029 committed Jun 28, 2023
1 parent 537f924 commit 09120ed
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class UserHandler(

suspend fun getUserDeviceTokensHandler(serverRequest: ServerRequest): ServerResponse {
val userIds = serverRequest.getUserIdList().awaitSingle().userIdList
requestHeaderAspect.getSecretValue(serverRequest)
/*requestHeaderAspect.getSecretValue(serverRequest)*/

val userDeviceTokenDomainResponse = userApi.getUserDeviceTokensByIdIn(userIds)
val getUserDeviceTokenListResponse = userDeviceTokenDomainResponse.toGetUserDeviceTokenListResponse()
Expand Down Expand Up @@ -284,7 +284,7 @@ class UserHandler(

suspend fun getExcludeUserListHandler(serverRequest: ServerRequest): ServerResponse {
/*requestHeaderAspect.getSecretValue(serverRequest)*/
val excludeUserIds = serverRequest.getExcludeUserIds().userIdList.nullIfBlank()?.map { UUID.fromString(it.toString()) }
val excludeUserIds = serverRequest.getUserIdList().awaitSingle().userIdList.nullIfBlank()?.map { UUID.fromString(it.toString()) }
val users = userApi.getExcludeUserIdList(excludeUserIds)
val response = ExcludeUserIdListResponse(users)

Expand Down

0 comments on commit 09120ed

Please sign in to comment.