From 03ae5d892223db78012cf457b760939692c0f410 Mon Sep 17 00:00:00 2001 From: Zerohertz Date: Thu, 31 Oct 2024 00:26:41 +0900 Subject: [PATCH] :recycle: style: friend controller --- .../friend/controller/FriendController.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/server/domain/friend/controller/FriendController.java b/src/main/java/com/server/domain/friend/controller/FriendController.java index baa12b4..7f2ef31 100644 --- a/src/main/java/com/server/domain/friend/controller/FriendController.java +++ b/src/main/java/com/server/domain/friend/controller/FriendController.java @@ -35,8 +35,8 @@ public class FriendController { @ResponseStatus(HttpStatus.CREATED) @PostMapping("/request") @Operation(summary = "친구 신청 생성", description = "친구 신청할 사용자의 이름을 입력하여 친구 신청 생성") - public ApiResponseDto createFriendRequest(@RequestParam String receiptUsername, - HttpServletRequest request) { + public ApiResponseDto createFriendRequest(HttpServletRequest request, + @RequestParam String receiptUsername) { String requestUsername = jwtService.extractUsernameFromToken(request).get(); friendService.createFriendRequest(requestUsername, receiptUsername); return ApiResponseDto.success(HttpStatus.CREATED.value(), @@ -58,8 +58,8 @@ public ApiResponseDto> getFriendRequest( @ResponseStatus(HttpStatus.OK) @DeleteMapping("/request") @Operation(summary = "친구 신청 취소", description = "친구 신청할 사용자의 이름을 입력하여 친구 신청 삭제") - public ApiResponseDto deleteFriendRequest(@RequestParam String receiptUsername, - HttpServletRequest request) { + public ApiResponseDto deleteFriendRequest(HttpServletRequest request, + @RequestParam String receiptUsername) { String requestUsername = jwtService.extractUsernameFromToken(request).get(); friendService.deleteFriendRequest(requestUsername, receiptUsername); return ApiResponseDto.success(HttpStatus.OK.value(), String @@ -69,9 +69,8 @@ public ApiResponseDto deleteFriendRequest(@RequestParam String receiptUs @ResponseStatus(HttpStatus.OK) @GetMapping("/receipt") @Operation(summary = "친구 내역 조회", description = "사용자 기준 신청 받은 내역") - public ApiResponseDto> getFriendReceipt( - @RequestParam(required = false) FriendState state, - HttpServletRequest request) { + public ApiResponseDto> getFriendReceipt(HttpServletRequest request, + @RequestParam(required = false) FriendState state) { String username = jwtService.extractUsernameFromToken(request).get(); List getUserOutDtos = friendService.getReceiptUser(username, state); return ApiResponseDto.success(HttpStatus.OK.value(), getUserOutDtos); @@ -80,8 +79,8 @@ public ApiResponseDto> getFriendReceipt( @ResponseStatus(HttpStatus.CREATED) @PutMapping("/receipt") @Operation(summary = "친구 신청 승인", description = "친구 신청을 승인할 사용자의 이름을 입력하여 친구 신청 승인") - public ApiResponseDto approveFriendRequest(@RequestParam String requestUsername, - HttpServletRequest request) { + public ApiResponseDto approveFriendRequest(HttpServletRequest request, + @RequestParam String requestUsername) { String receiptUsername = jwtService.extractUsernameFromToken(request).get(); friendService.acceptFriendRequest(requestUsername, receiptUsername); return ApiResponseDto.success(HttpStatus.CREATED.value(), String.format(