Fix bug with one user dialog

KirillSmirnow · Mar 13, 2024 · 1113f3f · 1113f3f
1 parent 68f4886
commit 1113f3f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...senger-server/src/main/java/cryptomessenger/server/service/message/MessageRepository.java b/...senger-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())