From 3dd74b25d65659d6f1ef0d9441f4b72289e94e6c Mon Sep 17 00:00:00 2001 From: ECMs Date: Sun, 7 Aug 2022 22:48:18 +0900 Subject: [PATCH] =?UTF-8?q?refac:=20=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94?= =?UTF-8?q?=20ResponseEntity=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/zip/cafe/api/FeedController.kt | 6 ++---- src/main/kotlin/zip/cafe/api/HealthController.kt | 6 ++---- src/main/kotlin/zip/cafe/api/LocalAuthController.kt | 10 ++++------ src/main/kotlin/zip/cafe/api/MemberController.kt | 6 ++---- .../kotlin/zip/cafe/api/MemberFollowController.kt | 13 +++++++------ 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/main/kotlin/zip/cafe/api/FeedController.kt b/src/main/kotlin/zip/cafe/api/FeedController.kt index b15755e..7efcf29 100644 --- a/src/main/kotlin/zip/cafe/api/FeedController.kt +++ b/src/main/kotlin/zip/cafe/api/FeedController.kt @@ -1,7 +1,5 @@ package zip.cafe.api -import org.springframework.http.ResponseEntity -import org.springframework.http.ResponseEntity.ok import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @@ -21,8 +19,8 @@ class FeedController( @LoginUserId memberId: Long, @RequestParam(required = false) minReviewId: Long?, @RequestParam(required = false, defaultValue = "10") limit: Long - ): ResponseEntity>> { + ): ApiResponse> { val feeds = feedService.getReviewFeeds(memberId, minReviewIdInFeed = minReviewId, limit = limit) - return ok(success(feeds)) + return success(feeds) } } diff --git a/src/main/kotlin/zip/cafe/api/HealthController.kt b/src/main/kotlin/zip/cafe/api/HealthController.kt index dd5220f..2c3e318 100644 --- a/src/main/kotlin/zip/cafe/api/HealthController.kt +++ b/src/main/kotlin/zip/cafe/api/HealthController.kt @@ -1,7 +1,5 @@ package zip.cafe.api -import org.springframework.http.ResponseEntity -import org.springframework.http.ResponseEntity.ok import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RestController @@ -9,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController class HealthController { @GetMapping("/health") - fun health(): ResponseEntity { - return ok("Hello") + fun health(): String { + return "Hello" } } diff --git a/src/main/kotlin/zip/cafe/api/LocalAuthController.kt b/src/main/kotlin/zip/cafe/api/LocalAuthController.kt index 8911555..946767d 100644 --- a/src/main/kotlin/zip/cafe/api/LocalAuthController.kt +++ b/src/main/kotlin/zip/cafe/api/LocalAuthController.kt @@ -1,7 +1,5 @@ package zip.cafe.api -import org.springframework.http.ResponseEntity -import org.springframework.http.ResponseEntity.ok import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping @@ -21,16 +19,16 @@ class LocalAuthController( ) { @PostMapping("/signUp") - fun signUp(@Valid @RequestBody request: LocalSignUpRequest): ResponseEntity> { + fun signUp(@Valid @RequestBody request: LocalSignUpRequest): ApiResponse { val registeredMemberId = localAuthService.signUp(request.toDto()) val token = authService.generateToken(registeredMemberId, Date()) - return ok().body(success(LocalSignUpResponse(token))) + return success(LocalSignUpResponse(token)) } @PostMapping("/signIn") - fun signIn(@Valid @RequestBody request: LocalSignInRequest): ResponseEntity> { + fun signIn(@Valid @RequestBody request: LocalSignInRequest): ApiResponse { val memberId = localAuthService.signIn(request.toDto()) val token = authService.generateToken(memberId, Date()) - return ok().body(success(LocalSignInResponse(token))) + return success(LocalSignInResponse(token)) } } diff --git a/src/main/kotlin/zip/cafe/api/MemberController.kt b/src/main/kotlin/zip/cafe/api/MemberController.kt index bd2f567..8d995e1 100644 --- a/src/main/kotlin/zip/cafe/api/MemberController.kt +++ b/src/main/kotlin/zip/cafe/api/MemberController.kt @@ -1,7 +1,5 @@ package zip.cafe.api -import org.springframework.http.ResponseEntity -import org.springframework.http.ResponseEntity.ok import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestParam @@ -20,9 +18,9 @@ class MemberController( @PostMapping("/nickname/duplicate") fun nicknameDuplicationCheck( @RequestParam nickname: String - ): ResponseEntity> { + ): ApiResponse { val isDuplicated = memberService.checkNicknameDuplication(nickname) val response = CheckNicknameDuplicationResponse(isDuplicated) - return ok(success(response)) + return success(response) } } diff --git a/src/main/kotlin/zip/cafe/api/MemberFollowController.kt b/src/main/kotlin/zip/cafe/api/MemberFollowController.kt index 9a5a8da..b22b61e 100644 --- a/src/main/kotlin/zip/cafe/api/MemberFollowController.kt +++ b/src/main/kotlin/zip/cafe/api/MemberFollowController.kt @@ -2,10 +2,9 @@ package zip.cafe.api import org.springframework.http.HttpStatus.ACCEPTED import org.springframework.http.HttpStatus.CREATED -import org.springframework.http.ResponseEntity -import org.springframework.http.ResponseEntity.status import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController import zip.cafe.api.dto.ApiResponse import zip.cafe.api.dto.ApiResponse.Companion.success @@ -17,15 +16,17 @@ class MemberFollowController( private val memberFollowService: MemberFollowService ) { + @ResponseStatus(CREATED) @PostMapping("/members/{targetMemberId}/follow") - fun follow(@LoginUserId loginMemberId: Long, @PathVariable targetMemberId: Long): ResponseEntity> { + fun follow(@LoginUserId loginMemberId: Long, @PathVariable targetMemberId: Long): ApiResponse { memberFollowService.follow(loginMemberId, targetMemberId) - return status(CREATED).body(success(null)) + return success(null) } + @ResponseStatus(ACCEPTED) @PostMapping("/members/{targetMemberId}/unfollow") - fun unfollow(@LoginUserId loginMemberId: Long, @PathVariable targetMemberId: Long): ResponseEntity> { + fun unfollow(@LoginUserId loginMemberId: Long, @PathVariable targetMemberId: Long): ApiResponse { memberFollowService.unfollow(loginMemberId, targetMemberId) - return status(ACCEPTED).body(success(null)) + return success(null) } }