From f89edaee6d031045cdb19a6fec355e9554d91c01 Mon Sep 17 00:00:00 2001 From: qmean Date: Tue, 18 Feb 2025 16:34:05 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20ALL=20=ED=83=80=EC=9E=85=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=8B=9C=20=EC=A0=84=EC=86=A1=ED=95=98=EA=B1=B0?= =?UTF-8?q?=EB=82=98=20=EC=88=98=EC=8B=A0=ED=95=9C=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/brainpix/message/repository/MessageRepository.java | 2 +- src/main/java/com/brainpix/message/service/MessageService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/brainpix/message/repository/MessageRepository.java b/src/main/java/com/brainpix/message/repository/MessageRepository.java index b0cb52c..2857ec4 100644 --- a/src/main/java/com/brainpix/message/repository/MessageRepository.java +++ b/src/main/java/com/brainpix/message/repository/MessageRepository.java @@ -7,8 +7,8 @@ import com.brainpix.message.model.Message; public interface MessageRepository extends MongoRepository { + Page findByReceiverIdOrSenderId(Long senderId, Long receiverId, Pageable pageable); Page findAllByReceiverId(Long receiverId, Pageable pageable); - Page findAllByReceiverIdAndIsRead(Long receiverId, Boolean isRead, Pageable pageable); Page findAllBySenderId(Long senderId, Pageable pageable); Long countAllByReceiverIdAndIsRead(Long receiverId, Boolean isRead); } diff --git a/src/main/java/com/brainpix/message/service/MessageService.java b/src/main/java/com/brainpix/message/service/MessageService.java index 5865a7f..45e086b 100644 --- a/src/main/java/com/brainpix/message/service/MessageService.java +++ b/src/main/java/com/brainpix/message/service/MessageService.java @@ -122,7 +122,7 @@ private User getUser(Long userId, ErrorCode errorCode) { private Page 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) {