diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java index 55d74ab..fd31223 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java @@ -90,7 +90,7 @@ public MemberResponse userSignUp(SignUpDto signUpDto) { @Override public JwtToken userSignIN(String email, String password) { // 1. 사용자가 입력한 비밀번호와 저장된 비밀번호를 비교 - Member member = memberLoader.getMemberByEmail(email); + Member member = memberLoader.findByMemberEmail(email); if (!passwordEncoder.matches(password, member.getPassword())) { log.info("Password mismatch"); @@ -155,8 +155,8 @@ public EmailVerificationResult verifiedCode(String email, String authCode) { // 이메일 중복 체크 @Override public EmailVerificationResult verificateEmail(String email) { - Member member = memberLoader.findByMemberEmail(email); - if (!Objects.isNull(member)) { + + if (memberLoader.findByMemberEmailForCheck(email).isPresent()) { throw new BusinessException(ErrorCode.EXIST_EMAIL); } return EmailVerificationResult.builder().authResult(true).build(); diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/util/MemberLoader.java b/src/main/java/com/example/bigbrotherbe/domain/member/util/MemberLoader.java index 2990313..0e20373 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/util/MemberLoader.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/util/MemberLoader.java @@ -24,10 +24,6 @@ public Member getMember(Long id) { ); } - public Member getMemberByEmail(String email) { - return memberRepository.findByEmail(email) - .orElseThrow(() -> new BusinessException(ErrorCode.NO_EXIST_EMAIL)); - } public Member findByUserName(String username) { return memberRepository.findByUsername(username) .orElseThrow(() -> new IllegalArgumentException("잘못된 사용자 이름입니다.")); @@ -41,7 +37,8 @@ public Member findByMemberEmail(String memberEmail) { return memberRepository.findByEmail(memberEmail).orElseThrow(() -> new BusinessException(ErrorCode.NO_EXIST_EMAIL)); } - - + public Optional findByMemberEmailForCheck(String memberEmail) { + return memberRepository.findByEmail(memberEmail); + } }