[FIX] 탈퇴계정 이메일 여부 판단 로직 추가

[FIX] 탈퇴계정 이메일 여부 판단 로직 추가

Author: siyeonkm

q-api/src/main/java/com/qcard/api/account/service/AccountService.java

@@ -23,15 +23,15 @@ public SignUpRes signUp(AccountReq accountReq) {
         if (!accountReq.isValid()) {
             throw new IllegalArgumentException("사용자에 대한 올바른 정보를 입력해주세요.");
         }
-        else if (accountDomainService.existsAccountByEmail(accountReq.getEmail())) {
-            throw new IllegalArgumentException("이미 계정이 존재합니다.");
+        else if(accountDomainService.findAccountByEmail(accountReq.getEmail()) != null){
+            throw new IllegalArgumentException((accountReq.getEmail() + ": 이미 존재하는 계정입니다."));
         }
 
-        Account account = accountDomainService.createAccount(
+        Account newAccount = accountDomainService.createAccount(
                 accountReq.getEmail(),
                 accountReq.getName(),
                 jwtService.encryptPassword(accountReq.getPassword()));
-        return new SignUpRes(account.getName());
+        return new SignUpRes(newAccount.getName());
     }
 
     public TokenRes signIn(SignInReq signInReq) {

q-domain/src/main/java/com/qcard/domains/account/service/AccountDomainService.java

@@ -30,10 +30,16 @@ public Optional<Account> findOpAccountByEmail(String email) {
 
     @Transactional(readOnly = true)
     public Account findAccountByEmail(String email) {
-        return accountRepository.findByEmail(email)
+        Account account = accountRepository.findByEmail(email)
                 .orElseThrow(() -> new IllegalArgumentException(email + ": 존재하지 않는 계정입니다"));
+        if(account.getIsDeleted()) {
+            throw new IllegalArgumentException(email + ": 탈퇴한 계정 이메일입니다.");
+        }
+
+        return account;
     }
 
+
     @Transactional(readOnly = true)
     public Account findAccountById(Long id) {
         return accountRepository.findById(id)

q-domain/src/main/java/com/qcard/domains/question/repository/AnswerRepository.java

@@ -9,7 +9,6 @@
 import java.util.Optional;
 
 public interface AnswerRepository extends JpaRepository<Answer, Long>, AnswerRepositoryCustom {
-    List<Answer> findAllByQuestionIdOrderByTypeDesc(Long questionId);
 
     List<Answer> findAllByAccount(Account account);