feat: 이메일 전송 클라이언트 ses로 교체

soma-baekgu · Aug 25, 2024 · c65c0d7 · c65c0d7
1 parent c87d644
commit c65c0d7
Show file tree

Hide file tree

Showing 17 changed files with 128 additions and 62 deletions.
diff --git a/api/src/test/kotlin/com/backgu/amaker/api/mail/infra/FakeEmailSender.kt b/api/src/test/kotlin/com/backgu/amaker/api/mail/infra/FakeEmailSender.kt
diff --git a/infra/src/main/kotlin/com/backgu/amaker/infra/mail/constants/EmailConstants.kt b/infra/src/main/kotlin/com/backgu/amaker/infra/mail/constants/EmailConstants.kt
diff --git a/infra/src/main/kotlin/com/backgu/amaker/infra/mail/service/EmailEventService.kt b/infra/src/main/kotlin/com/backgu/amaker/infra/mail/service/EmailEventService.kt
diff --git a/notification/src/main/kotlin/com/backgu/amaker/notification/NotificationApplication.kt b/notification/src/main/kotlin/com/backgu/amaker/notification/NotificationApplication.kt
@@ -3,7 +3,6 @@ package com.backgu.amaker.notification
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.runApplication
-import org.springframework.context.annotation.ComponentScan
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories
 import org.springframework.scheduling.annotation.EnableAsync
@@ -13,7 +12,6 @@ import org.springframework.scheduling.annotation.EnableAsync
 @EntityScan(basePackages = ["com.backgu.amaker.infra"])
 @EnableJpaRepositories(basePackages = ["com.backgu.amaker.infra.jpa.user", "com.backgu.amaker.infra.jpa.workspace"])
 @EnableRedisRepositories(basePackages = ["com.backgu.amaker.infra.redis"])
