From 603788dc414f7c7437461798170b69f200f3588a Mon Sep 17 00:00:00 2001
From: kkangh00n <kig2454@gmail.com>
Date: Thu, 18 Apr 2024 20:20:47 +0900
Subject: [PATCH] =?UTF-8?q?style=20:=20=EC=BD=94=EB=93=9C=20=ED=8F=AC?=
=?UTF-8?q?=EB=A7=B7=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../room/presentation/RoomControllerTest.java | 5 ++---
.../repository/ChatMessageJpaRepository.java | 3 ++-
.../room/application/RoomService.java | 3 ++-
.../room/dto/mapper/RoomMapper.java | 2 +-
.../adaptor/RoomRepositoryAdaptor.java | 3 ++-
.../repository/RoomJpaRepository.java | 19 ++++++++++---------
.../ChatMessageJpaRepositoryTest.java | 6 +++---
.../repository/RoomJpaRepositoryTest.java | 3 ++-
8 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/api/src/test/java/com/civilwar/boardsignal/room/presentation/RoomControllerTest.java b/api/src/test/java/com/civilwar/boardsignal/room/presentation/RoomControllerTest.java
index b980e3c1..a96895da 100644
--- a/api/src/test/java/com/civilwar/boardsignal/room/presentation/RoomControllerTest.java
+++ b/api/src/test/java/com/civilwar/boardsignal/room/presentation/RoomControllerTest.java
@@ -45,9 +45,7 @@
import com.civilwar.boardsignal.user.domain.constants.Role;
import com.civilwar.boardsignal.user.domain.entity.User;
import com.civilwar.boardsignal.user.domain.repository.UserRepository;
-import jakarta.validation.constraints.Null;
import java.io.FileInputStream;
-import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -285,7 +283,8 @@ void getMyChattingRoomTest2() throws Exception {
//1번방 채팅 추가 x
//2번방 채팅 추가
for (int i = 0; i < 3; i++) {
- ChatMessage chatMessage = ChatMessage.of(room2.getId(), 100L, "테스트 " + i, MessageType.CHAT);
+ ChatMessage chatMessage = ChatMessage.of(room2.getId(), 100L, "테스트 " + i,
+ MessageType.CHAT);
chatMessageRepository.save(chatMessage);
}
diff --git a/core/src/main/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepository.java b/core/src/main/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepository.java
index 019a906a..a2e1a46f 100644
--- a/core/src/main/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepository.java
+++ b/core/src/main/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepository.java
@@ -41,7 +41,8 @@ List<ChatCountDto> countsByRoomIds(@Param("userId") Long userId,
@Param("roomIds") List<Long> roomIds);
//채팅방 별 마지막 메시지 조회
- @Query("select new com.civilwar.boardsignal.chat.dto.response.LastChatMessageDto(c.roomId, c.content) "
+ @Query(
+ "select new com.civilwar.boardsignal.chat.dto.response.LastChatMessageDto(c.roomId, c.content) "
+ "from ChatMessage as c "
+ "where c.roomId in :roomIds "
+ "and c.createdAt in (select max(c.createdAt) from ChatMessage as c group by c.roomId) ")
diff --git a/core/src/main/java/com/civilwar/boardsignal/room/application/RoomService.java b/core/src/main/java/com/civilwar/boardsignal/room/application/RoomService.java
index 1276dae6..0d55ea87 100644
--- a/core/src/main/java/com/civilwar/boardsignal/room/application/RoomService.java
+++ b/core/src/main/java/com/civilwar/boardsignal/room/application/RoomService.java
@@ -197,7 +197,8 @@ public RoomPageResponse<ChatRoomResponse> findMyChattingRoom(
roomIdList);
//매핑
- Slice<ChatRoomResponse> myChattingRoomResult = myChattingRoom.map(room -> RoomMapper.toChatRoomResponse(room, unreadChatCounts, lastChatMessages));
+ Slice<ChatRoomResponse> myChattingRoomResult = myChattingRoom.map(
+ room -> RoomMapper.toChatRoomResponse(room, unreadChatCounts, lastChatMessages));
return RoomMapper.toRoomPageResponse(myChattingRoomResult);
}
diff --git a/core/src/main/java/com/civilwar/boardsignal/room/dto/mapper/RoomMapper.java b/core/src/main/java/com/civilwar/boardsignal/room/dto/mapper/RoomMapper.java
index d5bae464..8dcbfc91 100644
--- a/core/src/main/java/com/civilwar/boardsignal/room/dto/mapper/RoomMapper.java
+++ b/core/src/main/java/com/civilwar/boardsignal/room/dto/mapper/RoomMapper.java
@@ -252,6 +252,6 @@ public static ChatRoomResponse toChatRoomResponse(
room.headCount(),
Integer.parseInt(String.valueOf(unreadChatCount)),
lastChatMessage
- );
+ );
}
}
diff --git a/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/adaptor/RoomRepositoryAdaptor.java b/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/adaptor/RoomRepositoryAdaptor.java
index 86b58618..297b7dfb 100644
--- a/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/adaptor/RoomRepositoryAdaptor.java
+++ b/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/adaptor/RoomRepositoryAdaptor.java
@@ -111,7 +111,8 @@ public Optional<Room> findById(Long id) {
}
@Override
- public Slice<ChatRoomDto> findMyChattingRoom(Long userId, LocalDateTime today, Pageable pageable) {
+ public Slice<ChatRoomDto> findMyChattingRoom(Long userId, LocalDateTime today,
+ Pageable pageable) {
return roomJpaRepository.findMyChattingRoom(userId, today, pageable);
}
diff --git a/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepository.java b/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepository.java
index f189f461..0114d2b9 100644
--- a/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepository.java
+++ b/core/src/main/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepository.java
@@ -21,15 +21,16 @@ public interface RoomJpaRepository extends JpaRepository<Room, Long> {
// 내가 현재 참여한 채팅방 조회
// 미확정 모임 또는 모임 시간이 (오늘~미래)인 모임
- @Query("select new com.civilwar.boardsignal.room.dto.response.ChatRoomDto(r.id, r.title, r.imageUrl, r.headCount)"
- + "from Room as r "
- + "left join MeetingInfo as m "
- + "on m.id = r.meetingInfo.id "
- + "join Participant as p "
- + "on r.id = p.roomId "
- + "where p.userId=:userId "
- + "and (m.meetingTime>=:today or m.meetingTime is null) "
- + "order by p.createdAt desc")
+ @Query(
+ "select new com.civilwar.boardsignal.room.dto.response.ChatRoomDto(r.id, r.title, r.imageUrl, r.headCount)"
+ + "from Room as r "
+ + "left join MeetingInfo as m "
+ + "on m.id = r.meetingInfo.id "
+ + "join Participant as p "
+ + "on r.id = p.roomId "
+ + "where p.userId=:userId "
+ + "and (m.meetingTime>=:today or m.meetingTime is null) "
+ + "order by p.createdAt desc")
Slice<ChatRoomDto> findMyChattingRoom(@Param("userId") Long userId,
@Param("today") LocalDateTime today, Pageable pageable);
diff --git a/core/src/test/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepositoryTest.java b/core/src/test/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepositoryTest.java
index 81ad9539..5617bb58 100644
--- a/core/src/test/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepositoryTest.java
+++ b/core/src/test/java/com/civilwar/boardsignal/chat/infrastructure/repository/ChatMessageJpaRepositoryTest.java
@@ -1,7 +1,7 @@
package com.civilwar.boardsignal.chat.infrastructure.repository;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.*;
+import static org.mockito.BDDMockito.given;
import com.civilwar.boardsignal.chat.domain.constant.MessageType;
import com.civilwar.boardsignal.chat.domain.entity.ChatMessage;
@@ -26,7 +26,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import org.mockito.BDDMockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.data.domain.PageRequest;
@@ -193,7 +192,8 @@ void findLastChatMessageTest() throws IOException {
chatMessageRepository.save(chatMessage);
}
- List<LastChatMessageDto> lastChatMessages = chatMessageRepository.findLastChatMessage(List.of(room2.getId(),
+ List<LastChatMessageDto> lastChatMessages = chatMessageRepository.findLastChatMessage(
+ List.of(room2.getId(),
room3.getId()));
assertThat(lastChatMessages).hasSize(2);
diff --git a/core/src/test/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepositoryTest.java b/core/src/test/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepositoryTest.java
index 628b8dbb..cbcb7bfc 100644
--- a/core/src/test/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepositoryTest.java
+++ b/core/src/test/java/com/civilwar/boardsignal/room/infrastructure/repository/RoomJpaRepositoryTest.java
@@ -96,7 +96,8 @@ void findMyChattingRoomTest() throws IOException {
LocalDateTime today = LocalDateTime.of(2024, 4, 11, 0, 0, 0);
PageRequest pageable = PageRequest.of(0, 5);
- Slice<ChatRoomDto> myChattingRoom = roomRepository.findMyChattingRoom(user, today, pageable);
+ Slice<ChatRoomDto> myChattingRoom = roomRepository.findMyChattingRoom(user, today,
+ pageable);
List<ChatRoomDto> content = myChattingRoom.getContent();
//then