diff --git a/src/main/java/com/jiyunio/todolist/member/Member.java b/src/main/java/com/jiyunio/todolist/member/Member.java index 0f70ee2..6700933 100644 --- a/src/main/java/com/jiyunio/todolist/member/Member.java +++ b/src/main/java/com/jiyunio/todolist/member/Member.java @@ -19,13 +19,10 @@ public class Member { private String userPw; - private String userEmail; - @Builder - protected Member(String userId, String userPw, String userEmail) { + protected Member(String userId, String userPw) { this.userId = userId; this.userPw = userPw; - this.userEmail = userEmail; } protected void updateUserPw(String userPw) { diff --git a/src/main/java/com/jiyunio/todolist/member/MemberRepository.java b/src/main/java/com/jiyunio/todolist/member/MemberRepository.java index c9128b4..d526ab3 100644 --- a/src/main/java/com/jiyunio/todolist/member/MemberRepository.java +++ b/src/main/java/com/jiyunio/todolist/member/MemberRepository.java @@ -10,6 +10,4 @@ public interface MemberRepository extends JpaRepository { Optional findByUserId(String userId); boolean existsByUserId(String userId); - - boolean existsByUserEmail(String userEmail); } diff --git a/src/main/java/com/jiyunio/todolist/member/MemberService.java b/src/main/java/com/jiyunio/todolist/member/MemberService.java index c1f9822..69d7439 100644 --- a/src/main/java/com/jiyunio/todolist/member/MemberService.java +++ b/src/main/java/com/jiyunio/todolist/member/MemberService.java @@ -16,11 +16,6 @@ public class MemberService { private final MemberRepository memberRepository; public String signUp(@Valid SignUpDTO signUpDto) { - if (memberRepository.existsByUserEmail(signUpDto.getUserEmail())) { - // 이미 존재하는 이메일 - throw new CustomException(HttpStatus.BAD_REQUEST, ErrorCode.EXIST_EMAIL); - } - if (memberRepository.existsByUserId(signUpDto.getUserId())) { // 이미 존재하는 아이디 throw new CustomException(HttpStatus.BAD_REQUEST, ErrorCode.EXIST_USERID); @@ -31,7 +26,6 @@ public String signUp(@Valid SignUpDTO signUpDto) { Member member = Member.builder() .userId(signUpDto.getUserId()) .userPw(signUpDto.getUserPw()) - .userEmail(signUpDto.getUserEmail()) .build(); memberRepository.save(member); return member.getUserId(); diff --git a/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java b/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java index 79c46af..c1e321c 100644 --- a/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java +++ b/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java @@ -1,7 +1,6 @@ package com.jiyunio.todolist.member.dto; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Getter; @@ -16,16 +15,12 @@ public class SignUpDTO { @Pattern(regexp = "(?=.*[a-zA-Z])(?=\\S+$).{5,10}", message = "아이디 : 5~10자") @Schema(description = "회원의 userId : 영문 대/소문자 5~10자", example = "qwe123") private String userId; + @NotBlank(message = "비밀번호를 입력하세요.") @Pattern(regexp = "(?=.*[0-9])(?=.*[a-zA-Z])(?=.*\\W)(?=\\S+$).{8,16}", message = "비밀번호: 8~16자의 영문 대/소문자, 숫자, 특수문자를 사용하십쇼.") @Schema(description = "회원의 비밀번호 : 8~16자의 영문 대/소문자, 숫자, 특수문자", example = "qwer123!") private String userPw; - @NotBlank(message = "이메일를 입력하세요.") - @Email(message = "이메일 형식이 맞지 않습니다.") - @Schema(description = "회원의 이메일", example = "qwer@google.com") - private String userEmail; - @NotBlank(message = "확인 비밀번호를 입력하세요.") private String confirmUserPw; }