fix: sse 구독 반환(응답) 값 수정 (#174)

Author: m-a-king

src/main/java/com/somemore/notification/handler/NotificationHandlerImpl.java

@@ -5,7 +5,7 @@
 import com.somemore.notification.repository.NotificationRepository;
 import com.somemore.sse.domain.SseEvent;
 import com.somemore.sse.domain.SseEventType;
-import com.somemore.sse.sender.SseSender;
+import com.somemore.sse.usecase.SseUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -14,13 +14,13 @@
 public class NotificationHandlerImpl implements NotificationHandler {
 
     private final NotificationRepository notificationRepository;
-    private final SseSender sseSender;
+    private final SseUseCase sseUseCase;
 
     @Override
     public void handle(Notification notification) {
         notificationRepository.save(notification);
 
-        sseSender.send(createSseEvent(notification));
+        sseUseCase.send(createSseEvent(notification));
     }
 
     private static SseEvent<NotificationResponseDto> createSseEvent(Notification notification) {

src/main/java/com/somemore/sse/controller/SseController.java

@@ -1,14 +1,14 @@
 package com.somemore.sse.controller;
 
 import com.somemore.auth.annotation.CurrentUser;
-import com.somemore.global.common.response.ApiResponse;
 import com.somemore.sse.usecase.SseUseCase;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.UUID;
 
@@ -22,10 +22,9 @@ public class SseController {
 
     @Secured({"ROLE_VOLUNTEER", "ROLE_CENTER"})
     @GetMapping("/subscribe")
-    public ApiResponse<String> subscribe(
+    public SseEmitter subscribe(
             @CurrentUser UUID userId) {
 
-        sseUseCase.subscribe(userId);
-        return ApiResponse.ok("SSE 연결 성공");
+        return sseUseCase.subscribe(userId);
     }
 }

src/main/java/com/somemore/sse/service/SseService.java

@@ -8,6 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.UUID;
 
@@ -20,9 +21,11 @@ public class SseService implements SseUseCase {
     private final SseSender sender;
 
     @Override
-    public void subscribe(UUID userId) {
-        subscriptionManager.subscribe(userId);
+    public SseEmitter subscribe(UUID userId) {
+        SseEmitter sseEmitter = subscriptionManager.subscribe(userId);
         sendInitMessage(userId);
+
+        return sseEmitter;
     }
 
     @Override

src/main/java/com/somemore/sse/subscriber/SseSubscriptionManager.java

@@ -1,8 +1,10 @@
 package com.somemore.sse.subscriber;
 
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
 import java.util.UUID;
 
 public interface SseSubscriptionManager {
 
-    void subscribe(UUID userId);
+    SseEmitter subscribe(UUID userId);
 }

src/main/java/com/somemore/sse/subscriber/SseSubscriptionManagerImpl.java

@@ -16,13 +16,14 @@ public class SseSubscriptionManagerImpl implements SseSubscriptionManager {
     private final EmitterRepository emitterRepository;
     private static final Long TIMEOUT_MILLI_SEC = 600_000L;
 
-    public void subscribe(UUID userId) {
-        initEmitter(createEmitterId(userId));
+    public SseEmitter subscribe(UUID userId) {
+        return initEmitter(createEmitterId(userId));
     }
 
-    private void initEmitter(String emitterId) {
+    private SseEmitter initEmitter(String emitterId) {
         SseEmitter emitter = emitterRepository.save(emitterId, new SseEmitter(TIMEOUT_MILLI_SEC));
         setupLifeCycle(emitter, emitterId);
+        return emitter;
     }
 
     private String createEmitterId(UUID id) {

src/main/java/com/somemore/sse/usecase/SseUseCase.java

@@ -1,12 +1,13 @@
 package com.somemore.sse.usecase;
 
 import com.somemore.sse.domain.SseEvent;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.UUID;
 
 public interface SseUseCase {
 
-    void subscribe(UUID userId);
+    SseEmitter subscribe(UUID userId);
 
     <T> void send(SseEvent<T> event);
 }