Skip to content

[FIX] ALL 타입 조회시 전송하거나 수신한 메시지 조회하도록 수정 #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redblackblossom merged 1 commit into from
Feb 19, 2025
Merged

[FIX] ALL 타입 조회시 전송하거나 수신한 메시지 조회하도록 수정 #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/brainpix/message/repository/MessageRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import com.brainpix.message.model.Message;

public interface MessageRepository extends MongoRepository<Message, String> {
Page<Message> findByReceiverIdOrSenderId(Long senderId, Long receiverId, Pageable pageable);
Page<Message> findAllByReceiverId(Long receiverId, Pageable pageable);
Page<Message> findAllByReceiverIdAndIsRead(Long receiverId, Boolean isRead, Pageable pageable);
Page<Message> findAllBySenderId(Long senderId, Pageable pageable);
Long countAllByReceiverIdAndIsRead(Long receiverId, Boolean isRead);
}
2 changes: 1 addition & 1 deletion src/main/java/com/brainpix/message/service/MessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private User getUser(Long userId, ErrorCode errorCode) {
private Page<Message> getMessageListBySearchType(Long userId, MessageSearchType searchType,
PageRequest pageRequest) {
if (searchType == MessageSearchType.ALL) {
return messageRepository.findAllByReceiverId(userId, pageRequest);
return messageRepository.findByReceiverIdOrSenderId(userId, userId, pageRequest);
} else if (searchType == MessageSearchType.SEND) {
return messageRepository.findAllBySenderId(userId, pageRequest);
} else if (searchType == MessageSearchType.RECEIVED) {
Expand Down