jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-05-11 21:27:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from nagisa77/codex/fix-multiple-results-error-in-findconversationbyusers

Browse Source 
Handle multiple conversations between users
This commit is contained in:
Tim
2025-08-23 02:39:28 +08:00
committed by GitHub
parent 151242f3ba d97cc7df5e
commit 4e1c3f5839
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/com/openisle/repository/MessageConversationRepository.java
View File

@@ -1,23 +1,19 @@
package com.openisle.repository; package com.openisle.repository;
import com.openisle.model.MessageConversation; import com.openisle.model.MessageConversation;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import com.openisle.model.User; import com.openisle.model.User;
import java.util.List; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.Optional;
import com.openisle.model.User;
import java.util.List; import java.util.List;
@Repository @Repository
public interface MessageConversationRepository extends JpaRepository<MessageConversation, Long> { 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") @Query("SELECT c FROM MessageConversation c JOIN c.participants p1 JOIN c.participants p2 " +
Optional<MessageConversation> findConversationByUsers(@Param("user1") User user1, @Param("user2") User user2); "WHERE p1.user = :user1 AND 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 " + @Query("SELECT DISTINCT c FROM MessageConversation c " +
"JOIN c.participants p " + "JOIN c.participants p " +
@@ -32,4 +28,4 @@ public interface MessageConversationRepository extends JpaRepository<MessageConv
List<MessageConversation> findByChannelTrue(); List<MessageConversation> findByChannelTrue();
long countByChannelTrue(); long countByChannelTrue();
} }

3
backend/src/main/java/com/openisle/service/MessageService.java
View File

@@ -154,7 +154,8 @@ public class MessageService {
private MessageConversation findOrCreateConversation(User user1, User user2) { private MessageConversation findOrCreateConversation(User user1, User user2) {
log.info("Searching for existing conversation between {} and {}", user1.getUsername(), user2.getUsername()); log.info("Searching for existing conversation between {} and {}", user1.getUsername(), user2.getUsername());
return conversationRepository.findConversationByUsers(user1, user2) return conversationRepository.findConversationsByUsers(user1, user2).stream()
.findFirst()
.orElseGet(() -> { .orElseGet(() -> {
log.info("No existing conversation found. Creating a new one."); log.info("No existing conversation found. Creating a new one.");
MessageConversation conversation = new MessageConversation(); MessageConversation conversation = new MessageConversation();