-@ComponentScan("com.backgu.amaker.notification", "com.backgu.amaker.infra.mail")
 class NotificationApplication
 
 fun main(args: Array<String>) {

diff --git a/...fication/src/main/kotlin/com/backgu/amaker/notification/email/config/EMailSenderConfig.kt b/...fication/src/main/kotlin/com/backgu/amaker/notification/email/config/EMailSenderConfig.kt
@@ -0,0 +1,17 @@
+package com.backgu.amaker.notification.email.config
+
+import com.backgu.amaker.notification.email.service.EmailSender
+import com.backgu.amaker.notification.email.ses.config.AWSSESConfig
+import com.backgu.amaker.notification.email.ses.service.SESEmailService
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import software.amazon.awssdk.services.ses.SesClient
+
+@Configuration
+class EMailSenderConfig {
+    @Bean
+    fun mailSender(
+        sesClient: SesClient,
+        sesConfig: AWSSESConfig,
+    ): EmailSender = SESEmailService(sesClient, sesConfig)
+}
diff --git a/...ker/infra/mail/config/MailClientConfig.kt → ...on/email/gmail/config/MailClientConfig.kt b/...ker/infra/mail/config/MailClientConfig.kt → ...on/email/gmail/config/MailClientConfig.kt
@@ -1,4 +1,4 @@
-package com.backgu.amaker.infra.mail.config
+package com.backgu.amaker.notification.email.gmail.config
 
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Configuration

diff --git a/.../infra/mail/config/MailConstantsConfig.kt → ...email/gmail/config/MailConstantsConfig.kt b/.../infra/mail/config/MailConstantsConfig.kt → ...email/gmail/config/MailConstantsConfig.kt
@@ -1,4 +1,4 @@
-package com.backgu.amaker.infra.mail.config
+package com.backgu.amaker.notification.email.gmail.config
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration

diff --git a/...maker/infra/mail/infra/HtmlEmailSender.kt → ...tion/email/gmail/infra/HtmlEmailSender.kt b/...maker/infra/mail/infra/HtmlEmailSender.kt → ...tion/email/gmail/infra/HtmlEmailSender.kt
@@ -1,15 +1,13 @@
-package com.backgu.amaker.infra.mail.infra
+package com.backgu.amaker.notification.email.gmail.infra
 
-import com.backgu.amaker.application.notification.mail.service.EmailSender
+import com.backgu.amaker.notification.email.service.EmailSender
 import io.github.oshai.kotlinlogging.KotlinLogging
 import jakarta.mail.internet.MimeMessage
 import org.springframework.mail.javamail.JavaMailSender
 import org.springframework.mail.javamail.MimeMessageHelper
-import org.springframework.stereotype.Component
 
 private val logger = KotlinLogging.logger {}
 
-@Component
 class HtmlEmailSender(
     val mailSender: JavaMailSender,
 ) : EmailSender {

diff --git a/...il/infra/ThymeleafEmailTemplateBuilder.kt → ...il/infra/ThymeleafEmailTemplateBuilder.kt b/...il/infra/ThymeleafEmailTemplateBuilder.kt → ...il/infra/ThymeleafEmailTemplateBuilder.kt
@@ -1,6 +1,6 @@
-package com.backgu.amaker.infra.mail.infra
+package com.backgu.amaker.notification.email.gmail.infra
 
-import com.backgu.amaker.application.notification.mail.service.EmailTemplateBuilder
+import com.backgu.amaker.notification.email.service.EmailTemplateBuilder
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.springframework.stereotype.Component
 import org.thymeleaf.TemplateEngine

diff --git a/.../notification/mail/service/EmailSender.kt → ...notification/email/service/EmailSender.kt b/.../notification/mail/service/EmailSender.kt → ...notification/email/service/EmailSender.kt
@@ -1,4 +1,4 @@
-package com.backgu.amaker.application.notification.mail.service
+package com.backgu.amaker.notification.email.service
 
 interface EmailSender {
     fun sendEmail(

diff --git a/...tion/mail/service/EmailTemplateBuilder.kt → ...ion/email/service/EmailTemplateBuilder.kt b/...tion/mail/service/EmailTemplateBuilder.kt → ...ion/email/service/EmailTemplateBuilder.kt
@@ -1,4 +1,4 @@
-package com.backgu.amaker.application.notification.mail.service
+package com.backgu.amaker.notification.email.service
 
 interface EmailTemplateBuilder {
     fun buildEmailContent(

diff --git a/...n/email/templated/TemplateEmailHandler.kt → ...ion/email/service/TemplateEmailHandler.kt b/...n/email/templated/TemplateEmailHandler.kt → ...ion/email/service/TemplateEmailHandler.kt
@@ -1,7 +1,5 @@
-package com.backgu.amaker.notification.email.templated
+package com.backgu.amaker.notification.email.service
 
-import com.backgu.amaker.application.notification.mail.service.EmailSender
-import com.backgu.amaker.application.notification.mail.service.EmailTemplateBuilder
 import com.backgu.amaker.domain.notifiacation.method.TemplateEmailNotificationMethod
 import com.backgu.amaker.domain.user.User
 import org.springframework.stereotype.Service

diff --git a/notification/src/main/kotlin/com/backgu/amaker/notification/email/ses/config/AWSSESConfig.kt b/notification/src/main/kotlin/com/backgu/amaker/notification/email/ses/config/AWSSESConfig.kt
@@ -0,0 +1,26 @@
+package com.backgu.amaker.notification.email.ses.config
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.ses.SesClient
+
+@Configuration
+@ConfigurationProperties(prefix = "amazon.ses")
+class AWSSESConfig {
+    lateinit var accessKey: String
+    lateinit var secretKey: String
+    lateinit var region: String
+    lateinit var sender: String
+
+    @Bean
+    fun sesClient(): SesClient =
+        SesClient
+            .builder()
+            .region(Region.of(region))
+            .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
+            .build()
+}
diff --git a/...ation/src/main/kotlin/com/backgu/amaker/notification/email/ses/service/SESEmailService.kt b/...ation/src/main/kotlin/com/backgu/amaker/notification/email/ses/service/SESEmailService.kt
@@ -0,0 +1,73 @@
+package com.backgu.amaker.notification.email.ses.service
+
+import com.backgu.amaker.notification.email.service.EmailSender
+import com.backgu.amaker.notification.email.ses.config.AWSSESConfig
+import io.github.oshai.kotlinlogging.KotlinLogging
+import software.amazon.awssdk.services.ses.SesClient
+import software.amazon.awssdk.services.ses.model.Body
+import software.amazon.awssdk.services.ses.model.Content
+import software.amazon.awssdk.services.ses.model.Destination
+import software.amazon.awssdk.services.ses.model.Message
+import software.amazon.awssdk.services.ses.model.SendEmailRequest
+import software.amazon.awssdk.services.ses.model.SesException
+
+private val logger = KotlinLogging.logger {}
+
+class SESEmailService(
+    private val sesClient: SesClient,
+    private val sesConfig: AWSSESConfig,
+) : EmailSender {
+    override fun sendEmail(
+        emailAddress: String,
+        title: String,
+        body: String,
+    ) {
+        val destination: Destination =
+            Destination
+                .builder()
+                .toAddresses(emailAddress)
+                .build()
+
+        val subjectContent: Content =
+            Content
+                .builder()
+                .data(title)
+                .charset("UTF-8")
+                .build()
+
+        val bodyContent: Content =
+            Content
+                .builder()
+                .data(body)
+                .charset("UTF-8")
+                .build()
+
+        val body: Body =
+            Body
+                .builder()
+                .html(bodyContent)
+                .build()
+
+        val message: Message =
+            Message
+                .builder()
+                .subject(subjectContent)
+                .body(body)
+                .build()
+
+        val request: SendEmailRequest =
+            SendEmailRequest
+                .builder()
+                .destination(destination)
+                .message(message)
+                .source(sesConfig.sender)
+                .build()
+
+        try {
+            sesClient.sendEmail(request)
+        } catch (e: SesException) {
+            logger.error(e) { "Failed to send email to $emailAddress with title $title and body $body" }
+            throw e
+        }
+    }
+}
diff --git a/...om/backgu/amaker/notification/service/adapter/TemplateEmailUserFulfilledHandlerAdapter.kt b/...om/backgu/amaker/notification/service/adapter/TemplateEmailUserFulfilledHandlerAdapter.kt
@@ -4,7 +4,7 @@ import com.backgu.amaker.domain.notifiacation.Notification
 import com.backgu.amaker.domain.notifiacation.UserFulfilledNotification
 import com.backgu.amaker.domain.notifiacation.method.NotificationMethod
 import com.backgu.amaker.domain.notifiacation.method.TemplateEmailNotificationMethod
-import com.backgu.amaker.notification.email.templated.TemplateEmailHandler
+import com.backgu.amaker.notification.email.service.TemplateEmailHandler
 import org.springframework.stereotype.Component
 
 @Component

diff --git a/.../kotlin/com/backgu/amaker/notification/service/adapter/TemplateEmailUserHandlerAdapter.kt b/.../kotlin/com/backgu/amaker/notification/service/adapter/TemplateEmailUserHandlerAdapter.kt
@@ -5,7 +5,7 @@ import com.backgu.amaker.domain.notifiacation.Notification
 import com.backgu.amaker.domain.notifiacation.UserNotification
 import com.backgu.amaker.domain.notifiacation.method.NotificationMethod
 import com.backgu.amaker.domain.notifiacation.method.TemplateEmailNotificationMethod
-import com.backgu.amaker.notification.email.templated.TemplateEmailHandler
+import com.backgu.amaker.notification.email.service.TemplateEmailHandler
 import org.springframework.stereotype.Component
 
 @Component

diff --git a/...in/com/backgu/amaker/notification/service/adapter/TemplateEmailWorkspaceHandlerAdapter.kt b/...in/com/backgu/amaker/notification/service/adapter/TemplateEmailWorkspaceHandlerAdapter.kt
@@ -5,7 +5,7 @@ import com.backgu.amaker.domain.notifiacation.Notification
 import com.backgu.amaker.domain.notifiacation.WorkspaceNotification
 import com.backgu.amaker.domain.notifiacation.method.NotificationMethod
 import com.backgu.amaker.domain.notifiacation.method.TemplateEmailNotificationMethod
-import com.backgu.amaker.notification.email.templated.TemplateEmailHandler
+import com.backgu.amaker.notification.email.service.TemplateEmailHandler
 import org.springframework.stereotype.Component
 
 @Component