feat: 이메일 인증 예외처리 개선

.gitignore

@@ -3,7 +3,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-.DS_store
+.DS_Store
 
 ### STS ###
 .apt_generated

src/main/kotlin/uoslife/servermeeting/global/error/exception/ErrorCode.kt

@@ -137,6 +137,7 @@ enum class ErrorCode(val code: String, val message: String, var status: Int) {
         HttpStatus.TOO_MANY_REQUESTS.value()
     ),
     EMAIL_SEND_FAILED("E06", "Failed to send email.", HttpStatus.INTERNAL_SERVER_ERROR.value()),
+    EMAIL_VERIFICATION_CODE_EXPIRED("E06", "인증 코드가 만료되었습니다.", HttpStatus.BAD_REQUEST.value()),
 
     // JWT
     JWT_TOKEN_NOT_FOUND("J001", "Token not found", HttpStatus.UNAUTHORIZED.value()),

src/main/kotlin/uoslife/servermeeting/user/service/UserService.kt

@@ -245,4 +245,13 @@ class UserService(
         }
         return TeamBranch.JOINED
     }
+
+    @Transactional
+    fun getOrCreateUser(email: String): User {
+        return try {
+            getUserByEmail(email)
+        } catch (e: UserNotFoundException) {
+            createUserByEmail(email)
+        }
+    }
 }

src/main/kotlin/uoslife/servermeeting/verification/api/VerificationApi.kt

@@ -140,47 +140,7 @@ class VerificationApi(
                                         )]
                             )]
                 ),
-                ApiResponse(
-                    responseCode = "401",
-                    description = "인증 오류",
-                    content =
-                        [
-                            Content(
-                                schema = Schema(implementation = ErrorResponse::class),
-                                examples =
-                                    [
-                                        ExampleObject(
-                                            name = "Token Not Found",
-                                            value =
-                                                "{\"message\": \"Token not found\", \"status\": 401, \"code\": \"J001\"}"
-                                        ),
-                                        ExampleObject(
-                                            name = "Token Expired",
-                                            value =
-                                                "{\"message\": \"Token has expired\", \"status\": 401, \"code\": \"J002\"}"
-                                        ),
-                                        ExampleObject(
-                                            name = "Invalid Token Format",
-                                            value =
-                                                "{\"message\": \"Invalid token format\", \"status\": 401, \"code\": \"J003\"}"
-                                        ),
-                                        ExampleObject(
-                                            name = "Invalid Token Signature",
-                                            value =
-                                                "{\"message\": \"Invalid token signature\", \"status\": 401, \"code\": \"J004\"}"
-                                        ),
-                                        ExampleObject(
-                                            name = "Refresh Token Not Found",
-                                            value =
-                                                "{\"message\": \"Refresh token not found\", \"status\": 401, \"code\": \"J005\"}"
-                                        ),
-                                        ExampleObject(
-                                            name = "Refresh Token Expired",
-                                            value =
-                                                "{\"message\": \"Refresh token has expired\", \"status\": 401, \"code\": \"J006\"}"
-                                        )]
-                            )]
-                )]
+            ]
     )
     // TODO: Service layer로 이동해야함
     @PostMapping("/verify-email")
@@ -192,12 +152,7 @@ class VerificationApi(
         val requestInfo = requestUtils.toRequestInfoDto(request)
         emailVerificationService.verifyEmail(body.email, body.code, requestInfo)
 
-        val user =
-            try {
-                userService.getUserByEmail(body.email)
-            } catch (e: Exception) {
-                userService.createUserByEmail(body.email)
-            }
+        val user = userService.getOrCreateUser(body.email)
 
         val accessToken = authService.issueTokens(user.id!!, response)
         return ResponseEntity.ok(accessToken)

src/main/kotlin/uoslife/servermeeting/verification/exception/EmailVerificationCodeExpiredException.kt

@@ -0,0 +1,7 @@
+package uoslife.servermeeting.verification.exception
+
+import uoslife.servermeeting.global.error.exception.BusinessException
+import uoslife.servermeeting.global.error.exception.ErrorCode
+
+class EmailVerificationCodeExpiredException :
+    BusinessException(ErrorCode.EMAIL_VERIFICATION_CODE_EXPIRED) {}

src/main/kotlin/uoslife/servermeeting/verification/service/EmailVerificationService.kt

@@ -55,17 +55,22 @@ class EmailVerificationService(
         validateVerificationAttempts(email)
         incrementVerificationAttempts(email)
         // Redis에서 인증 코드 조회
-        val redisCode = getVerificationCode(email)
+        val redisCode = getVerificationCode(email, requestInfo)
         // 인증 코드 검증
         validateVerificationCode(redisCode, code, email, requestInfo)
         // 검증 성공한 코드 삭제
         clearVerificationData(email)
     }
 
-    private fun getVerificationCode(email: String): String {
+    private fun getVerificationCode(email: String, requestInfo: RequestInfoDto): String {
         val verificationCodeKey =
             VerificationUtils.generateRedisKey(VerificationConstants.CODE_PREFIX, email)
-        return redisTemplate.opsForValue().get(verificationCodeKey).toString()
+        val code = redisTemplate.opsForValue().get(verificationCodeKey)
+        if (code == null) {
+            logger.warn("[이메일 인증 실패(만료)] email: $email, $requestInfo")
+            throw EmailVerificationCodeExpiredException()
+        }
+        return code.toString()
     }
 
     private fun validateVerificationCode(
@@ -75,7 +80,7 @@ class EmailVerificationService(
         requestInfo: RequestInfoDto
     ) {
         if (redisCode != code) {
-            logger.warn("[이메일 인증 실패] email: $email, $requestInfo")
+            logger.warn("[이메일 인증 실패(불일치)] email: $email, $requestInfo")
             throw EmailVerificationCodeMismatchException()
         }
         logger.info("[이메일 인증 성공] email: $email")