♻️ :: main rebase

team-xquare · Jun 4, 2023 · 4f1b119 · 4f1b119
1 parent e23db6e
commit 4f1b119
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/user-infrastructure/src/main/kotlin/com/xquare/v1userservice/user/router/UserHandler.kt b/user-infrastructure/src/main/kotlin/com/xquare/v1userservice/user/router/UserHandler.kt
@@ -283,13 +283,8 @@ class UserHandler(
     }
 
     suspend fun getExcludeUserListHandler(serverRequest: ServerRequest): ServerResponse {
-<<<<<<< main
-        requestHeaderAspect.getSecretValue(serverRequest)
-        val excludeUserIds = serverRequest.getExcludeUserIds().userIdList.nullIfBlank()?.map { UUID.fromString(it.toString()) }
-=======
         /*requestHeaderAspect.getSecretValue(serverRequest)*/
-        val excludeUserIds = serverRequest.getExcludeUserIds().userIdList?.nullIfBlank()?.map { UUID.fromString(it.toString()) }
->>>>>>> ♻️ :: SecretValue 주석처리
+        val excludeUserIds = serverRequest.getExcludeUserIds().userIdList.nullIfBlank()?.map { UUID.fromString(it.toString()) }
         val users = userApi.getExcludeUserIdList(excludeUserIds)
         val response = ExcludeUserIdListResponse(users)