Skip to content

Commit 2c5afbe

Browse files
authored
Merge pull request #178 from ProjectArTrip/ART-135
[FEAT] 마이페이지 정보 조회
2 parents 4c46700 + 5ca182c commit 2c5afbe

File tree

3 files changed

+41
-0
lines changed

3 files changed

+41
-0
lines changed

src/main/java/org/atdev/artrip/domain/user/service/UserService.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.atdev.artrip.domain.keyword.repository.KeywordRepository;
1010
import org.atdev.artrip.domain.keyword.repository.UserKeywordRepository;
1111
import org.atdev.artrip.domain.user.web.dto.request.NicknameRequest;
12+
import org.atdev.artrip.domain.user.web.dto.response.MypageResponse;
1213
import org.atdev.artrip.domain.user.web.dto.response.NicknameResponse;
1314
import org.atdev.artrip.global.apipayload.code.status.S3Error;
1415
import org.atdev.artrip.global.apipayload.code.status.UserError;
@@ -146,4 +147,15 @@ public void deleteProfileImg(Long userId){
146147
}
147148
user.updateProfileImage(null);
148149
}
150+
151+
@Transactional(readOnly = true)
152+
public MypageResponse getMypage(Long userId){
153+
154+
User user = userRepository.findById(userId)
155+
.orElseThrow(()-> new GeneralException(UserError._USER_NOT_FOUND));
156+
157+
return new MypageResponse(user.getNickName(), user.getProfileImageUrl());
158+
}
159+
160+
149161
}

src/main/java/org/atdev/artrip/domain/user/web/controller/UserController.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.atdev.artrip.domain.keyword.web.dto.KeywordRequest;
66
import org.atdev.artrip.domain.user.service.UserService;
77
import org.atdev.artrip.domain.user.web.dto.request.NicknameRequest;
8+
import org.atdev.artrip.domain.user.web.dto.response.MypageResponse;
89
import org.atdev.artrip.domain.user.web.dto.response.NicknameResponse;
910
import org.atdev.artrip.global.apipayload.CommonResponse;
1011
import org.atdev.artrip.global.apipayload.code.status.CommonError;
@@ -91,5 +92,20 @@ public ResponseEntity<CommonResponse<NicknameResponse>> updateNickname(
9192
return ResponseEntity.ok(CommonResponse.onSuccess(response));
9293
}
9394

95+
@Operation(summary = "마이페이지 조회", description = "닉네임, 프로필 이미지 조회")
96+
@GetMapping("/mypage")
97+
@ApiErrorResponses(
98+
common = {CommonError._INTERNAL_SERVER_ERROR, CommonError._UNAUTHORIZED},
99+
user = {UserError._USER_NOT_FOUND}
100+
)
101+
public ResponseEntity<CommonResponse<MypageResponse>> getMypage(
102+
@AuthenticationPrincipal UserDetails user) {
103+
104+
Long userId = Long.valueOf(user.getUsername());
105+
106+
MypageResponse response = userService.getMypage(userId);
107+
108+
return ResponseEntity.ok(CommonResponse.onSuccess(response));
109+
}
94110

95111
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.atdev.artrip.domain.user.web.dto.response;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
6+
@Getter
7+
@AllArgsConstructor
8+
public class MypageResponse {
9+
10+
private String nickName;
11+
private String profileImage;
12+
13+
}

0 commit comments

Comments
 (0)