Merge pull request #708 from nagisa77/codex/restrict-conversation-search-to-direct-messages

Fix findOrCreateConversation to only retrieve private conversations
Restrict conversation lookup to private chats
2026-02-18 13:01:02 +08:00 · 2025-08-23 02:46:53 +08:00 · 2025-08-23 02:46:41 +08:00 · 2025-08-23 02:39:28 +08:00
1 changed files with 5 additions and 2 deletions
--- a/backend/src/main/java/com/openisle/repository/MessageConversationRepository.java
+++ b/backend/src/main/java/com/openisle/repository/MessageConversationRepository.java
@@ -11,8 +11,11 @@ import java.util.List;

@Repository
 public interface MessageConversationRepository extends JpaRepository<MessageConversation, Long> {
-    @Query("SELECT c FROM MessageConversation c JOIN c.participants p1 JOIN c.participants p2 " +
-           "WHERE p1.user = :user1 AND p2.user = :user2 ORDER BY c.createdAt DESC")
+    @Query("SELECT c FROM MessageConversation c " +
+           "WHERE c.channel = false AND size(c.participants) = 2 " +
+           "AND EXISTS (SELECT 1 FROM c.participants p1 WHERE p1.user = :user1) " +
+           "AND EXISTS (SELECT 1 FROM c.participants p2 WHERE p2.user = :user2) " +
+           "ORDER BY c.createdAt DESC")
    List<MessageConversation> findConversationsByUsers(@Param("user1") User user1, @Param("user2") User user2);
    
    @Query("SELECT DISTINCT c FROM MessageConversation c " +
Author	SHA1	Message	Date
Tim	8657a06f52	Merge pull request #708 from nagisa77/codex/restrict-conversation-search-to-direct-messages Fix findOrCreateConversation to only retrieve private conversations	2025-08-23 02:46:53 +08:00
Tim	09900b34aa	Restrict conversation lookup to private chats	2025-08-23 02:46:41 +08:00
Tim	4e1c3f5839	Merge pull request #707 from nagisa77/codex/fix-multiple-results-error-in-findconversationbyusers Handle multiple conversations between users	2025-08-23 02:39:28 +08:00