From 1113f3f650599199e89941e28b28e060f16308b1 Mon Sep 17 00:00:00 2001
From: kozorukov <kosorukov.r@numdes.com>
Date: Wed, 13 Mar 2024 17:58:03 +0300
Subject: [PATCH] Fix bug with one user dialog

---
 .../server/service/message/MessageRepository.java              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto-messenger-server/src/main/java/cryptomessenger/server/service/message/MessageRepository.java b/crypto-messenger-server/src/main/java/cryptomessenger/server/service/message/MessageRepository.java
index 78e7b6e..1a4ba05 100644
--- a/crypto-messenger-server/src/main/java/cryptomessenger/server/service/message/MessageRepository.java
+++ b/crypto-messenger-server/src/main/java/cryptomessenger/server/service/message/MessageRepository.java
@@ -18,6 +18,9 @@ public interface MessageRepository extends MongoRepository<Message, UUID> {
     Page<Message> findBySenderIdAndReceiverIdOrderBySentAtDesc(UUID senderId, UUID receiverId, Pageable pageable);
 
     default Page<Message> findMessagesBetween(UUID userId, UUID otherUserId, Pageable pageable) {
+        if (userId.equals(otherUserId)) {
+            return findBySenderIdOrderBySentAtDesc(userId, pageable);
+        }
         var fromUserToOtherUser = findBySenderIdAndReceiverIdOrderBySentAtDesc(userId, otherUserId, pageable);
         var fromOtherUserToUser = findBySenderIdAndReceiverIdOrderBySentAtDesc(otherUserId, userId, pageable);
         var combinedMessages = Stream.concat(fromUserToOtherUser.stream(), fromOtherUserToUser.stream())