From cd8f5d01d4c9c9eceaf9ac063b1c8f2797c5977d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 13:11:20 +0900
Subject: [PATCH 1/3] =?UTF-8?q?CLAP-294=20Refactor:=20SendSsePort=EB=A1=9C?=
 =?UTF-8?q?=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F?=
 =?UTF-8?q?=20SendSseService=EB=A5=BC=20adapter=EB=A1=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #350
---
 .../infrastructure/sse/SendSseService.java    | 29 +++++++++++++++++++
 .../infrastructure/sse/SseAdapter.java        |  8 +----
 .../webhook/SendSsePort.java}                 |  4 +--
 .../service/webhook/SendSseService.java       | 29 -------------------
 4 files changed, 32 insertions(+), 38 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/outbound/infrastructure/sse/SendSseService.java
 rename src/main/java/clap/server/application/port/{inbound/notification/SendSseUsecase.java => outbound/webhook/SendSsePort.java} (55%)
 delete mode 100644 src/main/java/clap/server/application/service/webhook/SendSseService.java

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SendSseService.java b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SendSseService.java
new file mode 100644
index 00000000..5785653e
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SendSseService.java
@@ -0,0 +1,29 @@
+package clap.server.adapter.outbound.infrastructure.sse;
+
+import clap.server.adapter.inbound.web.dto.notification.request.SseRequest;
+import clap.server.adapter.outbound.infrastructure.sse.repository.EmitterRepository;
+import clap.server.application.port.outbound.webhook.SendSsePort;
+import clap.server.common.annotation.architecture.InfrastructureAdapter;
+import clap.server.exception.AdapterException;
+import clap.server.exception.code.NotificationErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+@InfrastructureAdapter
+@RequiredArgsConstructor
+public class SendSseService implements SendSsePort {
+
+    private final EmitterRepository emitterRepository;
+
+    @Override
+    public void send(SseRequest request) {
+        SseEmitter sseEmitter = emitterRepository.get(request.receiverId());
+        try {
+            sseEmitter.send(SseEmitter.event()
+                    .id(String.valueOf(request.receiverId()))
+                    .data(request));
+        } catch (Exception e) {
+            throw new AdapterException(NotificationErrorCode.SSE_SEND_FAILED);
+        }
+    }
+}
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java
index 3be28ab2..e0ebd34d 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java
@@ -2,14 +2,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.InfrastructureAdapter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 @InfrastructureAdapter
 @RequiredArgsConstructor
