Merge pull request #79 from backendoori/feature-email-redis-ttl

🚀 Redis TTL 설정을 통한 이메일 인증 만료 기능 추가
backendoori · Jan 18, 2024 · 48ffb69 · 48ffb69
2 parents 09ffbcc + f5640ed
commit 48ffb69
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/com/backendoori/ootw/user/domain/Certificate.java b/src/main/java/com/backendoori/ootw/user/domain/Certificate.java
@@ -11,7 +11,7 @@
 
 @Getter
 @Builder
-@RedisHash("certificate")
+@RedisHash(value = "certificate", timeToLive = 10 * 60L)
 public class Certificate {
 
     public static final int SIZE = 6;

diff --git a/src/main/java/com/backendoori/ootw/user/exception/ExpiredCertificateException.java b/src/main/java/com/backendoori/ootw/user/exception/ExpiredCertificateException.java
@@ -0,0 +1,11 @@
+package com.backendoori.ootw.user.exception;
+
+public class ExpiredCertificateException extends IllegalArgumentException {
+
+    public static final String DEFAULT_MESSAGE = "만료된 인증 코드 입니다.";
+
+    public ExpiredCertificateException() {
+        super(DEFAULT_MESSAGE);
+    }
+
+}
diff --git a/src/main/java/com/backendoori/ootw/user/service/CertificateService.java b/src/main/java/com/backendoori/ootw/user/service/CertificateService.java
@@ -9,6 +9,7 @@
 import com.backendoori.ootw.user.dto.CertifyDto;
 import com.backendoori.ootw.user.dto.SendCodeDto;
 import com.backendoori.ootw.user.exception.AlreadyCertifiedUserException;
+import com.backendoori.ootw.user.exception.ExpiredCertificateException;
 import com.backendoori.ootw.user.exception.IncorrectCertificateException;
 import com.backendoori.ootw.user.repository.CertificateRedisRepository;
 import com.backendoori.ootw.user.repository.UserRepository;
@@ -51,7 +52,7 @@ public void certify(CertifyDto certifyDto) {
         AssertUtil.throwIf(user.isCertified(), AlreadyCertifiedUserException::new);
 
         Certificate certificate = certificateRedisRepository.findById(certifyDto.email())
-            .orElseThrow(UserNotFoundException::new);
+            .orElseThrow(ExpiredCertificateException::new);
         boolean isIncorrectCertificate = !certifyDto.code().equals(certificate.getCode());
 
         AssertUtil.throwIf(isIncorrectCertificate, IncorrectCertificateException::new);

diff --git a/src/test/java/com/backendoori/ootw/user/service/CertificateServiceTest.java b/src/test/java/com/backendoori/ootw/user/service/CertificateServiceTest.java
@@ -10,6 +10,7 @@
 import com.backendoori.ootw.user.dto.CertifyDto;
 import com.backendoori.ootw.user.dto.SendCodeDto;
 import com.backendoori.ootw.user.exception.AlreadyCertifiedUserException;
+import com.backendoori.ootw.user.exception.ExpiredCertificateException;
 import com.backendoori.ootw.user.exception.IncorrectCertificateException;
 import com.backendoori.ootw.user.repository.CertificateRedisRepository;
 import com.backendoori.ootw.user.repository.UserRepository;
@@ -173,7 +174,7 @@ void failCertificateNotFound() {
             ThrowingCallable certify = () -> certificateService.certify(certifyDto);
 
             // then
-            assertThatExceptionOfType(UserNotFoundException.class)
+            assertThatExceptionOfType(ExpiredCertificateException.class)
                 .isThrownBy(certify);
         }