Merge pull request #129 from TeamMiso/develop

🔀 :: master 브랜치로 머지
TeamMiso · Apr 29, 2024 · bd75624 · bd75624
2 parents 0d2ce16 + af8cfd8
commit bd75624
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,6 +75,9 @@ dependencies {
 
 	// web_flux
 	implementation(Dependencies.WEB_FLUX)
+
+	// thymeleaf
+	implementation(Dependencies.THYMELEAF)
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -42,4 +42,7 @@ object Dependencies {
 
     // web_flux
     const val WEB_FLUX = "org.springframework.boot:spring-boot-starter-webflux"
+
+    // thymeleaf
+    const val THYMELEAF = "org.springframework.boot:spring-boot-starter-thymeleaf"
 }
diff --git a/src/main/kotlin/andreas311/miso/thirdparty/email/EmailSendAdapter.kt b/src/main/kotlin/andreas311/miso/thirdparty/email/EmailSendAdapter.kt
@@ -7,46 +7,31 @@ import andreas311.miso.domain.email.domain.Email
 import org.springframework.mail.javamail.JavaMailSender
 import org.springframework.mail.javamail.MimeMessageHelper
 import org.springframework.stereotype.Component
+import org.thymeleaf.context.Context
+import org.thymeleaf.spring5.SpringTemplateEngine
 import java.util.*
 import javax.mail.MessagingException
 
 @Component
 class EmailSendAdapter(
     private val javaMailSender: JavaMailSender,
-    private val commandEmailPort: CommandEmailPort
+    private val commandEmailPort: CommandEmailPort,
+    private val springTemplateEngine: SpringTemplateEngine
 ) : EmailSendPort {
     override fun sendEmailAuthKey(email: String) {
         val randomKey = createRandomKey()
         sendAuthEmail(email, randomKey)
     }
 
     private fun sendAuthEmail(email: String, randomKey: String) {
-        val subject = "MISO 인증번호가 도착했습니다!"
-        val content = buildEmailContent(randomKey)
-
         try {
-            sendEmail(email, subject, content)
+            sendEmail(email, randomKey)
         } catch (e: MessagingException) {
             throw EmailSendFailedException()
         }
         saveEmailToRepository(email, randomKey)
     }
 
-    private fun buildEmailContent(randomKey: String): String {
-        return """
-            <div style='margin:100px;'>
-            <h1> 안녕하세요 MISO 입니다! </h1>
-            <br>
-            <h2><p>아래 인증번호를 인증 페이지로 돌아가 입력해 주세요. 이용해 주셔서 감사합니다!<p></h2>
-            <br>
-            <div align='center' style='border:1px solid black; font-family:verdana';>
-            <h3 style='color:blue;'>인증번호는 다음과 같습니다!</h3>
-            <div style='font-size:130%'>
-            인증번호 : <strong>$randomKey</strong><div><br/> 
-            </div>
-        """.trimIndent()
-    }
-
     private fun saveEmailToRepository(email: String, randomKey: String) {
         commandEmailPort.saveEmail(
             Email(
@@ -58,12 +43,13 @@ class EmailSendAdapter(
         )
     }
 
-    private fun sendEmail(email: String, subject: String, content: String) {
+    private fun sendEmail(email: String, randomKey: String) {
         val mimeMessage = javaMailSender.createMimeMessage()
         val helper = MimeMessageHelper(mimeMessage, true, "utf-8")
+        val mailTemplate = createMailTemplate(randomKey)
         helper.setTo(email)
-        helper.setSubject(subject)
-        helper.setText(content, true)
+        helper.setSubject("MISO 인증번호가 도착했습니다!")
+        helper.setText(mailTemplate, true)
         javaMailSender.send(mimeMessage)
     }
 
@@ -74,4 +60,15 @@ class EmailSendAdapter(
 
         return randomKey.toString()
     }
+
+    private fun createMailTemplate(randomKey: String): String {
+        val content = Context()
+        val randomKey = randomKey
+        content.setVariables(
+            mapOf(
+                "randomKey" to randomKey
+            )
+        )
+        return springTemplateEngine.process("mailTemplate", content)
+    }
 }
diff --git a/src/main/resources/templates/mailTemplate.html b/src/main/resources/templates/mailTemplate.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+</head>
+<body style="margin: 0; padding: 0">
+<div
+        style="
+        background-color: #25d07d;
+        width: 100%;
+        height: 1rem;
+        position: absolute;
+      "
+/>
+<div style="margin: 0 1.5rem">
+    <div style="margin-top: 2.5rem">
+        <img
+                src="https://project-miso.s3.ap-northeast-2.amazonaws.com/fcm/%EB%AF%B8%EC%86%8C+%EC%95%84%EC%9D%B4%EC%BD%98.png"
+                alt="miso_icon"
+                style="width: 2.5rem"
+        />
+        <h1 style="font-size: 1.5625rem; line-height: 160%; margin: 0">
+            미소 이메일 인증 번호
+        </h1>
+    </div>
+    <div
+            style="
+          margin-top: 1.5rem;
+          color: #595959;
+          font-size: 1.25rem;
+          font-weight: 400;
+        "
+    >
+        안녕하세요 MISO에요! <br />
+        미소를 이용해 주셔서 감사해요 :) <br />
+        위 4자리 숫자를 입력하시면 회원가입 절차가 완료돼요!
+    </div>
+    <div
+            style="
+          width: 100%;
+          border-radius: 0.5rem;
+          padding: 1rem;
+          box-sizing: border-box;
+          background-color: #f2f2f2;
+          margin-top: 1.5rem;
+          text-align: center;
+        "
+    >
+            <div style="
+            margin: 0;
+            color: #25d07d;
+            line-height: 140%;
+            font-size: 2.875rem;
+            font-weight: 600;
+          "
+                    th:text="${randomKey}"
+            >
+            </div>
+            <div style="font-size: 1rem; color: #bfbfbf; line-height: 160%"
+            >환경을 웃음으로 바꾸다, MISO</div
+            >
+
+    </div>
+</div>
+</body>
+</html>