Merge pull request #69 from TRIP-Side-Project/dev

회원 가입 로직 버그 수정
TRIP-Side-Project · Dec 15, 2023 · a4b2b2c · a4b2b2c
2 parents 1d4cbb0 + 8b79d13
commit a4b2b2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/api/trip/domain/email/repository/EmailAuthRepository.java b/src/main/java/com/api/trip/domain/email/repository/EmailAuthRepository.java
@@ -7,6 +7,6 @@
 
 public interface EmailAuthRepository extends JpaRepository<EmailAuth, Long>, EmailAuthRepositoryCustom {
 
-    Optional<EmailAuth> findByEmail(String email);
+    Optional<EmailAuth> findTop1ByEmailAndExpiredIsTrueOrderByCreatedAtDesc(String email);
 
 }
diff --git a/src/main/java/com/api/trip/domain/email/service/EmailService.java b/src/main/java/com/api/trip/domain/email/service/EmailService.java
@@ -5,6 +5,7 @@
 import com.api.trip.domain.member.controller.dto.EmailResponse;
 import com.api.trip.domain.member.controller.dto.FindPasswordRequest;
 import com.api.trip.domain.member.model.Member;
+import com.api.trip.domain.member.repository.MemberRepository;
 import com.api.trip.domain.member.service.MemberService;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
@@ -29,10 +30,15 @@ public class EmailService {
     private final MemberService memberService;
     private final JavaMailSender javaMailSender;
     private final EmailAuthRepository emailAuthRepository;
+    private final MemberRepository memberRepository;
 
     @Async
     public void send(String email, String authToken) {
 
+        if (memberRepository.findByEmail(email).isPresent()) {
+            throw new RuntimeException("이메일 인증이 완료된 회원입니다!");
+        }
+
         String authLink = "https://triptrip.site/api/members/auth-email/%s/%s".formatted(email, authToken);
 
         MimeMessage message = javaMailSender.createMimeMessage();

diff --git a/src/main/java/com/api/trip/domain/member/service/MemberService.java b/src/main/java/com/api/trip/domain/member/service/MemberService.java
@@ -43,7 +43,7 @@ public void join(JoinRequest joinRequest, MultipartFile profileImg) throws IOExc
         });
 
         // 이메일 인증이 완료 여부 검사
-        EmailAuth emailAuth = emailAuthRepository.findByEmail(joinRequest.getEmail())
+        EmailAuth emailAuth = emailAuthRepository.findTop1ByEmailAndExpiredIsTrueOrderByCreatedAtDesc(joinRequest.getEmail())
                 .orElseThrow(() -> new RuntimeException("이메일 인증 토큰 정보가 없습니다!"));
 
         String profileImgUrl = "";