Merge pull request #131 from My-Medi/develop

hotfix : not send to user/expert because of key

Author: H4nnhoi

src/main/java/com/my_medi/api/common/dto/NotificationEventDto.java

@@ -14,13 +14,15 @@ public class NotificationEventDto {
     @Builder
     @AllArgsConstructor
     public static class UserNotificationEventDto{
+        private String username;
         private UserNotificationDto userNotificationDto;
     }
 
     @Data
     @Builder
     @AllArgsConstructor
     public static class ExpertNotificationEventDto{
+        private String username;
         private ExpertNotificationDto expertNotificationDto;
     }
 

src/main/java/com/my_medi/api/common/service/SseService.java

@@ -9,7 +9,7 @@ public interface SseService {
 
     SseEmitter connectExpert(String expertUsername);
 
-    void sendToUser(Long userId, Object notification);
+    void sendToUser(String userUsername, Object notification);
 
-    void sendToExpert(Long expertId, Object notification);
+    void sendToExpert(String expertUsername, Object notification);
 }

src/main/java/com/my_medi/api/common/service/SseServiceImpl.java

@@ -74,8 +74,8 @@ public SseEmitter connectExpert(String expertUsername) {
     }
 
     @Override
-    public void sendToUser(Long userId, Object notification) {
-        String key = "user_" + userId;
+    public void sendToUser(String userUsername, Object notification) {
+        String key = "user_" + userUsername;
         SseEmitter emitter = userEmitters.get(key);
 
         if (emitter != null) {
@@ -84,15 +84,15 @@ public void sendToUser(Long userId, Object notification) {
                         .name("notification")
                         .data(notification));
             } catch (IOException e) {
-                log.error("Failed to send notification to user {}", userId, e);
+                log.error("Failed to send notification to user {}", userUsername, e);
                 userEmitters.remove(key);
             }
         }
     }
 
     @Override
-    public void sendToExpert(Long expertId, Object notification) {
-        String key = "expert_" + expertId;
+    public void sendToExpert(String expertUsername, Object notification) {
+        String key = "expert_" + expertUsername;
         SseEmitter emitter = expertEmitters.get(key);
 
         if (emitter != null) {
@@ -101,7 +101,7 @@ public void sendToExpert(Long expertId, Object notification) {
                         .name("notification")
                         .data(notification));
             } catch (IOException e) {
-                log.error("Failed to send notification to expert {}", expertId, e);
+                log.error("Failed to send notification to expert {}", expertUsername, e);
                 expertEmitters.remove(key);
             }
         }

src/main/java/com/my_medi/api/consultation/service/ConsultationUseCase.java

@@ -64,6 +64,7 @@ public void approveConsultationRequestAndSendNotificationToUser(Expert expert, L
         //sse
         applicationEventPublisher.publishEvent(
                 new NotificationEventDto.UserNotificationEventDto(
+                        userNotification.getUser().getUsername(),
                         UserNotificationConverter.toUserNotification(userNotification)
                 )
         );
@@ -85,6 +86,7 @@ public void rejectConsultationRequestAndSendNotificationToUser(Expert expert, Lo
         //sse
         applicationEventPublisher.publishEvent(
                 new NotificationEventDto.UserNotificationEventDto(
+                        userNotification.getUser().getUsername(),
                         UserNotificationConverter.toUserNotification(userNotification)
                 )
         );
@@ -102,6 +104,7 @@ public Long sendConsultationRequestNotificationToExpert(User user, Long expertId
         //sse
         applicationEventPublisher.publishEvent(
                 new NotificationEventDto.ExpertNotificationEventDto(
+                        expertNotification.getExpert().getUsername(),
                         ExpertNotificationConverter.toExpertNotification(expertNotification)
                 )
         );

src/main/java/com/my_medi/api/expertNotification/service/ExpertNotificationEventListener.java

@@ -9,6 +9,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -27,7 +29,7 @@ public class ExpertNotificationEventListener {
     @TransactionalEventListener(phase = AFTER_COMMIT, fallbackExecution=true)
     public void handleSendingNotificationEvent(ExpertNotificationEventDto expertNotification) {
         sseService.sendToExpert(
-                expertNotification.getExpertNotificationDto().getExpertId(),
+                expertNotification.getUsername(),
                 expertNotification
         );
     }

src/main/java/com/my_medi/api/schedule/service/ScheduleUseCase.java

@@ -34,6 +34,7 @@ public Long registerScheduleAndSendNotificationToUser(
         //sse
         applicationEventPublisher.publishEvent(
                 new NotificationEventDto.UserNotificationEventDto(
+                        userNotification.getUser().getUsername(),
                         UserNotificationConverter.toUserNotification(userNotification)
                 )
         );

src/main/java/com/my_medi/api/userNotification/service/UserNotificationEventListener.java

@@ -7,15 +7,19 @@
 import com.my_medi.api.userNotification.mapper.UserNotificationConverter;
 import com.my_medi.domain.notification.entity.UserNotification;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.event.TransactionalEventListener;
 
 import static com.my_medi.api.userNotification.dto.UserNotificationResponseDto.*;
 import static org.springframework.transaction.event.TransactionPhase.AFTER_COMMIT;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class UserNotificationEventListener {
@@ -25,7 +29,7 @@ public class UserNotificationEventListener {
     @TransactionalEventListener(phase = AFTER_COMMIT, fallbackExecution=true)
     public void handleSendingNotificationEvent(UserNotificationEventDto userNotification){
         sseService.sendToUser(
-                userNotification.getUserNotificationDto().getUserId(),
+                userNotification.getUsername(),
                 userNotification
         );
     }