feat: userId header에서 QueryString으로 변경 (#34)

team-xquare · Mar 15, 2023 · d630c4d · d630c4d
1 parent 2df4c92
commit d630c4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...tion/v1authorizationservice/authority/accessmanagement/handler/AccessManagementHandler.kt b/...tion/v1authorizationservice/authority/accessmanagement/handler/AccessManagementHandler.kt
@@ -1,16 +1,19 @@
 package com.xquare.authorization.v1authorizationservice.authority.accessmanagement.handler
 
 import com.xquare.authorization.domain.authority.useraccessmanagement.api.AccessManagementService
+import com.xquare.authorization.domain.authority.useraccessmanagement.api.dtos.AuthorityListByTypeResponse
+import com.xquare.authorization.v1authorizationservice.configuration.validate.BadRequestException
 import com.xquare.authorization.v1authorizationservice.configuration.validate.RequestBodyValidator
-import java.net.URI
-import java.util.UUID
 import kotlinx.coroutines.reactor.awaitSingle
 import org.springframework.stereotype.Component
 import org.springframework.web.reactive.function.server.ServerRequest
 import org.springframework.web.reactive.function.server.ServerResponse
 import org.springframework.web.reactive.function.server.bodyToMono
 import org.springframework.web.reactive.function.server.bodyValueAndAwait
 import org.springframework.web.reactive.function.server.buildAndAwait
+import org.springframework.web.reactive.function.server.queryParamOrNull
+import java.net.URI
+import java.util.*
 
 @Component
 class AccessManagementHandler(
@@ -30,10 +33,10 @@ class AccessManagementHandler(
         return ServerResponse.ok().bodyValueAndAwait(authorityList)
     }
 
-    suspend fun handleGetAuthorityListByType(serverRequest: ServerRequest): ServerResponse{
-        val userId = serverRequest.headers().firstHeader("Request-User-Id")
-        val type = serverRequest.pathVariable("type")
-        val authorityList = accessManagementService.getUserAuthorityListByType(UUID.fromString(userId), type)
+    suspend fun handleGetAuthorityListByType(serverRequest: ServerRequest): ServerResponse {
+        val userId = UUID.fromString(serverRequest.pathVariable("userId"))
+        val type = serverRequest.queryParamOrNull("type") ?: throw BadRequestException("Type Not Found")
+        val authorityList = accessManagementService.getUserAuthorityListByType(userId, type)
         return ServerResponse.ok().bodyValueAndAwait(authorityList)
     }
 

diff --git a/...zation/v1authorizationservice/authority/accessmanagement/router/AccessManagementRouter.kt b/...zation/v1authorizationservice/authority/accessmanagement/router/AccessManagementRouter.kt
@@ -181,7 +181,7 @@ class AccessManagementRouter(
         "/authorities/access-management".nest {
             POST("/basic", accessManagementHandler::createUserBaseAccessManagement)
             GET("/{userId}", accessManagementHandler::handleGetAuthorityList)
-            GET("/type/{type}", accessManagementHandler::handleGetAuthorityListByType)
+            GET("/type/{userId}", accessManagementHandler::handleGetAuthorityListByType)
             DELETE("/basic/{userId}", accessManagementHandler::handleDeleteBaseAccessManagement)
         }
     }