Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.pricewagon.pricewagon.domain.user.api;

import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand All @@ -14,6 +15,7 @@
import com.pricewagon.pricewagon.domain.user.entity.User;
import com.pricewagon.pricewagon.domain.user.service.EmailService;
import com.pricewagon.pricewagon.domain.user.service.UserCommandService;
import com.pricewagon.pricewagon.global.config.security.CustomUserDetails;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand Down Expand Up @@ -95,4 +97,13 @@ public ResponseEntity<UserResponseDTO.loginResultDTO> naverLogin(@RequestParam("
return ResponseEntity.ok(result);
}

//마이페이지 조회
@Operation(summary = "마이페이지 조회", description = "이름, 이메일 값 조회")
@GetMapping("/mypage")
public ResponseEntity<UserResponseDTO.myPageResultDTO> mypage(
@AuthenticationPrincipal CustomUserDetails userDetails) {
UserResponseDTO.myPageResultDTO result = userCommandService.mypage(userDetails);
return ResponseEntity.ok(result);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,10 @@ public static UserResponseDTO.validNumDTO toValidCheck(Boolean checked) {
.build();
}

public static UserResponseDTO.myPageResultDTO toMyPageResult(User user) {
return UserResponseDTO.myPageResultDTO.builder()
.email(user.getAccount())
.build();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,12 @@ public static class validNumDTO {
boolean isValid;
}

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class myPageResultDTO {
String email;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.pricewagon.pricewagon.domain.user.dto.UserRequestDTO;
import com.pricewagon.pricewagon.domain.user.dto.UserResponseDTO;
import com.pricewagon.pricewagon.domain.user.entity.User;
import com.pricewagon.pricewagon.global.config.security.CustomUserDetails;

import jakarta.servlet.http.HttpServletResponse;

Expand All @@ -17,4 +18,5 @@ public interface UserCommandService {

UserResponseDTO.loginResultDTO oAuthNaverLogin(String accessCode, HttpServletResponse httpServletResponse);

UserResponseDTO.myPageResultDTO mypage(CustomUserDetails userDetails);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.pricewagon.pricewagon.domain.user.dto.UserResponseDTO;
import com.pricewagon.pricewagon.domain.user.entity.User;
import com.pricewagon.pricewagon.domain.user.repository.UserRepository;
import com.pricewagon.pricewagon.global.config.security.CustomUserDetails;
import com.pricewagon.pricewagon.global.config.security.JwtUtil;
import com.pricewagon.pricewagon.global.config.security.KakaoUtil;
import com.pricewagon.pricewagon.global.config.security.NaverUtil;
Expand Down Expand Up @@ -90,6 +91,14 @@ public UserResponseDTO.loginResultDTO oAuthNaverLogin(String accessCode, HttpSer
return UserConverter.loginResult(user, token);
}

@Override
public UserResponseDTO.myPageResultDTO mypage(CustomUserDetails userDetails) {
User user = userRepository.findByAccount(userDetails.getUsername())
.orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
return UserConverter.toMyPageResult(user);

}

private User createNewUser(KakaoDTO.KakaoProfile kakaoProfile) {
User newUser = UserConverter.toUser(kakaoProfile, passwordEncoder);
return userRepository.save(newUser);
Expand Down