From dafc4944955aa557ebd336a0e48fcb779ee5327b Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 10:40:35 +0900
Subject: [PATCH 1/8] =?UTF-8?q?CLAP-230=20Refactor:=20=EB=B8=94=EB=A1=9D?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=ED=99=98=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EC=9C=A0=ED=8B=B8=EC=84=B1=EC=9D=98=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EC=9D=B4=EA=B8=B0=20=EB=95=8C=EB=AC=B8=EC=97=90=20com?=
 =?UTF-8?q?ponent=EB=A1=9C=20=EC=84=A0=EC=96=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 .../adapter/outbound/api/ObjectBlockService.java   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java b/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
index 9c8451f4..80d0911e 100644
--- a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
+++ b/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
@@ -1,23 +1,19 @@
 package clap.server.adapter.outbound.api;
 
 import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
-import clap.server.adapter.outbound.persistense.repository.notification.NotificationRepository;
-import clap.server.application.port.outbound.webhook.MakeObjectBlockPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-@PersistenceAdapter
+@Component
 @RequiredArgsConstructor
-public class ObjectBlockService implements MakeObjectBlockPort {
+public class ObjectBlockService {
 
     private final ObjectMapper objectMapper;
-    private final NotificationRepository notificationRepository;
 
-    @Override
     public String makeTaskRequestBlock(SendWebhookRequest request) {
         // Blocks 데이터 생성
         Object[] blocks = new Object[]{
@@ -90,7 +86,6 @@ public String makeTaskRequestBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    @Override
     public String makeNewProcessorBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
@@ -157,7 +152,6 @@ public String makeNewProcessorBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    @Override
     public String makeProcessorChangeBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
@@ -225,7 +219,6 @@ public String makeProcessorChangeBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    @Override
     public String makeCommentBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
@@ -303,7 +296,6 @@ public String makeCommentBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    @Override
     public String makeTaskStatusBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(

From 96853f5f693b20ad6590df16054bca34877a656a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 10:40:54 +0900
Subject: [PATCH 2/8] =?UTF-8?q?CLAP-230=20Remove:=20=EC=95=A0=ED=94=8C?=
 =?UTF-8?q?=EB=A6=AC=EC=BC=80=EC=9D=B4=EC=85=98=20=EC=84=9C=EB=B9=84?=
 =?UTF-8?q?=EC=8A=A4=EC=99=80=20=EA=B4=80=EB=A0=A8=EC=97=86=EB=8A=94=20Por?=
 =?UTF-8?q?t=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 .../outbound/webhook/MakeObjectBlockPort.java    | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java

diff --git a/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java b/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java
deleted file mode 100644
index dfcb3f61..00000000
--- a/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package clap.server.application.port.outbound.webhook;
-
-import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
-
-public interface MakeObjectBlockPort {
-
-    String makeTaskRequestBlock(SendWebhookRequest request);
-
-    String makeNewProcessorBlock(SendWebhookRequest request);
-
-    String makeProcessorChangeBlock(SendWebhookRequest request);
-
-    String makeCommentBlock(SendWebhookRequest request);
-
-    String makeTaskStatusBlock(SendWebhookRequest request);
-}

From 2cd2e88abbeaae2eabe4a9c97a0aa2b72714a28b Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 10:50:36 +0900
Subject: [PATCH 3/8] =?UTF-8?q?CLAP-230=20Refactor:=20kakao=20client?=
 =?UTF-8?q?=EC=99=80=20block=EC=9D=84=20=EC=83=9D=EC=84=B1=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=ED=81=B4=EB=9E=98=EC=8A=A4=EC=9D=98=20=EC=B1=85?=
 =?UTF-8?q?=EC=9E=84=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 .../adapter/outbound/api/KakaoWorkClient.java | 24 +++-----------
 ...ckService.java => ObjectBlockBuilder.java} | 33 +++++++++++++++----
 2 files changed, 31 insertions(+), 26 deletions(-)
 rename src/main/java/clap/server/adapter/outbound/api/{ObjectBlockService.java => ObjectBlockBuilder.java} (91%)

diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
index 27a05cfe..966760ed 100644
--- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
@@ -1,10 +1,9 @@
 package clap.server.adapter.outbound.api;
 
 import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
 import clap.server.common.annotation.architecture.ExternalApiAdapter;
-import clap.server.exception.ApplicationException;
+import clap.server.exception.AdapterException;
 import clap.server.exception.code.NotificationErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,29 +22,14 @@ public class KakaoWorkClient implements SendKaKaoWorkPort {
     @Value("${webhook.kakaowork.auth}")
     private String kakaworkAuth;
 
-    private final ObjectBlockService makeObjectBlock;
+    private final ObjectBlockBuilder objectBlockBuilder;
 
     @Override
     public void sendKakaoWork(SendWebhookRequest request) {
         RestTemplate restTemplate = new RestTemplate();
 
         // Payload 생성
-        String payload = null;
-        if (request.notificationType() == NotificationType.TASK_REQUESTED) {
-            payload = makeObjectBlock.makeTaskRequestBlock(request);
-        }
-        else if (request.notificationType() == NotificationType.PROCESSOR_ASSIGNED) {
-            payload = makeObjectBlock.makeNewProcessorBlock(request);
-        }
-        else if (request.notificationType() == NotificationType.PROCESSOR_CHANGED) {
-            payload = makeObjectBlock.makeProcessorChangeBlock(request);
-        }
-        else if (request.notificationType() == NotificationType.STATUS_SWITCHED) {
-            payload = makeObjectBlock.makeTaskStatusBlock(request);
-        }
-        else {
-            payload = makeObjectBlock.makeCommentBlock(request);
-        }
+        String payload = objectBlockBuilder.makeObjectBlock(request);
 
         // HTTP 요청 헤더 설정
         HttpHeaders headers = new HttpHeaders();
@@ -62,7 +46,7 @@ else if (request.notificationType() == NotificationType.STATUS_SWITCHED) {
             );
 
         } catch (Exception e) {
-            throw new ApplicationException(NotificationErrorCode.KAKAO_SEND_FAILED);
+            throw new AdapterException(NotificationErrorCode.KAKAO_SEND_FAILED);
         }
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java b/src/main/java/clap/server/adapter/outbound/api/ObjectBlockBuilder.java
similarity index 91%
rename from src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
rename to src/main/java/clap/server/adapter/outbound/api/ObjectBlockBuilder.java
index 80d0911e..007b23a2 100644
--- a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
+++ b/src/main/java/clap/server/adapter/outbound/api/ObjectBlockBuilder.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.outbound.api;
 
 import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
+import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
@@ -10,11 +11,31 @@
 
 @Component
 @RequiredArgsConstructor
-public class ObjectBlockService {
+public class ObjectBlockBuilder {
 
     private final ObjectMapper objectMapper;
 
-    public String makeTaskRequestBlock(SendWebhookRequest request) {
+    public String makeObjectBlock(SendWebhookRequest request){
+        String payload;
+        if (request.notificationType() == NotificationType.TASK_REQUESTED) {
+            payload = makeTaskRequestBlock(request);
+        }
+        else if (request.notificationType() == NotificationType.PROCESSOR_ASSIGNED) {
+            payload = makeNewProcessorBlock(request);
+        }
+        else if (request.notificationType() == NotificationType.PROCESSOR_CHANGED) {
+            payload = makeProcessorChangeBlock(request);
+        }
+        else if (request.notificationType() == NotificationType.STATUS_SWITCHED) {
+            payload = makeTaskStatusBlock(request);
+        }
+        else {
+            payload = makeCommentBlock(request);
+        }
+        return payload;
+    }
+
+    private String makeTaskRequestBlock(SendWebhookRequest request) {
         // Blocks 데이터 생성
         Object[] blocks = new Object[]{
                 // Header 블록
@@ -86,7 +107,7 @@ public String makeTaskRequestBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    public String makeNewProcessorBlock(SendWebhookRequest request) {
+    private String makeNewProcessorBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
@@ -152,7 +173,7 @@ public String makeNewProcessorBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    public String makeProcessorChangeBlock(SendWebhookRequest request) {
+    private String makeProcessorChangeBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
@@ -219,7 +240,7 @@ public String makeProcessorChangeBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    public String makeCommentBlock(SendWebhookRequest request) {
+    private String makeCommentBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
@@ -296,7 +317,7 @@ public String makeCommentBlock(SendWebhookRequest request) {
         return payload;
     }
 
-    public String makeTaskStatusBlock(SendWebhookRequest request) {
+    private String makeTaskStatusBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",

From d3e6ee79e11ced0cc756718cb7d8c6dee23da8da Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 10:51:02 +0900
Subject: [PATCH 4/8] =?UTF-8?q?CLAP-230=20Refactor:=20InfrastructureAdapte?=
 =?UTF-8?q?r=20=EC=84=A0=EC=96=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 .../sse/{SsePersistenceAdapter.java => SseAdapter.java}     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename src/main/java/clap/server/adapter/outbound/infrastructure/sse/{SsePersistenceAdapter.java => SseAdapter.java} (83%)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SsePersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java
similarity index 83%
rename from src/main/java/clap/server/adapter/outbound/infrastructure/sse/SsePersistenceAdapter.java
rename to src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java
index 18e04210..3be28ab2 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SsePersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java
@@ -3,13 +3,13 @@
 import clap.server.adapter.outbound.infrastructure.sse.repository.EmitterRepository;
 import clap.server.application.port.outbound.notification.CommandSsePort;
 import clap.server.application.port.outbound.notification.LoadSsePort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.InfrastructureAdapter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-@PersistenceAdapter
+@InfrastructureAdapter
 @RequiredArgsConstructor
-public class SsePersistenceAdapter implements LoadSsePort, CommandSsePort {
+public class SseAdapter implements LoadSsePort, CommandSsePort {
 
     private final EmitterRepository emitterRepository;
 

From 36b88c4b916cd133a73ab8ce4aba9045156f18c2 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 10:55:13 +0900
Subject: [PATCH 5/8] =?UTF-8?q?CLAP-230=20Rename:=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 ...ockBuilder.java => KakaoWorkBlockBuilder.java} |  2 +-
 .../adapter/outbound/api/KakaoWorkClient.java     |  4 ++--
 .../clap/server/exception/AdapterException.java   | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 rename src/main/java/clap/server/adapter/outbound/api/{ObjectBlockBuilder.java => KakaoWorkBlockBuilder.java} (99%)
 create mode 100644 src/main/java/clap/server/exception/AdapterException.java

diff --git a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockBuilder.java b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkBlockBuilder.java
similarity index 99%
rename from src/main/java/clap/server/adapter/outbound/api/ObjectBlockBuilder.java
rename to src/main/java/clap/server/adapter/outbound/api/KakaoWorkBlockBuilder.java
index 007b23a2..cb3aeeb4 100644
--- a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockBuilder.java
+++ b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkBlockBuilder.java
@@ -11,7 +11,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class ObjectBlockBuilder {
+public class KakaoWorkBlockBuilder {
 
     private final ObjectMapper objectMapper;
 
diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
index 966760ed..415b3be8 100644
--- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
@@ -22,14 +22,14 @@ public class KakaoWorkClient implements SendKaKaoWorkPort {
     @Value("${webhook.kakaowork.auth}")
     private String kakaworkAuth;
 
-    private final ObjectBlockBuilder objectBlockBuilder;
+    private final KakaoWorkBlockBuilder kakaoWorkBlockBuilder;
 
     @Override
     public void sendKakaoWork(SendWebhookRequest request) {
         RestTemplate restTemplate = new RestTemplate();
 
         // Payload 생성
-        String payload = objectBlockBuilder.makeObjectBlock(request);
+        String payload = kakaoWorkBlockBuilder.makeObjectBlock(request);
 
         // HTTP 요청 헤더 설정
         HttpHeaders headers = new HttpHeaders();
diff --git a/src/main/java/clap/server/exception/AdapterException.java b/src/main/java/clap/server/exception/AdapterException.java
new file mode 100644
index 00000000..be7b3973
--- /dev/null
+++ b/src/main/java/clap/server/exception/AdapterException.java
@@ -0,0 +1,15 @@
+package clap.server.exception;
+
+import clap.server.exception.code.BaseErrorCode;
+
+public class AdapterException extends BaseException {
+
+    public AdapterException(BaseErrorCode code) {
+        super(code);
+    }
+
+    public static AdapterException from(BaseErrorCode code) {
+        return new AdapterException(code);
+    }
+}
+

From 137bcbd30be079303bd7893334d7a02966a47cd1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 11:55:15 +0900
Subject: [PATCH 6/8] =?UTF-8?q?CLAP-230=20Refactor:=20email=20client?=
 =?UTF-8?q?=EC=99=80=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=ED=85=9C=ED=94=8C?=
 =?UTF-8?q?=EB=A6=BF=EC=9D=84=20=EC=83=9D=EC=84=B1=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EC=9D=98=20=EC=B1=85=EC=9E=84=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 .../adapter/outbound/api/EmailClient.java     | 85 +++----------------
 .../outbound/api/EmailTemplateBuilder.java    | 65 ++++++++++++++
 .../outbound/api/dto/EmailTemplate.java       |  8 ++
 .../port/outbound/webhook/SendEmailPort.java  |  2 +-
 .../service/webhook/SendEmailService.java     |  2 +-
 5 files changed, 89 insertions(+), 73 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java
 create mode 100644 src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java

diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
index 36d4f7cb..705cecf6 100644
--- a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
@@ -1,88 +1,37 @@
 package clap.server.adapter.outbound.api;
 
+import clap.server.adapter.outbound.api.dto.EmailTemplate;
 import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendEmailPort;
 import clap.server.common.annotation.architecture.ExternalApiAdapter;
-import clap.server.exception.ApplicationException;
+import clap.server.exception.AdapterException;
 import clap.server.exception.code.NotificationErrorCode;
 import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
-import org.thymeleaf.context.Context;
-import org.thymeleaf.spring6.SpringTemplateEngine;
 
 @ExternalApiAdapter
 @RequiredArgsConstructor
 public class EmailClient implements SendEmailPort {
 
-    private final SpringTemplateEngine templateEngine;
+    private final EmailTemplateBuilder emailTemplateBuilder;
     private final JavaMailSender mailSender;
 
     @Override
-    public void sendEmail(SendWebhookRequest request) {
+    public void sendWebhookEmail(SendWebhookRequest request) {
         try {
             MimeMessage mimeMessage = mailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-            String body;
-            Context context = new Context();
 
-            if (request.notificationType() == NotificationType.TASK_REQUESTED) {
-                helper.setTo(request.email());
-                helper.setSubject("[TaskFlow 알림] 신규 작업이 요청되었습니다.");
+            EmailTemplate template = emailTemplateBuilder.createWebhookTemplate(request);
+            helper.setTo(template.email());
+            helper.setSubject(template.subject());
+            helper.setText(template.body(), true);
 
-                context.setVariable("receiverName", request.senderName());
-                context.setVariable("title", request.taskName());
-
-                body = templateEngine.process("task-request", context);
-            } else if (request.notificationType() == NotificationType.STATUS_SWITCHED) {
-                helper.setTo(request.email());
-                helper.setSubject("[TaskFlow 알림] 작업 상태가 변경되었습니다.");
-
-                context.setVariable("status", request.message());
-                context.setVariable("title", request.taskName());
-
-                body = templateEngine.process("status-switch", context);
-            } else if (request.notificationType() == NotificationType.PROCESSOR_CHANGED) {
-                helper.setTo(request.email());
-                helper.setSubject("[TaskFlow 알림] 작업 담당자가 변경되었습니다.");
-
-                context.setVariable("processorName", request.message());
-                context.setVariable("title", request.taskName());
-
-                body = templateEngine.process("processor-change", context);
-            } else if (request.notificationType() == NotificationType.PROCESSOR_ASSIGNED) {
-                helper.setTo(request.email());
-                helper.setSubject("[TaskFlow 알림] 작업 담당자가 지정되었습니다.");
-
-                context.setVariable("processorName", request.message());
-                context.setVariable("title", request.taskName());
-
-                body = templateEngine.process("processor-assign", context);
-            } else if (request.notificationType() == NotificationType.INVITATION) {
-                helper.setTo(request.email());
-                helper.setSubject("[TaskFlow 초대] 회원가입을 환영합니다.");
-
-                context.setVariable("invitationLink", "https://example.com/reset-password"); //TODO:비밀번호 설정 링크로 변경 예정
-                context.setVariable("initialPassword", request.message());
-                context.setVariable("receiverName", request.senderName());
-
-                body = templateEngine.process("invitation", context);
-            } else {
-                helper.setTo(request.email());
-                helper.setSubject("[TaskFlow 알림] 댓글이 작성되었습니다.");
-
-                context.setVariable("comment", request.message());
-                context.setVariable("title", request.taskName());
-
-                body = templateEngine.process("comment", context);
-            }
-
-            helper.setText(body, true);
             mailSender.send(mimeMessage);
         } catch (Exception e) {
-            throw new ApplicationException(NotificationErrorCode.EMAIL_SEND_FAILED);
+            throw new AdapterException(NotificationErrorCode.EMAIL_SEND_FAILED);
         }
     }
 
@@ -91,20 +40,14 @@ public void sendInvitationEmail(String memberEmail, String receiverName, String
             MimeMessage mimeMessage = mailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
 
-            helper.setTo(memberEmail);
-            helper.setSubject("[TaskFlow 초대] 회원가입을 환영합니다.");
-
-            Context context = new Context();
-            context.setVariable("invitationLink", "https://example.com/reset-password"); // TODO: 비밀번호 재설정 링크로 변경
-            context.setVariable("initialPassword", initialPassword);
-            context.setVariable("receiverName", receiverName);
-
-            String body = templateEngine.process("invitation", context);
-            helper.setText(body, true);
+            EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword);
+            helper.setTo(template.email());
+            helper.setSubject(template.subject());
+            helper.setText(template.body(), true);
 
             mailSender.send(mimeMessage);
         } catch (Exception e) {
-            throw new ApplicationException(NotificationErrorCode.EMAIL_SEND_FAILED);
+            throw new AdapterException(NotificationErrorCode.EMAIL_SEND_FAILED);
         }
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java
new file mode 100644
index 00000000..be8c8744
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java
@@ -0,0 +1,65 @@
+package clap.server.adapter.outbound.api;
+
+import clap.server.adapter.outbound.api.dto.EmailTemplate;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.context.Context;
+import org.thymeleaf.spring6.SpringTemplateEngine;
+
+@Component
+@RequiredArgsConstructor
+public class EmailTemplateBuilder {
+    private final SpringTemplateEngine templateEngine;
+
+    public EmailTemplate createWebhookTemplate(SendWebhookRequest request) {
+        Context context = new Context();
+        String templateName = "";
+        String subject = "";
+        switch (request.notificationType()) {
+            case TASK_REQUESTED:
+                templateName = "task-request";
+                subject = "[TaskFlow 알림] 신규 작업이 요청되었습니다.";
+                context.setVariable("receiverName", request.senderName());
+                context.setVariable("title", request.taskName());
+                break;
+            case STATUS_SWITCHED:
+                templateName = "status-switched";
+                subject = "[TaskFlow 알림] 작업 상태가 변경되었습니다.";
+                context.setVariable("receiverName", request.senderName());
+                context.setVariable("title", request.taskName());
+                break;
+            case PROCESSOR_CHANGED:
+                templateName = "processor-changed";
+                subject = "[TaskFlow 알림] 작업 담당자가 변경되었습니다.";
+                context.setVariable("processorName", request.message());
+                context.setVariable("title", request.taskName());
+                break;
+            case PROCESSOR_ASSIGNED:
+                templateName = "processor-assigned";
+                subject = "[TaskFlow 알림] 작업 담당자가 지정되었습니다.";
+                context.setVariable("processorName", request.message());
+                context.setVariable("title", request.taskName());
+                break;
+            case COMMENT:
+                subject = "[TaskFlow 알림] 댓글이 작성되었습니다.";
+                context.setVariable("comment", request.message());
+                context.setVariable("title", request.taskName());
+                break;
+
+        }
+        String body = templateEngine.process(templateName, context);
+        return new EmailTemplate(request.email(), subject, body);
+    }
+
+    public EmailTemplate createInvitationTemplate(String receiver, String receiverName, String initialPassword) {
+        Context context = new Context();
+        String templateName = "invitation";
+        String subject = "[TaskFlow 초대] 회원가입을 환영합니다.";
+        context.setVariable("invitationLink", "https://example.com/reset-password"); //TODO:비밀번호 설정 링크로 변경 예정
+        context.setVariable("initialPassword", initialPassword);
+        context.setVariable("receiverName", receiverName);
+        String body = templateEngine.process(templateName, context);
+        return new EmailTemplate(receiver, subject, body);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java b/src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java
new file mode 100644
index 00000000..d5215de2
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java
@@ -0,0 +1,8 @@
+package clap.server.adapter.outbound.api.dto;
+
+public record EmailTemplate(
+        String email,
+        String subject,
+        String body
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/outbound/webhook/SendEmailPort.java b/src/main/java/clap/server/application/port/outbound/webhook/SendEmailPort.java
index 0a3b7b6c..e9f9ce26 100644
--- a/src/main/java/clap/server/application/port/outbound/webhook/SendEmailPort.java
+++ b/src/main/java/clap/server/application/port/outbound/webhook/SendEmailPort.java
@@ -4,7 +4,7 @@
 
 public interface SendEmailPort {
 
-    void sendEmail(SendWebhookRequest request);
+    void sendWebhookEmail(SendWebhookRequest request);
 
     void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword);
 
diff --git a/src/main/java/clap/server/application/service/webhook/SendEmailService.java b/src/main/java/clap/server/application/service/webhook/SendEmailService.java
index 72f93712..4f4b1035 100644
--- a/src/main/java/clap/server/application/service/webhook/SendEmailService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendEmailService.java
@@ -12,6 +12,6 @@ public class SendEmailService {
     private final SendEmailPort port;
 
     public void sendEmail(SendWebhookRequest request) {
-        port.sendEmail(request);
+        port.sendWebhookEmail(request);
     }
 }

From 4cbe3a434add6afaf1be9dfe37b787f2e6769e05 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 11:57:59 +0900
Subject: [PATCH 7/8] =?UTF-8?q?CLAP-230=20Refactor:=20=EB=B9=A0=EC=A7=84?=
 =?UTF-8?q?=20=EC=95=A0=EB=84=88=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 src/main/java/clap/server/adapter/outbound/api/EmailClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
index 705cecf6..2ceea26e 100644
--- a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
@@ -35,6 +35,7 @@ public void sendWebhookEmail(SendWebhookRequest request) {
         }
     }
 
+    @Override
     public void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword) {
         try {
             MimeMessage mimeMessage = mailSender.createMimeMessage();

From 8048d19f6c0464566b6c9ca6dd1c3e35481d1527 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 12:06:56 +0900
Subject: [PATCH 8/8] =?UTF-8?q?CLAP-230=20Fix:=20=EC=9E=98=EB=AA=BB?=
 =?UTF-8?q?=EB=90=9C=20=EC=97=90=EB=9F=AC=20=EC=BD=94=EB=93=9C=20=EB=A7=A4?=
 =?UTF-8?q?=ED=95=91=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #242
---
 .../adapter/inbound/web/example/ErrorExampleController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java b/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java
index 8658dd86..ce90801e 100644
--- a/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java
@@ -29,7 +29,7 @@ public void getMemberErrorCode() {}
     @GetMapping("/auth")
     @DevelopOnlyApi
     @Operation(summary = "인증 및 인가 관련 에러 코드 나열")
-    @ApiErrorCodes(MemberErrorCode.class)
+    @ApiErrorCodes(AuthErrorCode.class)
     public void getAuthErrorCode() {}
 
     @GetMapping("/task")