Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class JavaMailEmailClient(
fromEmail: String,
fromName: String,
) {
logger.info("메일링 임시 중단으로 발송 생략: $to")
return
try {
val message: MimeMessage = javaMailSender.createMimeMessage()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ enum class EmailErrorCode(
title = "이메일 서비스를 이용할 수 없습니다.",
message = "잠시 후 다시 시도해주세요.\n오류가 지속되면 개발자에게 문의해 주세요.",
),
EMAIL_SERVICE_TEMPORARY_DOWN(
httpStatusCode = HttpStatus.SERVICE_UNAVAILABLE,
title = "메일링 기능 보수 작업 중입니다.",
message = "이메일 회원가입은 인증 없이 바로 가입 완료됩니다.\n참여, 대기 확정, 취소 확인 메일은 발송되지 않습니다."
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ open class EmailException(
cause = cause,
)

class EmailServiceUnavailableException : EmailException(error = EmailErrorCode.EMAIL_SERVICE_UNAVAILABLE)
class EmailServiceUnavailableException(
error: EmailErrorCode,
) : EmailException(error = error)
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.wafflestudio.spring2025.common.email.service

import com.wafflestudio.spring2025.common.email.client.EmailClient
import com.wafflestudio.spring2025.common.email.exception.EmailErrorCode
import com.wafflestudio.spring2025.common.email.exception.EmailServiceUnavailableException
import com.wafflestudio.spring2025.config.EmailConfig
import com.wafflestudio.spring2025.domain.registration.model.RegistrationStatus
Expand Down Expand Up @@ -42,7 +43,7 @@ class EmailService(
fromName = emailConfig.fromName,
)
} catch (e: Exception) {
throw EmailServiceUnavailableException()
throw EmailServiceUnavailableException(EmailErrorCode.EMAIL_SERVICE_UNAVAILABLE)
}

logger.info("Verification email sent to: $toEmail")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.wafflestudio.spring2025.domain.auth.controller

import com.wafflestudio.spring2025.common.email.exception.EmailErrorCode
import com.wafflestudio.spring2025.common.email.exception.EmailServiceUnavailableException
import com.wafflestudio.spring2025.domain.auth.dto.LoginRequest
import com.wafflestudio.spring2025.domain.auth.dto.LoginResponse
import com.wafflestudio.spring2025.domain.auth.dto.SignupRequest
Expand Down Expand Up @@ -42,14 +44,23 @@ class AuthController(
): ResponseEntity<Void> {
// profileImage는 회원가입에서 받지 않는 정책이면 null로 고정

emailVerificationService.createPendingUser(
// emailVerificationService.createPendingUser(
// email = signupRequest.email,
// name = signupRequest.name,
// password = signupRequest.password,
// profileImage = signupRequest.profileImage,
// )
//

authService.signup(
email = signupRequest.email,
name = signupRequest.name,
password = signupRequest.password,
profileImage = signupRequest.profileImage,
)

return ResponseEntity.noContent().build()
throw EmailServiceUnavailableException(EmailErrorCode.EMAIL_SERVICE_TEMPORARY_DOWN)
// return ResponseEntity.noContent().build()
}

@Operation(
Expand Down
Loading