Skip to content

Commit

Permalink
refactor :: 빌드 에러 ㅎㅐㄱㅕㄹ
Browse files Browse the repository at this point in the history
  • Loading branch information
4mjeo committed Mar 2, 2024
1 parent a6b8617 commit e304143
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ interface ProjectService {
fun duplicate(projectNamEn: String): Boolean
fun hide(projectId: UUID)
fun unhide(projectId: UUID)
fun registerClient(req: RegisterClientRequest): RegisterClientResponse
fun updateClient(clientId: String, req: UpdateClientRequest): UpdateClientResponse
fun regenerateSecret(clientId: String): RegenerateSecretResponse
// fun registerClient(req: RegisterClientRequest): RegisterClientResponse
// fun updateClient(clientId: String, req: UpdateClientRequest): UpdateClientResponse
// fun regenerateSecret(clientId: String): RegenerateSecretResponse

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import com.example.mergebackend.domain.project.repository.ProjectRepository
import com.example.mergebackend.domain.user.exception.UserNotFoundException
import com.example.mergebackend.domain.user.repository.UserRepository
import com.example.mergebackend.global.common.facade.UserFacade
import com.example.mergebackend.infra.feign.oauth.OAuthClient
//import com.example.mergebackend.infra.feign.oauth.OAuthClient
import com.example.mergebackend.infra.feign.oauth.dto.request.RegisterClientRequest
import com.example.mergebackend.infra.feign.oauth.dto.request.UpdateClientRequest
import com.example.mergebackend.infra.feign.oauth.dto.response.RegenerateSecretResponse
Expand All @@ -32,7 +32,7 @@ class ProjectServiceImpl(
private val userFacade: UserFacade,
private val fileService: FileService,
private val userRepository: UserRepository,
private val oAuthClient: OAuthClient
// private val oAuthClient: OAuthClient
) : ProjectService {

@Transactional
Expand Down Expand Up @@ -174,24 +174,24 @@ class ProjectServiceImpl(

project.isHidden = false
}

@Transactional
override fun registerClient(req: RegisterClientRequest): RegisterClientResponse {
return oAuthClient.registerClient(
request = RegisterClientRequest(
clientId = req.clientId,
redirectUris = req.redirectUris ?: emptyList()
)
)
}

@Transactional
override fun updateClient(clientId: String, req: UpdateClientRequest): UpdateClientResponse {
return oAuthClient.updateClient(clientId, req)
}

@Transactional
override fun regenerateSecret(clientId: String): RegenerateSecretResponse {
return oAuthClient.regenerateSecret(clientId)
}
//
// @Transactional
// override fun registerClient(req: RegisterClientRequest): RegisterClientResponse {
// return oAuthClient.registerClient(
// request = RegisterClientRequest(
// clientId = req.clientId,
// redirectUris = req.redirectUris ?: emptyList()
// )
// )
// }
//
// @Transactional
// override fun updateClient(clientId: String, req: UpdateClientRequest): UpdateClientResponse {
// return oAuthClient.updateClient(clientId, req)
// }
//
// @Transactional
// override fun regenerateSecret(clientId: String): RegenerateSecretResponse {
// return oAuthClient.regenerateSecret(clientId)
// }
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ import org.springframework.transaction.annotation.Propagation
import org.springframework.transaction.annotation.Transactional
import org.springframework.web.bind.annotation.*

@FeignClient(
name = "oauthClient",
url = "\${BASE_URL}",
configuration = [FeignConfig::class]
)
interface OAuthClient {

@PostMapping("/oauth2/client")
@Transactional(propagation = Propagation.REQUIRES_NEW)
fun registerClient(
@RequestHeader("")
@RequestBody request: RegisterClientRequest
): RegisterClientResponse

@PatchMapping("/oauth2/client/{client-id}")
fun updateClient(
@PathVariable("client-id") clientId: String,
@RequestBody request: UpdateClientRequest
): UpdateClientResponse

@GetMapping("/oauth2/client/{client-id}/secret")
fun regenerateSecret(@PathVariable("client-id") clientId: String): RegenerateSecretResponse

}
//@FeignClient(
// name = "oauthClient",
// url = "\${BASE_URL}",
// configuration = [FeignConfig::class]
//)
//interface OAuthClient {
//
// @PostMapping("/oauth2/client")
// @Transactional(propagation = Propagation.REQUIRES_NEW)
// fun registerClient(
// @RequestHeader("")
// @RequestBody request: RegisterClientRequest
// ): RegisterClientResponse
//
// @PatchMapping("/oauth2/client/{client-id}")
// fun updateClient(
// @PathVariable("client-id") clientId: String,
// @RequestBody request: UpdateClientRequest
// ): UpdateClientResponse
//
// @GetMapping("/oauth2/client/{client-id}/secret")
// fun regenerateSecret(@PathVariable("client-id") clientId: String): RegenerateSecretResponse
//
//}

0 comments on commit e304143

Please sign in to comment.