diff --git a/src/main/java/EatPic/spring/domain/user/converter/UserConverter.java b/src/main/java/EatPic/spring/domain/user/converter/UserConverter.java index 5d395ea..5fb8b3b 100644 --- a/src/main/java/EatPic/spring/domain/user/converter/UserConverter.java +++ b/src/main/java/EatPic/spring/domain/user/converter/UserConverter.java @@ -12,6 +12,19 @@ public class UserConverter { + // 이메일 회원가입 + public static SignupResponseDTO toSignupResponseDTO(User user) { + return SignupResponseDTO.builder() + .role(user.getRole()) + .userId(user.getId()) + .email(user.getEmail()) + .nameId(user.getNameId()) + .nickname(user.getNickname()) + .marketingAgreed(user.getMarketingAgreed()) + .notificationAgreed(user.getNotificationAgreed()) + .build(); + } + public static LoginResponseDTO toLoginResultDTO(User user, String accessToken, String refreshToken) { return LoginResponseDTO.builder() .role(user.getRole()) @@ -119,5 +132,4 @@ public static CheckNicknameResponseDTO toCheckNicknameResponseDto(String nicknam .isDuplicate(isDuplicate) .build(); } - } diff --git a/src/main/java/EatPic/spring/domain/user/dto/response/SignupResponseDTO.java b/src/main/java/EatPic/spring/domain/user/dto/response/SignupResponseDTO.java index f89973a..070274f 100644 --- a/src/main/java/EatPic/spring/domain/user/dto/response/SignupResponseDTO.java +++ b/src/main/java/EatPic/spring/domain/user/dto/response/SignupResponseDTO.java @@ -16,6 +16,5 @@ public class SignupResponseDTO { private String nickname; // 닉네임 private Boolean marketingAgreed; // 마케팅 수신 동의 여부 private Boolean notificationAgreed; // 알림 수신 동의 여부 - private String message; // 예: "회원가입이 완료되었습니다." } diff --git a/src/main/java/EatPic/spring/domain/user/service/UserServiceImpl.java b/src/main/java/EatPic/spring/domain/user/service/UserServiceImpl.java index 44ad5df..602c383 100644 --- a/src/main/java/EatPic/spring/domain/user/service/UserServiceImpl.java +++ b/src/main/java/EatPic/spring/domain/user/service/UserServiceImpl.java @@ -46,17 +46,17 @@ public class UserServiceImpl implements UserService{ public SignupResponseDTO signup(SignupRequestDTO request) { // 이메일 중복 검사 if (userRepository.existsByEmail(request.getEmail())) { - throw new IllegalArgumentException("이미 사용 중인 이메일입니다."); + throw new ExceptionHandler(ErrorStatus.DUPLICATE_EMAIL); } // 닉네임 중복 검사 if (userRepository.existsByNickname(request.getNickname())) { - throw new IllegalArgumentException("이미 사용 중인 닉네임입니다."); + throw new ExceptionHandler(ErrorStatus.DUPLICATE_NICKNAME); } // 아이디 중복 검사 if (userRepository.existsByNameId(request.getNameId())) { - throw new IllegalArgumentException("이미 사용 중인 아이디입니다."); + throw new ExceptionHandler(ErrorStatus.DUPLICATE_NAMEID); } // 저장 @@ -77,16 +77,7 @@ public SignupResponseDTO signup(SignupRequestDTO request) { userBadgeService.initializeUserBadges(savedUser); // DTO로 응답 생성 - return SignupResponseDTO.builder() - .role(request.getRole()) - .userId(savedUser.getId()) - .email(savedUser.getEmail()) - .nameId(savedUser.getNameId()) - .nickname(savedUser.getNickname()) - .marketingAgreed(savedUser.getMarketingAgreed()) - .notificationAgreed(savedUser.getNotificationAgreed()) - .message("회원가입이 완료되었습니다.") - .build(); + return UserConverter.toSignupResponseDTO(savedUser); } // 로그인