refactor: 이메일 서비스 추상화 (#110)

* refactor: VerificationService 추상화 * refactor: VerificationService 추상화 * refactor: EmailService 추상화 * refactor: EmailService 추상화 * chore: apply fmt
uoslife · Apr 8, 2024 · f4f02d3 · f4f02d3
1 parent 89c59ca
commit f4f02d3
Show file tree

Hide file tree

Showing 4 changed files with 196 additions and 157 deletions.
diff --git a/src/main/kotlin/uoslife/servermeeting/verification/service/EmailService.kt b/src/main/kotlin/uoslife/servermeeting/verification/service/EmailService.kt
@@ -0,0 +1,7 @@
+package uoslife.servermeeting.verification.service
+
+import software.amazon.awssdk.services.sesv2.model.SendEmailResponse
+
+interface EmailService {
+    fun sendEmail(to: String, code: String): SendEmailResponse
+}
diff --git a/src/main/kotlin/uoslife/servermeeting/verification/service/EmailServiceImpl.kt b/src/main/kotlin/uoslife/servermeeting/verification/service/EmailServiceImpl.kt
@@ -0,0 +1,76 @@
+package uoslife.servermeeting.verification.service
+
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.stereotype.Service
+import software.amazon.awssdk.services.sesv2.SesV2Client
+import software.amazon.awssdk.services.sesv2.model.*
+import uoslife.servermeeting.verification.exception.EmailSendFailedException
+
+@Service
+class EmailServiceImpl(
+    private val sesV2Client: SesV2Client,
+    @Value("\${cloud.aws.ses.from}") private val mailFrom: String
+) : EmailService {
+
+    companion object {
+        const val SUBJECT: String = "[시대팅] 인증 메일 코드를 확인해주세요"
+        private val logger = LoggerFactory.getLogger(EmailServiceImpl::class.java)
+    }
+
+    override fun sendEmail(destination: String, code: String): SendEmailResponse {
+        // 메일 내용 생성
+        val sendEmailRequest: SendEmailRequest = createSendEmailRequest(destination, code)
+
+        // 메일 보내기
+        try {
+            val sendEmailResponse: SendEmailResponse = sesV2Client.sendEmail(sendEmailRequest)
+            logger.info("Verification mail is sended from $mailFrom to ${destination}")
+
+            return sendEmailResponse
+        } catch (e: SesV2Exception) {
+            logger.error("Email Send Failed Exception")
+            logger.error(e.message)
+            throw EmailSendFailedException()
+        } catch (e: Exception) {
+            logger.error("Email Send Failed Exception")
+            logger.error(e.message)
+            throw EmailSendFailedException()
+        }
+    }
+
+    private fun createSendEmailRequest(destination: String, code: String): SendEmailRequest {
+        // 수신 이메일 설정
+        val destination: Destination = Destination.builder().toAddresses(destination).build()
+
+        // 메일 내용 설정
+        val emailContent: EmailContent = createEmailContent(code)
+
+        val sendEmailRequest: SendEmailRequest =
+            SendEmailRequest.builder()
+                .fromEmailAddress(mailFrom)
+                .destination(destination)
+                .content(emailContent)
+                .build()
+
+        return sendEmailRequest
+    }
+
+    private fun createContent(content: String): Content {
+        return Content.builder().data(content).charset("UTF-8").build()
+    }
+
+    private fun createEmailContent(code: String): EmailContent {
+        val message: Message =
+            Message.builder()
+                .subject(createContent(SUBJECT))
+                .body(Body.builder().html(createContent(getVerificationMessage(code))).build())
+                .build()
+
+        return EmailContent.builder().simple(message).build()
+    }
+
+    private fun getVerificationMessage(code: String): String {
+        return String.format("<h3 style='text-align:cetner;'>인증코드: %s</h3>", code)
+    }
+}
diff --git a/src/main/kotlin/uoslife/servermeeting/verification/service/VerificationService.kt b/src/main/kotlin/uoslife/servermeeting/verification/service/VerificationService.kt
@@ -1,169 +1,15 @@
 package uoslife.servermeeting.verification.service
 
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import software.amazon.awssdk.services.sesv2.SesV2Client
-import software.amazon.awssdk.services.sesv2.model.Body
-import software.amazon.awssdk.services.sesv2.model.Content
-import software.amazon.awssdk.services.sesv2.model.Destination
-import software.amazon.awssdk.services.sesv2.model.EmailContent
-import software.amazon.awssdk.services.sesv2.model.Message
-import software.amazon.awssdk.services.sesv2.model.SendEmailRequest
-import software.amazon.awssdk.services.sesv2.model.SesV2Exception
 import uoslife.servermeeting.global.auth.dto.response.TokenResponse
-import uoslife.servermeeting.global.auth.jwt.TokenProvider
-import uoslife.servermeeting.meetingteam.util.UniqueCodeGenerator
-import uoslife.servermeeting.user.entity.User
-import uoslife.servermeeting.user.repository.UserRepository
-import uoslife.servermeeting.verification.dto.University
 import uoslife.servermeeting.verification.dto.request.VerificationCodeCheckRequest
 import uoslife.servermeeting.verification.dto.request.VerificationCodeSendRequest
 import uoslife.servermeeting.verification.dto.response.VerificationCodeSendResponse
-import uoslife.servermeeting.verification.entity.Verification
-import uoslife.servermeeting.verification.exception.EmailSendFailedException
-import uoslife.servermeeting.verification.exception.VerificationCodeNotMatchException
-import uoslife.servermeeting.verification.repository.VerificationRedisRepository
 
-@Service
-class VerificationService(
-    private val verificationRedisRepository: VerificationRedisRepository,
-    private val userRepository: UserRepository,
-    private val sesV2Client: SesV2Client,
-    private val uniqueCodeGenerator: UniqueCodeGenerator,
-    private val tokenProvider: TokenProvider,
-    @Value("\${cloud.aws.ses.from}") private val mailFrom: String
-) {
-    companion object {
-        const val SUBJECT: String = "[시대팅] 인증 메일 코드를 확인해주세요"
-        private val logger = LoggerFactory.getLogger(VerificationService::class.java)
-    }
-    @Transactional
+interface VerificationService {
     fun sendMail(
         verificationCodeSendRequest: VerificationCodeSendRequest
-    ): VerificationCodeSendResponse {
-        // verification을 DB에 이미 존재하면 재발급하고, 없으면 새로 생성함
-        val verification: Verification = getOrCreateVerification(verificationCodeSendRequest.email)
-
-        // Vertification 코드 생성 후 주입
-        val code: String = uniqueCodeGenerator.getUniqueVerificationCode()
-        verification.resetCode(code)
-
-        // Cache에 인증코드 저장
-        verificationRedisRepository.save(verification)
-
-        // 메일 내용 생성
-        val sendEmailRequest: SendEmailRequest =
-            createSendEmailRequest(verificationCodeSendRequest.email, code)
-
-        // 메일 보내기
-        try {
-            sesV2Client.sendEmail(sendEmailRequest)
-            logger.info(
-                "Verification mail is sended from $mailFrom to ${verificationCodeSendRequest.email}"
-            )
-        } catch (e: SesV2Exception) {
-            logger.error("Email Send Failed Exception")
-            logger.error(e.message)
-            throw EmailSendFailedException()
-        } catch (e: Exception) {
-            logger.error("Email Send Failed Exception")
-            logger.error(e.message)
-            throw EmailSendFailedException()
-        }
-
-        return VerificationCodeSendResponse(true)
-    }
-
-    private fun createSendEmailRequest(to: String, code: String): SendEmailRequest {
-        // 수신 이메일 설정
-        val destination: Destination = Destination.builder().toAddresses(to).build()
-
-        // 메일 내용 설정
-        val emailContent: EmailContent = createEmailContent(code)
-
-        val sendEmailRequest: SendEmailRequest =
-            SendEmailRequest.builder()
-                .fromEmailAddress(mailFrom)
-                .destination(destination)
-                .content(emailContent)
-                .build()
-
-        return sendEmailRequest
-    }
-
-    private fun createContent(content: String): Content {
-        return Content.builder().data(content).charset("UTF-8").build()
-    }
-
-    private fun createEmailContent(code: String): EmailContent {
-        val message: Message =
-            Message.builder()
-                .subject(createContent(SUBJECT))
-                .body(Body.builder().html(createContent(getVerificationMessage(code))).build())
-                .build()
-
-        return EmailContent.builder().simple(message).build()
-    }
-
-    private fun getOrCreateVerification(email: String): Verification {
-        val verification: Verification =
-            verificationRedisRepository.findByIdOrNull(email) ?: Verification.create(email)
-
-        return verification
-    }
-
-    private fun getVerificationMessage(code: String): String {
-        return String.format("<h3 style='text-align:cetner;'>인증코드: %s</h3>", code)
-    }
-
-    @Transactional
+    ): VerificationCodeSendResponse
     fun verifyVerificationCode(
         verificationCodeCheckRequest: VerificationCodeCheckRequest
-    ): TokenResponse {
-        // 유저 업데이트 하거나 새로 생성해주는 마스터 코드(000000)
-        if (verificationCodeCheckRequest.code.equals("000000")) {
-            val savedUser: User =
-                getOrCreateUser(
-                    verificationCodeCheckRequest.email,
-                    verificationCodeCheckRequest.university
-                )
-            return tokenProvider.getTokenByUser(savedUser)
-        }
-
-        // 리퀘스트 인증코드와 DB 인증코드가 같은지 체크
-        matchVerificationCode(verificationCodeCheckRequest.email, verificationCodeCheckRequest.code)
-
-        // 캐시에 인증코드 삭제
-        verificationRedisRepository.deleteById(verificationCodeCheckRequest.email)
-
-        // 유저 반환, 새로운 유저면 회원가입 후 반환
-        val savedUser: User =
-            getOrCreateUser(
-                verificationCodeCheckRequest.email,
-                verificationCodeCheckRequest.university
-            )
-
-        // token(accessToken, refreshToken) 발급
-        val tokenResponse: TokenResponse = tokenProvider.getTokenByUser(savedUser)
-
-        return tokenResponse
-    }
-
-    private fun matchVerificationCode(email: String, code: String): Unit {
-        val matchedVerification: Verification =
-            verificationRedisRepository.findByIdOrNull(email)
-                ?: throw VerificationCodeNotMatchException()
-        if (!matchedVerification.code.equals(code)) throw VerificationCodeNotMatchException()
-    }
-
-    private fun getOrCreateUser(email: String, university: University): User {
-        val user: User =
-            userRepository.findByEmail(email)
-                ?: userRepository.save(User.create(email = email, university = university))
-
-        return user
-    }
+    ): TokenResponse
 }
