#80 Feat: add user in notification enroll

kjiyun · kjiyun · commit 21c5a1bdcada · 2025-02-11T16:26:18.000+09:00
diff --git a/src/main/java/com/memesphere/domain/chat/service/ChatService.java b/src/main/java/com/memesphere/domain/chat/service/ChatService.java
@@ -82,7 +82,6 @@ public String postChatLike(Long chat_id, Long user_id) {
 
         // 사용자가 좋아요 눌렀는지 확인
         Optional<ChatLike> existingLike = chatLikeRepository.findByChatAndUser(chat, user);
-        System.out.println("좋아요" + existingLike.isPresent());
 
         if (existingLike.isPresent()) {
             chatLikeRepository.delete(existingLike.get());
diff --git a/src/main/java/com/memesphere/domain/notification/controller/CoinNotificationController.java b/src/main/java/com/memesphere/domain/notification/controller/CoinNotificationController.java
@@ -6,9 +6,11 @@
 import com.memesphere.domain.notification.dto.response.NotificationListResponse;
 import com.memesphere.domain.notification.dto.response.NotificationResponse;
 import com.memesphere.domain.notification.service.CoinNotificationService;
+import com.memesphere.global.jwt.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 @Tag(name="알림", description = "알림 관련 API")
@@ -65,8 +67,9 @@ public ApiResponse<NotificationListResponse> getNotificationList() {
                     - "is_rising": 상승(true) 또는 하락(false)
                     - "is_on": 알림 on(true) 또는 off(false)
                     ```""")
-    public ApiResponse<NotificationResponse> postNotification(@RequestBody NotificationRequest request) {
-        return ApiResponse.onSuccess(coinNotificationService.addNotification(request));
+    public ApiResponse<NotificationResponse> postNotification(@RequestBody NotificationRequest request,
+                                                              @AuthenticationPrincipal CustomUserDetails customUserDetails) {
+        return ApiResponse.onSuccess(coinNotificationService.addNotification(request, customUserDetails.getUser()));
     }
 
     @PatchMapping("/{notification-id}")
diff --git a/src/main/java/com/memesphere/domain/notification/converter/NotificationConverter.java b/src/main/java/com/memesphere/domain/notification/converter/NotificationConverter.java
@@ -5,17 +5,19 @@
 import com.memesphere.domain.notification.dto.response.NotificationListResponse;
 import com.memesphere.domain.notification.dto.response.NotificationResponse;
 import com.memesphere.domain.notification.entity.Notification;
+import com.memesphere.domain.user.entity.User;
 
 import java.util.List;
 
 public class NotificationConverter {
 
-    public static Notification toNotification(NotificationRequest notificationRequest, MemeCoin memeCoin) {
+    public static Notification toNotification(NotificationRequest notificationRequest, MemeCoin memeCoin, User user) {
         return Notification.builder()
                 .memeCoin(memeCoin)
                 .volatility(notificationRequest.getVolatility())
                 .stTime(notificationRequest.getStTime())
                 .isRising(notificationRequest.getIsRising())
+                .user(user)
                 .build();
     }
 
diff --git a/src/main/java/com/memesphere/domain/notification/repository/EmitterRepository.java b/src/main/java/com/memesphere/domain/notification/repository/EmitterRepository.java
@@ -1,5 +1,6 @@
 package com.memesphere.domain.notification.repository;
 
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 import org.yaml.snakeyaml.emitter.Emitter;
 
@@ -11,4 +12,5 @@ public interface EmitterRepository {
     void deleteById(String emitterId);
     Map<String, SseEmitter> findAllEmitterStartWithByUserId(String UserId);
     Map<String, Object> findAllEventCacheStartWithByUserId(String UserId);
+    void saveEventCache(String emitterId, Object event);
 }
diff --git a/src/main/java/com/memesphere/domain/notification/repository/EmitterRepositoryImpl.java b/src/main/java/com/memesphere/domain/notification/repository/EmitterRepositoryImpl.java
@@ -39,4 +39,9 @@ public Map<String, Object> findAllEventCacheStartWithByUserId(String UserId) {
                 .filter(entry -> entry.getKey().startsWith(UserId))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
+
+    @Override
+    public void saveEventCache(String emitterId, Object event) {
+        eventCache.put(emitterId, event);
+    }
 }
diff --git a/src/main/java/com/memesphere/domain/notification/service/CoinNotificationService.java b/src/main/java/com/memesphere/domain/notification/service/CoinNotificationService.java
@@ -3,10 +3,11 @@
 import com.memesphere.domain.notification.dto.request.NotificationRequest;
 import com.memesphere.domain.notification.dto.response.NotificationListResponse;
 import com.memesphere.domain.notification.dto.response.NotificationResponse;
+import com.memesphere.domain.user.entity.User;
 
 public interface CoinNotificationService {
     NotificationListResponse findNotificationList();
-    NotificationResponse addNotification(NotificationRequest notificationRequest);
+    NotificationResponse addNotification(NotificationRequest notificationRequest, User user);
     String modifyNotification(Long notificationId);
     NotificationListResponse removeNotification(Long notificationId);
 }
diff --git a/src/main/java/com/memesphere/domain/notification/service/CoinNotificationServiceImpl.java b/src/main/java/com/memesphere/domain/notification/service/CoinNotificationServiceImpl.java
@@ -3,6 +3,7 @@
 import com.memesphere.domain.memecoin.entity.MemeCoin;
 import com.memesphere.domain.memecoin.repository.MemeCoinRepository;
 import com.memesphere.domain.notification.entity.Notification;
+import com.memesphere.domain.user.entity.User;
 import com.memesphere.global.apipayload.code.status.ErrorStatus;
 import com.memesphere.global.apipayload.exception.GeneralException;
 import com.memesphere.domain.notification.converter.NotificationConverter;
@@ -44,11 +45,11 @@ public NotificationListResponse findNotificationList() {
 
     // 알림 등록 API
     @Override
-    public NotificationResponse addNotification(NotificationRequest notificationRequest) {
+    public NotificationResponse addNotification(NotificationRequest notificationRequest, User user) {
         MemeCoin memeCoin = memeCoinRepository.findByName(notificationRequest.getName())
                 .orElseThrow(() -> new GeneralException(ErrorStatus.MEMECOIN_NOT_FOUND));
 
-        Notification notification = NotificationConverter.toNotification(notificationRequest, memeCoin);
+        Notification notification = NotificationConverter.toNotification(notificationRequest, memeCoin, user);
         notificationRepository.save(notification);
 
         NotificationResponse notificationResponse = NotificationConverter.toNotificationCreateResponse(notification, memeCoin);
diff --git a/src/main/java/com/memesphere/domain/notification/service/PushNotificationService.java b/src/main/java/com/memesphere/domain/notification/service/PushNotificationService.java
@@ -1,8 +1,9 @@
 package com.memesphere.domain.notification.service;
 
+import com.memesphere.domain.notification.entity.Notification;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 public interface PushNotificationService {
     SseEmitter subscribe(Long userId, String lastEventId);
-    void send(Long userId);
+    void send(Notification notification, Long userId);
 }
diff --git a/src/main/java/com/memesphere/domain/notification/service/PushNotificationServiceImpl.java b/src/main/java/com/memesphere/domain/notification/service/PushNotificationServiceImpl.java
@@ -53,43 +53,27 @@ public SseEmitter subscribe(Long userId, String lastEventId) {
         // 최초 연결 더미데이터가 없으면 503 에러가 나므로 더미 데이터 생성
         sendToClient(emitter, emitterId, "EventStream Created. [userId=" + userId + "]");
 
-        send(userId);
-
+        // 클라이언트가 미수신한 Event 목록이 존재할 경우 전송하여 Event 유실을 예방
         if (!lastEventId.isEmpty()) {
             Map<String, Object> events = emitterRepository.findAllEventCacheStartWithByUserId(String.valueOf(userId));
             events.entrySet().stream()
                     .filter(entry -> lastEventId.compareTo(entry.getKey()) < 0)
                     .forEach(entry -> sendToClient(emitter, entry.getKey(), entry.getValue()));
         }
-        return emitter;
-    }
-
-    @Override
-    public void send(Long userId) {
 
         List<Notification> notifications = notificationRepository.findAllByUserId(userId); // 사용자가 등록한 알림 전부 가져오기
 
-        if (notifications.isEmpty()) {
-            return; // 저장된 알림이 없는 경우 아무것도 반환하지 않음
-        }
-
         // 변동성을 초과하는 알림 필터링
         List<Notification> filteredNotifications = notifications.stream()
                 .filter(notification -> isVolatilityExceeded(notification))
                 .collect(Collectors.toList());
 
-        if (filteredNotifications.isEmpty()) {
-            return; // 기준을 충족하는 변동성이 없으면 전송하지 않음
-        }
-
-        // 실시간 알림 전송
-        Map<String, SseEmitter> sseEmitters = emitterRepository.findAllEmitterStartWithByUserId(String.valueOf(userId));
-
-        sseEmitters.forEach((key, emitter) -> {
-            filteredNotifications.forEach(notification -> {
-                sendToClient(emitter, key, "변동성 초과 알림");
+        if (!filteredNotifications.isEmpty()) {
+            notifications.forEach(notification -> {
+                send(notification, userId);
             });
-        });
+        }
+        return emitter;
     }
 
     private void sendToClient(SseEmitter emitter, String emitterId, Object data) {
@@ -106,6 +90,18 @@ private void sendToClient(SseEmitter emitter, String emitterId, Object data) {
         }
     }
 
+    @Override
+    public void send(Notification notification, Long userId) {
+
+        // 실시간 알림 전송 - 로그인 한 유저의 SseEmitter 모두 가져오기
+        Map<String, SseEmitter> sseEmitters = emitterRepository.findAllEmitterStartWithByUserId(String.valueOf(userId));
+
+        sseEmitters.forEach((key, emitter) -> {
+                emitterRepository.saveEventCache(key, notification);
+                sendToClient(emitter, key, NotificationConverter.toNotificationCreateResponse(notification, notification.getMemeCoin()));
+        });
+    }
+
     private boolean isVolatilityExceeded(Notification notification) {
         MemeCoin memeCoin = notification.getMemeCoin();
         if (memeCoin == null) {
@@ -120,7 +116,6 @@ private boolean isVolatilityExceeded(Notification notification) {
         Integer count = notification.getStTime() / 10; //몇 번 가져올 것인지 결정
         Pageable pageable = (Pageable) PageRequest.of(0, count, Sort.by(Sort.Direction.DESC, "createdAt"));
         List<ChartData> lastNData = chartDataRepository.findByMemeCoinOrderByRecordedTimeDesc(memeCoin, pageable);
-        System.out.println("lastNData: " + lastNData + ", count: " + lastNData.size());
 
         if (lastNData.size() < count) {
             return false; // 비교할 데이터가 부족하면 알림을 보내지 않음

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,9 @@ public Map<String, Object> findAllEventCacheStartWithByUserId(String UserId) {`
`39`	`39`	`.filter(entry -> entry.getKey().startsWith(UserId))`
`40`	`40`	`.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ @Override`
	`44`	`+ public void saveEventCache(String emitterId, Object event) {`
	`45`	`+ eventCache.put(emitterId, event);`
	`46`	`+ }`
`42`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package com.memesphere.domain.notification.service;`
`2`	`2`
	`3`	`+import com.memesphere.domain.notification.entity.Notification;`
`3`	`4`	`import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;`
`4`	`5`
`5`	`6`	`public interface PushNotificationService {`
`6`	`7`	`SseEmitter subscribe(Long userId, String lastEventId);`
`7`		`- void send(Long userId);`
	`8`	`+ void send(Notification notification, Long userId);`
`8`	`9`	`}`