Merge develop in to master and delete develop branch

src/main/java/com/chat/yourway/listener/StompConnectionListener.java

@@ -4,6 +4,7 @@
 import static com.chat.yourway.model.event.EventType.ONLINE;
 
 import com.chat.yourway.service.interfaces.ChatNotificationService;
+import com.chat.yourway.service.interfaces.ChatTypingEventService;
 import com.chat.yourway.service.interfaces.ContactEventService;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
@@ -21,6 +22,7 @@ public class StompConnectionListener {
 
   private final ContactEventService contactEventService;
   private final ChatNotificationService chatNotificationService;
+  private final ChatTypingEventService chatTypingEventService;
 
   @EventListener
   public void handleWebSocketConnectListener(SessionConnectEvent event) {
@@ -32,6 +34,7 @@ public void handleWebSocketConnectListener(SessionConnectEvent event) {
   @EventListener
   public void handleWebSocketDisconnectListener(SessionDisconnectEvent event) {
     String email = getEmail(event);
+    chatTypingEventService.updateTypingEvent(false, email);
     contactEventService.updateEventTypeByEmail(OFFLINE, email);
     chatNotificationService.notifyAllWhoSubscribedToSameUserTopic(email);
     log.info("Contact [{}] is disconnected", email);

src/main/java/com/chat/yourway/service/ChatMessageServiceImpl.java

@@ -9,6 +9,7 @@
 import com.chat.yourway.service.interfaces.ChatMessageService;
 import com.chat.yourway.service.interfaces.ChatNotificationService;
 import com.chat.yourway.service.interfaces.ContactEventService;
+import com.chat.yourway.service.interfaces.ContactService;
 import com.chat.yourway.service.interfaces.MessageService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -27,13 +28,15 @@ public class ChatMessageServiceImpl implements ChatMessageService {
   private final MessageService messageService;
   private final ContactEventService contactEventService;
   private final ChatNotificationService chatNotificationService;
+  private final ContactService contactService;
 
   @Transactional
   @Override
   public MessageResponseDto sendToPublicTopic(Integer topicId, MessagePublicRequestDto message,
       String email) {
     log.trace("Started contact email: [{}] sendToTopic id: [{}]", email, topicId);
     MessageResponseDto messageResponseDto = messageService.createPublic(topicId, message, email);
+    messageResponseDto.setSentFrom(contactService.findByEmail(email).getNickname());
 
     sendToTopic(topicId, messageResponseDto);
 
@@ -49,6 +52,10 @@ public MessageResponseDto sendToPrivateTopic(Integer topicId, MessagePrivateRequ
     log.trace("Started contact email: [{}] sendToPrivateTopic email: [{}]", email, sendTo);
     MessageResponseDto messageResponseDto = messageService.createPrivate(message, email);
 
+    messageResponseDto.setSentFrom(contactService.findByEmail(email).getNickname());
+    messageResponseDto.setSendTo(
+        contactService.findByEmail(messageResponseDto.getSendTo()).getNickname());
+
     sendToTopic(topicId, messageResponseDto);
 
     log.trace("Contact [{}] sent message to [{}]", email, sendTo);
@@ -60,7 +67,15 @@ public List<MessageResponseDto> sendMessageHistoryByTopicId(Integer topicId,
       PageRequestDto pageRequestDto, String email) {
     log.trace("Started sendMessageHistoryByTopicId = [{}]", topicId);
 
-    List<MessageResponseDto> messages = messageService.findAllByTopicId(topicId, pageRequestDto);
+    List<MessageResponseDto> messages = messageService.findAllByTopicId(topicId, pageRequestDto)
+        .stream()
+        .peek(m -> {
+          m.setSentFrom(contactService.findByEmail(m.getSentFrom()).getNickname());
+          if (isPrivate(m)) {
+            m.setSendTo(contactService.findByEmail(m.getSendTo()).getNickname());
+          }
+        })
+        .toList();
     simpMessagingTemplate.convertAndSendToUser(email, toTopicDestination(topicId), messages);
 
     log.trace("Message history was sent to topicId = [{}]", topicId);
@@ -85,4 +100,8 @@ private String toTopicDestination(Integer topicId) {
     return properties.getTopicPrefix() + "/" + topicId;
   }
 
+  private boolean isPrivate(MessageResponseDto message) {
+    return message.getSendTo().contains("@");
+  }
+
 }

src/main/java/com/chat/yourway/service/ChatTypingEventServiceImpl.java

@@ -21,12 +21,9 @@ public void updateTypingEvent(Boolean isTyping, String email) {
     log.info("Start updateTypingEvent isTyping={}, email={}", isTyping, email);
     contactEventService.updateTypingEvent(email, isTyping);
 
-    Integer topicId = contactEventService.getAllByEmail(email).stream()
+    contactEventService.getAllByEmail(email).stream()
         .filter(e -> e.getEventType().equals(EventType.SUBSCRIBED))
-        .findFirst()
-        .orElseThrow()
-        .getTopicId();
-
-    chatNotificationService.updateNotificationForAllWhoSubscribedToTopic(topicId);
+        .forEach(e -> chatNotificationService.updateNotificationForAllWhoSubscribedToTopic(
+            e.getTopicId()));
   }
 }

src/main/java/com/chat/yourway/service/ContactEventServiceImpl.java

@@ -84,20 +84,15 @@ public void updateMessageInfoForAllTopicSubscribers(Integer topicId,
 
   @Override
   public void updateTypingEvent(String email, boolean isTyping) {
-
-    Integer topicId = getAllByEmail(email).stream()
-        .filter(e -> e.getEventType().equals(EventType.SUBSCRIBED))
-        .findFirst()
-        .orElseThrow()
-        .getTopicId();
-
-    getAllByTopicId(topicId)
-        .forEach(event -> {
-          event.setTypingEvent(new TypingEventResponseDto(email, isTyping));
-          contactEventRedisRepository.save(event);
-        });
-
-
+    log.trace("Started updateTypingEvent, email [{}], isTyping [{}]", email, isTyping);
+
+    getAllByEmail(email).stream()
+        .filter(event -> event.getEventType().equals(SUBSCRIBED))
+        .forEach(event -> getAllByTopicId(event.getTopicId())
+            .forEach(e -> {
+              e.setTypingEvent(new TypingEventResponseDto(email, isTyping));
+              contactEventRedisRepository.save(e);
+            }));
   }
 
 }

src/test/java/com/chat/yourway/integration/controller/ChatControllerTest.java

@@ -125,7 +125,7 @@ void sendToTopic_shouldReturnCorrectSendToPublicTopicAndReceivedMessageFromTopic
     MessageResponseDto messageResponseDto = resultKeeper.get(3, SECONDS);
     assertThat(messageResponseDto).isNotNull();
     assertThat(messageResponseDto.getId()).isNotNull();
-    assertThat(messageResponseDto.getSentFrom()).isEqualTo("[email protected]");
+    assertThat(messageResponseDto.getSentFrom()).isEqualTo("Vasil");
     assertThat(messageResponseDto.getSendTo()).isEqualTo("Topic id=" + topicId);
     assertThat(messageResponseDto.getTimestamp()).isNotNull();
     assertThat(messageResponseDto.getContent()).isEqualTo(messageRequestDto.getContent());
@@ -155,8 +155,8 @@ void sendToContact_shouldReturnCorrectReceivedPrivateMessageFromSelfToSelf() {
     MessageResponseDto messageResponseDto = resultKeeper.get(3, SECONDS);
     assertThat(messageResponseDto).isNotNull();
     assertThat(messageResponseDto.getId()).isNotNull();
-    assertThat(messageResponseDto.getSentFrom()).isEqualTo("[email protected]");
-    assertThat(messageResponseDto.getSendTo()).isEqualTo("[email protected]");
+    assertThat(messageResponseDto.getSentFrom()).isEqualTo("Vasil");
+    assertThat(messageResponseDto.getSendTo()).isEqualTo("Vasil");
     assertThat(messageResponseDto.getTimestamp()).isNotNull();
     assertThat(messageResponseDto.getContent()).isEqualTo(messageRequestDto.getContent());
   }
@@ -185,9 +185,9 @@ void getMessages_shouldReturnReceivedMessagesHistoryFromTopic() {
     assertThat(messageResponseDtos).extracting("id").isNotNull();
     assertThat(messageResponseDtos).extracting("timestamp").isNotNull();
     assertThat(messageResponseDtos).extracting("sentFrom")
-        .contains("[email protected]", "[email protected]");
+        .contains("Anton", "Vasil");
     assertThat(messageResponseDtos).extracting("sendTo")
-        .contains("[email protected]", "[email protected]");
+        .contains("Vasil", "Anton");
     assertThat(messageResponseDtos).extracting("content")
         .contains("hello Vasil!", "hello Anton!");
   }

src/test/java/com/chat/yourway/unit/listener/StompConnectionListenerTest.java

@@ -6,6 +6,7 @@
 
 import com.chat.yourway.listener.StompConnectionListener;
 import com.chat.yourway.service.interfaces.ChatNotificationService;
+import com.chat.yourway.service.interfaces.ChatTypingEventService;
 import com.chat.yourway.service.interfaces.ContactEventService;
 import java.security.Principal;
 import org.junit.jupiter.api.Test;
@@ -25,6 +26,7 @@
 public class StompConnectionListenerTest {
   @Mock private ContactEventService contactEventService;
   @Mock private ChatNotificationService chatNotificationService;
+  @Mock private ChatTypingEventService chatTypingEventService;
   @InjectMocks private StompConnectionListener stompConnectionListener;
 
   @Test
@@ -54,6 +56,7 @@ public void testHandleWebSocketDisconnectListener() {
     // Then
     verify(contactEventService).updateEventTypeByEmail(OFFLINE, email);
     verify(chatNotificationService).notifyAllWhoSubscribedToSameUserTopic(email);
+    verify(chatTypingEventService).updateTypingEvent(false, email);
   }
 
   private SessionConnectEvent createConnectEvent(String email, String password) {