From 0c92c726abfee685f791064384e5726a7723c089 Mon Sep 17 00:00:00 2001 From: chyun Date: Thu, 23 Jan 2025 18:32:36 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20[#167]=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=20=EA=B3=84=EC=B8=B5=EC=97=90=EC=84=9C=20url=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/user/controller/UserInfoController.java | 7 ++++--- .../api/user/dto/response/UserInfoResponse.java | 9 +++++++-- .../confeti/api/user/facade/UserInfoFacade.java | 5 +++-- .../api/user/facade/dto/response/UserInfoDTO.java | 14 +++++++++++--- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/sopt/confeti/api/user/controller/UserInfoController.java b/src/main/java/org/sopt/confeti/api/user/controller/UserInfoController.java index fae99c0..958c457 100644 --- a/src/main/java/org/sopt/confeti/api/user/controller/UserInfoController.java +++ b/src/main/java/org/sopt/confeti/api/user/controller/UserInfoController.java @@ -7,6 +7,7 @@ import org.sopt.confeti.global.common.BaseResponse; import org.sopt.confeti.global.message.SuccessMessage; import org.sopt.confeti.global.util.ApiResponseUtil; +import org.sopt.confeti.global.util.S3FileHandler; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; @@ -19,11 +20,11 @@ public class UserInfoController { private final UserInfoFacade userInfoFacade; + private final S3FileHandler s3FileHandler; @GetMapping - public ResponseEntity> getUserInfo(@RequestHeader("Authorization") Long userId) { + public ResponseEntity> getUserInfo(@RequestHeader("Authorization") long userId) { UserInfoDTO userInfo = userInfoFacade.getUserInfo(userId); - UserInfoResponse user = UserInfoResponse.from(userInfo); - return ApiResponseUtil.success(SuccessMessage.SUCCESS, user); + return ApiResponseUtil.success(SuccessMessage.SUCCESS, UserInfoResponse.of(userInfo, s3FileHandler)); } } diff --git a/src/main/java/org/sopt/confeti/api/user/dto/response/UserInfoResponse.java b/src/main/java/org/sopt/confeti/api/user/dto/response/UserInfoResponse.java index 7c87db1..4890fcb 100644 --- a/src/main/java/org/sopt/confeti/api/user/dto/response/UserInfoResponse.java +++ b/src/main/java/org/sopt/confeti/api/user/dto/response/UserInfoResponse.java @@ -1,13 +1,18 @@ package org.sopt.confeti.api.user.dto.response; import org.sopt.confeti.api.user.facade.dto.response.UserInfoDTO; +import org.sopt.confeti.global.util.S3FileHandler; public record UserInfoResponse ( Long userId, String profileUrl, String username ) { - public static UserInfoResponse from (UserInfoDTO userInfoDTO) { - return new UserInfoResponse(userInfoDTO.userId(), userInfoDTO.profileUrl(), userInfoDTO.username()); + public static UserInfoResponse of(final UserInfoDTO userInfoDTO, final S3FileHandler s3FileHandler) { + return new UserInfoResponse( + userInfoDTO.userId(), + s3FileHandler.getFileUrl(userInfoDTO.profilePath()), + userInfoDTO.username() + ); } } \ No newline at end of file diff --git a/src/main/java/org/sopt/confeti/api/user/facade/UserInfoFacade.java b/src/main/java/org/sopt/confeti/api/user/facade/UserInfoFacade.java index 00775c3..5c3a74e 100644 --- a/src/main/java/org/sopt/confeti/api/user/facade/UserInfoFacade.java +++ b/src/main/java/org/sopt/confeti/api/user/facade/UserInfoFacade.java @@ -14,7 +14,8 @@ public class UserInfoFacade { @Transactional public UserInfoDTO getUserInfo(Long userId) { - User user = userService.findById(userId); - return UserInfoDTO.from(user); + return UserInfoDTO.from( + userService.findById(userId) + ); } } diff --git a/src/main/java/org/sopt/confeti/api/user/facade/dto/response/UserInfoDTO.java b/src/main/java/org/sopt/confeti/api/user/facade/dto/response/UserInfoDTO.java index 34c73a3..8788558 100644 --- a/src/main/java/org/sopt/confeti/api/user/facade/dto/response/UserInfoDTO.java +++ b/src/main/java/org/sopt/confeti/api/user/facade/dto/response/UserInfoDTO.java @@ -2,8 +2,16 @@ import org.sopt.confeti.domain.user.User; -public record UserInfoDTO (Long userId, String profileUrl, String username){ - public static UserInfoDTO from (User user) { - return new UserInfoDTO(user.getId(), user.getProfilePath(), user.getUsername()); +public record UserInfoDTO ( + long userId, + String profilePath, + String username +){ + public static UserInfoDTO from (final User user) { + return new UserInfoDTO( + user.getId(), + user.getProfilePath(), + user.getUsername() + ); } }