-public class SseAdapter implements LoadSsePort, CommandSsePort {
+public class SseAdapter implements CommandSsePort {
 
     private final EmitterRepository emitterRepository;
 
@@ -22,9 +21,4 @@ public void save(Long receiverId, SseEmitter emitter) {
     public void delete(Long receiverId) {
         emitterRepository.delete(receiverId);
     }
-
-    @Override
-    public SseEmitter get(Long receiverId) {
-        return emitterRepository.get(receiverId);
-    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java b/src/main/java/clap/server/application/port/outbound/webhook/SendSsePort.java
similarity index 55%
rename from src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java
rename to src/main/java/clap/server/application/port/outbound/webhook/SendSsePort.java
index 985dc2e2..5d38852e 100644
--- a/src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java
+++ b/src/main/java/clap/server/application/port/outbound/webhook/SendSsePort.java
@@ -1,8 +1,8 @@
-package clap.server.application.port.inbound.notification;
+package clap.server.application.port.outbound.webhook;
 
 import clap.server.adapter.inbound.web.dto.notification.request.SseRequest;
 
-public interface SendSseUsecase {
+public interface SendSsePort {
 
     void send(SseRequest request);
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendSseService.java b/src/main/java/clap/server/application/service/webhook/SendSseService.java
deleted file mode 100644
index a50bba72..00000000
--- a/src/main/java/clap/server/application/service/webhook/SendSseService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package clap.server.application.service.webhook;
-
-import clap.server.adapter.inbound.web.dto.notification.request.SseRequest;
-import clap.server.application.port.inbound.notification.SendSseUsecase;
-import clap.server.application.port.outbound.notification.LoadSsePort;
-import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.exception.ApplicationException;
-import clap.server.exception.code.NotificationErrorCode;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-@ApplicationService
-@RequiredArgsConstructor
-public class SendSseService implements SendSseUsecase {
-
-    private final LoadSsePort loadSsePort;
-
-    @Override
-    public void send(SseRequest request) {
-        SseEmitter sseEmitter = loadSsePort.get(request.receiverId());
-        try {
-            sseEmitter.send(SseEmitter.event()
-                    .id(String.valueOf(request.receiverId()))
-                    .data(request));
-        } catch (Exception e) {
-            throw new ApplicationException(NotificationErrorCode.SSE_SEND_FAILED);
-        }
-    }
-}

From 4022ced848c2f2041a379dbb4b146b9cf7887109 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 13:43:10 +0900
Subject: [PATCH 2/3] =?UTF-8?q?CLAP-294=20Refactor:=20agit=20post=20id=20?=
 =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=95=A0=ED=94=8C=EB=A6=AC=EC=BC=80=EC=9D=B4=EC=85=98=20?=
 =?UTF-8?q?=EB=8B=A8=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #350
---
 .../adapter/outbound/api/AgitClient.java       | 17 +++++++----------
 .../webhook/SendNotificationService.java       | 18 +++++++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
index 4938aeb1..6435e014 100644
--- a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
@@ -2,12 +2,10 @@
 
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
-import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
-import clap.server.application.service.task.UpdateTaskService;
 import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import clap.server.domain.model.task.Task;
-import clap.server.exception.ApplicationException;
+import clap.server.exception.AdapterException;
 import clap.server.exception.code.NotificationErrorCode;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -29,10 +27,9 @@ public class AgitClient implements SendAgitPort {
 
     private final AgitTemplateBuilder agitTemplateBuilder;
     private final ObjectMapper objectMapper;
-    private final TaskService taskService;
 
     @Override
-    public void sendAgit(PushNotificationTemplate request, Task task) {
+    public Long sendAgit(PushNotificationTemplate request, Task task) {
 
         HttpEntity<String> entity = agitTemplateBuilder.createAgitEntity(request, task);
 
@@ -40,20 +37,20 @@ public void sendAgit(PushNotificationTemplate request, Task task) {
         if (request.notificationType() == NotificationType.TASK_REQUESTED) {
             ResponseEntity<String> responseEntity = restTemplate.exchange(
                     AGIT_WEBHOOK_URL, HttpMethod.POST, entity, String.class);
-            updateAgitPostId(responseEntity, task);
+            return getAgitPostId(responseEntity);
         }
         else {
             restTemplate.exchange(AGIT_WEBHOOK_URL, HttpMethod.POST, entity, String.class);
+            return null;
         }
     }
 
-    private void updateAgitPostId(ResponseEntity<String> responseEntity, Task task) {
+    private Long getAgitPostId(ResponseEntity<String> responseEntity) {
         try {
             JsonNode jsonNode = objectMapper.readTree(responseEntity.getBody());
-            task.updateAgitPostId(jsonNode.get("id").asLong());
-            taskService.upsert(task);
+            return jsonNode.get("id").asLong();
         } catch (JsonProcessingException e) {
-            throw new ApplicationException(NotificationErrorCode.AGIT_SEND_FAILED);
+            throw new AdapterException(NotificationErrorCode.AGIT_SEND_FAILED);
         }
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
index 169f40c1..ab56dc40 100644
--- a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
@@ -3,7 +3,9 @@
 import clap.server.adapter.inbound.web.dto.notification.request.SseRequest;
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.outbound.notification.CommandNotificationPort;
+import clap.server.application.port.outbound.webhook.SendSsePort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.notification.Notification;
@@ -18,11 +20,12 @@
 @RequiredArgsConstructor
 public class SendNotificationService {
 
-    private final SendSseService sendSseService;
+    private final SendSsePort sendSsePort;
     private final SendAgitService sendAgitService;
     private final SendWebhookEmailService sendWebhookEmailService;
     private final SendKaKaoWorkService sendKaKaoWorkService;
     private final CommandNotificationPort commandNotificationPort;
+    private final TaskService taskService;
 
     @Async("notificationExecutor")
     public void sendPushNotification(Member receiver, NotificationType notificationType,
@@ -49,18 +52,18 @@ public void sendPushNotification(Member receiver, NotificationType notificationT
         });
 
         CompletableFuture<Void> sendSseFuture = CompletableFuture.runAsync(() -> {
-            sendSseService.send(sseRequest);
+            sendSsePort.send(sseRequest);
         });
 
         CompletableFuture<Void> sendEmailFuture = CompletableFuture.runAsync(() -> {
             if (receiver.getEmailNotificationEnabled()) {
-                sendWebhookEmailService.sendEmail(pushNotificationTemplate);
+                sendWebhookEmailService.send(pushNotificationTemplate);
             }
         });
 
         CompletableFuture<Void> sendKakaoWorkFuture = CompletableFuture.runAsync(() -> {
             if (receiver.getKakaoworkNotificationEnabled()) {
-                sendKaKaoWorkService.sendKaKaoWork(pushNotificationTemplate);
+                sendKaKaoWorkService.send(pushNotificationTemplate);
             }
         });
 
@@ -81,6 +84,11 @@ public void sendAgitNotification(NotificationType notificationType,
                 commenterName
         );
 
-        sendAgitService.sendAgit(pushNotificationTemplate, task);
+        if(notificationType.equals(NotificationType.TASK_REQUESTED)){
+            Long agitPostId = sendAgitService.sendAgit(pushNotificationTemplate, task);
+
+            task.updateAgitPostId(agitPostId);
+            taskService.upsert(task);
+        }
     }
 }

From 803c3d4a7bb1b63338a4c4ec11752bcbaa132a7f Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 13:57:00 +0900
Subject: [PATCH 3/3] =?UTF-8?q?CLAP-294=20Refactor:=20=EC=B6=94=EC=83=81?=
 =?UTF-8?q?=ED=99=94=20=ED=81=B4=EB=9E=98=EC=8A=A4=20NotificationSender?=
 =?UTF-8?q?=EB=A5=BC=20=EA=B5=AC=ED=98=84=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #350
---
 .../port/outbound/webhook/SendAgitPort.java        |  2 +-
 .../service/history/PostCommentService.java        |  6 +++---
 .../service/webhook/NotificationSender.java        |  7 +++++++
 .../service/webhook/SendAgitService.java           | 14 +++++++++++---
 .../service/webhook/SendKaKaoWorkService.java      |  8 ++++----
 .../service/webhook/SendNotificationService.java   | 11 ++---------
 .../service/webhook/SendWebhookEmailService.java   |  8 ++++----
 7 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/clap/server/application/service/webhook/NotificationSender.java

diff --git a/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java b/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
index 5d9005e4..9a0f0b3c 100644
--- a/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
+++ b/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
@@ -4,5 +4,5 @@
 import clap.server.domain.model.task.Task;
 
 public interface SendAgitPort {
-    void sendAgit(PushNotificationTemplate request, Task task);
+    Long sendAgit(PushNotificationTemplate request, Task task);
 }
diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java
index ec60baee..2e3b6a70 100644
--- a/src/main/java/clap/server/application/service/history/PostCommentService.java
+++ b/src/main/java/clap/server/application/service/history/PostCommentService.java
@@ -4,22 +4,22 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
-import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase;
-import clap.server.application.port.inbound.history.SaveCommentUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase;
+import clap.server.application.port.inbound.history.SaveCommentUsecase;
 import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandCommentPort;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
 import clap.server.application.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.policy.attachment.FilePathPolicy;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Comment;
 import clap.server.domain.model.task.Task;
 import clap.server.domain.model.task.TaskHistory;
+import clap.server.domain.policy.attachment.FilePathPolicy;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/clap/server/application/service/webhook/NotificationSender.java b/src/main/java/clap/server/application/service/webhook/NotificationSender.java
new file mode 100644
index 00000000..0591d323
--- /dev/null
+++ b/src/main/java/clap/server/application/service/webhook/NotificationSender.java
@@ -0,0 +1,7 @@
+package clap.server.application.service.webhook;
+
+import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
+
+public interface NotificationSender {
+    void send(PushNotificationTemplate template);
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/webhook/SendAgitService.java b/src/main/java/clap/server/application/service/webhook/SendAgitService.java
index 905e343a..d22a7f79 100644
--- a/src/main/java/clap/server/application/service/webhook/SendAgitService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendAgitService.java
@@ -1,18 +1,26 @@
 package clap.server.application.service.webhook;
 
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
+import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
-import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
 
-@ApplicationService
+@Service
 @RequiredArgsConstructor
 public class SendAgitService {
 
     private final SendAgitPort agitPort;
+    private final TaskService taskService;
 
     public void sendAgit(PushNotificationTemplate request, Task task) {
-        agitPort.sendAgit(request, task);
+        Long agitPostId = agitPort.sendAgit(request, task);
+
+        if (request.notificationType().equals(NotificationType.TASK_REQUESTED)) {
+            task.updateAgitPostId(agitPostId);
+            taskService.upsert(task);
+        }
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java b/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java
index 6a193093..a341c1d0 100644
--- a/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java
@@ -2,16 +2,16 @@
 
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
 import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
-import clap.server.common.annotation.architecture.ApplicationService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
 
-@ApplicationService
+@Service
 @RequiredArgsConstructor
-public class SendKaKaoWorkService {
+public class SendKaKaoWorkService implements NotificationSender {
 
     private final SendKaKaoWorkPort sendKaKaoWorkPort;
 
-    public void sendKaKaoWork(PushNotificationTemplate request) {
+    public void send(PushNotificationTemplate request) {
         sendKaKaoWorkPort.sendKakaoWork(request);
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
index ab56dc40..e28203fe 100644
--- a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
@@ -3,7 +3,6 @@
 import clap.server.adapter.inbound.web.dto.notification.request.SseRequest;
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
-import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.outbound.notification.CommandNotificationPort;
 import clap.server.application.port.outbound.webhook.SendSsePort;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -14,6 +13,7 @@
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.concurrent.CompletableFuture;
+
 import static clap.server.domain.model.notification.Notification.createTaskNotification;
 
 @ApplicationService
@@ -25,7 +25,6 @@ public class SendNotificationService {
     private final SendWebhookEmailService sendWebhookEmailService;
     private final SendKaKaoWorkService sendKaKaoWorkService;
     private final CommandNotificationPort commandNotificationPort;
-    private final TaskService taskService;
 
     @Async("notificationExecutor")
     public void sendPushNotification(Member receiver, NotificationType notificationType,
@@ -83,12 +82,6 @@ public void sendAgitNotification(NotificationType notificationType,
                 message,
                 commenterName
         );
-
-        if(notificationType.equals(NotificationType.TASK_REQUESTED)){
-            Long agitPostId = sendAgitService.sendAgit(pushNotificationTemplate, task);
-
-            task.updateAgitPostId(agitPostId);
-            taskService.upsert(task);
-        }
+        sendAgitService.sendAgit(pushNotificationTemplate, task);
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendWebhookEmailService.java b/src/main/java/clap/server/application/service/webhook/SendWebhookEmailService.java
index 1ea80790..ee7fd241 100644
--- a/src/main/java/clap/server/application/service/webhook/SendWebhookEmailService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendWebhookEmailService.java
@@ -2,16 +2,16 @@
 
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
 import clap.server.application.port.outbound.webhook.SendWebhookEmailPort;
-import clap.server.common.annotation.architecture.ApplicationService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
 
-@ApplicationService
+@Service
 @RequiredArgsConstructor
-public class SendWebhookEmailService {
+public class SendWebhookEmailService implements NotificationSender {
 
     private final SendWebhookEmailPort sendWebhookEmailPort;
 
-    public void sendEmail(PushNotificationTemplate request) {
+    public void send(PushNotificationTemplate request) {
         sendWebhookEmailPort.sendWebhookEmail(request);
     }
 }