Merge pull request #351 from TaskFlow-CLAP/CLAP-297

CLAP-297 웹훅 관련 applicaton layer 리팩토링

Author: joowojr

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,31 +27,30 @@ 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);
 
         RestTemplate restTemplate = new RestTemplate();
         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);
         }
     }
 }

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);
+        }
+    }
+}

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);
-    }
 }

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);
 }

…inbound/notification/SendSseUsecase.java …n/port/outbound/webhook/SendSsePort.javasrc/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java renamed to src/main/java/clap/server/application/port/outbound/webhook/SendSsePort.java src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java renamed to 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);
 }

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;

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);
+}

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);
+        }
     }
 }

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);
     }
 }

src/main/java/clap/server/application/service/webhook/SendNotificationService.java

@@ -4,6 +4,7 @@
 import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 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;
@@ -12,13 +13,14 @@
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.concurrent.CompletableFuture;
+
 import static clap.server.domain.model.notification.Notification.createTaskNotification;
 
 @ApplicationService
 @RequiredArgsConstructor
 public class SendNotificationService {
 
-    private final SendSseService sendSseService;
+    private final SendSsePort sendSsePort;
     private final SendAgitService sendAgitService;
     private final SendWebhookEmailService sendWebhookEmailService;
     private final SendKaKaoWorkService sendKaKaoWorkService;
@@ -49,18 +51,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);
             }
         });
 
@@ -80,7 +82,6 @@ public void sendAgitNotification(NotificationType notificationType,
                 message,
                 commenterName
         );
-
         sendAgitService.sendAgit(pushNotificationTemplate, task);
     }
 }