diff --git a/src/main/java/EatPic/spring/domain/user/controller/UserController.java b/src/main/java/EatPic/spring/domain/user/controller/UserController.java index 50c0179..9dbd3c5 100644 --- a/src/main/java/EatPic/spring/domain/user/controller/UserController.java +++ b/src/main/java/EatPic/spring/domain/user/controller/UserController.java @@ -29,11 +29,13 @@ public ResponseEntity signup(@Valid @RequestBody SignupReques userBadgeService.initializeUserBadges(savedUser); SignupResponseDTO response = SignupResponseDTO.builder() + .role(savedUser.getRole()) .userId(savedUser.getId()) .email(savedUser.getEmail()) .nameId(savedUser.getNameId()) .nickname(savedUser.getNickname()) .marketingAgreed(savedUser.getMarketingAgreed()) + .notificationAgreed(savedUser.getNotificationAgreed()) .message("회원가입이 완료되었습니다.") .build(); 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 ced9873..6444664 100644 --- a/src/main/java/EatPic/spring/domain/user/converter/UserConverter.java +++ b/src/main/java/EatPic/spring/domain/user/converter/UserConverter.java @@ -71,12 +71,4 @@ public static UserResponseDTO.UserBlockResponseDto toUserBlockResponseDto(UserBl .targetUserId(userBlock.getBlockedUser().getId()) .build(); } - -// public static User toUser(SignupRequestDTO request) { -// return User.builder() -// .email(request.getEmail()) -// .password(request.getPassword()) -// .role(request.getRole()) -// .build(); -// } } diff --git a/src/main/java/EatPic/spring/domain/user/dto/request/SignupRequestDTO.java b/src/main/java/EatPic/spring/domain/user/dto/request/SignupRequestDTO.java index c90fe8e..e9fb62b 100644 --- a/src/main/java/EatPic/spring/domain/user/dto/request/SignupRequestDTO.java +++ b/src/main/java/EatPic/spring/domain/user/dto/request/SignupRequestDTO.java @@ -23,11 +23,6 @@ public class SignupRequestDTO { @NotBlank(message = "다시 한 번 입력해 주세요.") private String passwordConfirm; - @AssertTrue(message = "비밀번호가 일치하지 않습니다.") - public boolean isPasswordMatching() { - return password != null && password.equals(passwordConfirm); // password : Not Null - } - @NotBlank @Size(min = 5, max = 8) @Pattern(regexp = "^[a-z0-9]+$", message = "5~8자 사이의 소문자 및 숫자 입력") diff --git a/src/main/java/EatPic/spring/domain/user/service/UserService.java b/src/main/java/EatPic/spring/domain/user/service/UserService.java index f39ad4c..2ffb133 100644 --- a/src/main/java/EatPic/spring/domain/user/service/UserService.java +++ b/src/main/java/EatPic/spring/domain/user/service/UserService.java @@ -28,7 +28,6 @@ public class UserService { private final UserRepository userRepository; private final UserBlockRepository userBlockRepository; private final UserFollowRepository userFollowRepository; - private final PasswordEncoder passwordEncoder; public User signup(SignupRequestDTO request) { @@ -49,6 +48,7 @@ public User signup(SignupRequestDTO request) { // 저장 User user = User.builder() + .role(request.getRole()) .email(request.getEmail()) .password(passwordEncoder.encode(request.getPassword())) .nameId(request.getNameId())