diff --git a/src/main/kotlin/uoslife/servermeeting/verification/service/VerificationServiceImpl.kt b/src/main/kotlin/uoslife/servermeeting/verification/service/VerificationServiceImpl.kt
@@ -0,0 +1,110 @@
+package uoslife.servermeeting.verification.service
+
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.data.repository.findByIdOrNull
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import software.amazon.awssdk.services.sesv2.model.SendEmailResponse
+import uoslife.servermeeting.global.auth.dto.response.TokenResponse
+import uoslife.servermeeting.global.auth.jwt.TokenProvider
+import uoslife.servermeeting.meetingteam.util.UniqueCodeGenerator
+import uoslife.servermeeting.user.entity.User
+import uoslife.servermeeting.user.repository.UserRepository
+import uoslife.servermeeting.verification.dto.University
+import uoslife.servermeeting.verification.dto.request.VerificationCodeCheckRequest
+import uoslife.servermeeting.verification.dto.request.VerificationCodeSendRequest
+import uoslife.servermeeting.verification.dto.response.VerificationCodeSendResponse
+import uoslife.servermeeting.verification.entity.Verification
+import uoslife.servermeeting.verification.exception.VerificationCodeNotMatchException
+import uoslife.servermeeting.verification.repository.VerificationRedisRepository
+
+@Service
+class VerificationServiceImpl(
+    private val verificationRedisRepository: VerificationRedisRepository,
+    private val userRepository: UserRepository,
+    private val emailService: EmailService,
+    private val uniqueCodeGenerator: UniqueCodeGenerator,
+    private val tokenProvider: TokenProvider,
+    @Value("\${cloud.aws.ses.from}") private val mailFrom: String
+) : VerificationService {
+    companion object {
+        private val logger = LoggerFactory.getLogger(VerificationServiceImpl::class.java)
+    }
+
+    @Transactional
+    override fun sendMail(
+        verificationCodeSendRequest: VerificationCodeSendRequest
+    ): VerificationCodeSendResponse {
+        // verification을 DB에 이미 존재하면 재발급하고, 없으면 새로 생성함
+        val verification: Verification = getOrCreateVerification(verificationCodeSendRequest.email)
+
+        // Vertification 코드 생성 후 주입
+        val code: String = uniqueCodeGenerator.getUniqueVerificationCode()
+        verification.resetCode(code)
+
+        // Cache에 인증코드 저장
+        verificationRedisRepository.save(verification)
+
+        // 메일 전송
+        val sendEmailResponse: SendEmailResponse =
+            emailService.sendEmail(verificationCodeSendRequest.email, code)
+
+        return VerificationCodeSendResponse(true)
+    }
+
+    private fun getOrCreateVerification(email: String): Verification {
+        val verification: Verification =
+            verificationRedisRepository.findByIdOrNull(email) ?: Verification.create(email)
+
+        return verification
+    }
+
+    @Transactional
+    override fun verifyVerificationCode(
+        verificationCodeCheckRequest: VerificationCodeCheckRequest
+    ): TokenResponse {
+        // 유저 업데이트 하거나 새로 생성해주는 마스터 코드(000000)
+        if (verificationCodeCheckRequest.code.equals("000000")) {
+            val savedUser: User =
+                getOrCreateUser(
+                    verificationCodeCheckRequest.email,
+                    verificationCodeCheckRequest.university
+                )
+            return tokenProvider.getTokenByUser(savedUser)
+        }
+
+        // 리퀘스트 인증코드와 DB 인증코드가 같은지 체크
+        matchVerificationCode(verificationCodeCheckRequest.email, verificationCodeCheckRequest.code)
+
+        // 캐시에 인증코드 삭제
+        verificationRedisRepository.deleteById(verificationCodeCheckRequest.email)
+
+        // 유저 반환, 새로운 유저면 회원가입 후 반환
+        val savedUser: User =
+            getOrCreateUser(
+                verificationCodeCheckRequest.email,
+                verificationCodeCheckRequest.university
+            )
+
+        // token(accessToken, refreshToken) 발급
+        val tokenResponse: TokenResponse = tokenProvider.getTokenByUser(savedUser)
+
+        return tokenResponse
+    }
+
+    private fun matchVerificationCode(email: String, code: String): Unit {
+        val matchedVerification: Verification =
+            verificationRedisRepository.findByIdOrNull(email)
+                ?: throw VerificationCodeNotMatchException()
+        if (!matchedVerification.code.equals(code)) throw VerificationCodeNotMatchException()
+    }
+
+    private fun getOrCreateUser(email: String, university: University): User {
+        val user: User =
+            userRepository.findByEmail(email)
+                ?: userRepository.save(User.create(email = email, university = university))
+
+        return user
+    }
+}