Skip to content

Commit 7aa83be

Browse files
committed
[fix] #116 닉네임과 얼굴상 함께 반환하도록 수정
1 parent ad18fed commit 7aa83be

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/main/java/org/festimate/team/api/user/UserController.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import org.festimate.team.api.facade.SignUpFacade;
88
import org.festimate.team.api.user.dto.SignUpRequest;
99
import org.festimate.team.api.user.dto.UserFestivalResponse;
10-
import org.festimate.team.api.user.dto.UserNicknameResponse;
10+
import org.festimate.team.api.user.dto.UserInfoResponse;
11+
import org.festimate.team.domain.user.dto.UserInfoDto;
1112
import org.festimate.team.domain.user.service.UserService;
1213
import org.festimate.team.domain.user.validator.UserRequestValidator;
1314
import org.festimate.team.global.response.ApiResponse;
@@ -54,12 +55,12 @@ public ResponseEntity<ApiResponse<TokenResponse>> signUp(
5455
}
5556

5657
@GetMapping("/me/nickname")
57-
public ResponseEntity<ApiResponse<UserNicknameResponse>> getNickname(
58+
public ResponseEntity<ApiResponse<UserInfoResponse>> getNickname(
5859
@RequestHeader("Authorization") String accessToken
5960
) {
6061
Long userId = jwtService.parseTokenAndGetUserId(accessToken);
61-
String nickName = userService.getUserNickname(userId);
62-
return ResponseBuilder.ok(UserNicknameResponse.from(nickName));
62+
UserInfoDto userInfoDto = userService.getUserNicknameAndAppearanceType(userId);
63+
return ResponseBuilder.ok(UserInfoResponse.from(userInfoDto.nickname(), userInfoDto.appearanceType()));
6364
}
6465

6566
@GetMapping("/me/festivals")

src/main/java/org/festimate/team/domain/user/service/UserService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.festimate.team.domain.user.service;
22

33
import org.festimate.team.api.user.dto.SignUpRequest;
4+
import org.festimate.team.domain.user.dto.UserInfoDto;
45
import org.festimate.team.domain.user.entity.Platform;
56
import org.festimate.team.domain.user.entity.User;
67

@@ -15,7 +16,7 @@ public interface UserService {
1516

1617
User signUp(SignUpRequest request, String platformId);
1718

18-
String getUserNickname(Long userId);
19+
UserInfoDto getUserNicknameAndAppearanceType(Long userId);
1920

2021
User getUserByIdOrThrow(Long userId);
2122

src/main/java/org/festimate/team/domain/user/service/impl/UserServiceImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
55
import org.festimate.team.api.user.dto.SignUpRequest;
6+
import org.festimate.team.domain.user.dto.UserInfoDto;
67
import org.festimate.team.domain.user.entity.Platform;
78
import org.festimate.team.domain.user.entity.User;
89
import org.festimate.team.domain.user.repository.UserRepository;
@@ -50,9 +51,9 @@ public User signUp(SignUpRequest request, String platformId) {
5051
}
5152

5253
@Override
53-
public String getUserNickname(Long userId) {
54-
getUserByIdOrThrow(userId);
55-
return userRepository.findNicknameByUserId(userId);
54+
public UserInfoDto getUserNicknameAndAppearanceType(Long userId) {
55+
User user = getUserByIdOrThrow(userId);
56+
return new UserInfoDto(user.getNickname(), user.getAppearanceType());
5657
}
5758

5859
@Override

0 commit comments

Comments
 (0)