Merge pull request #105 from Me1tingPot/feature/#104

feat : 채팅 메세지 조회 기획 변경 적용

src/main/java/meltingpot/server/chat/controller/ChatRoomController.java

@@ -58,7 +58,7 @@ public ResponseEntity<ResponseData> updateAlarmStatus(
 
     // [CHECK] PageResponse
     @PostMapping("/chat/{chatRoomId}")
-    @Operation(summary = "채팅방 채팅 내역 조회", description = "채팅방 입장 후, 채팅방 메시지 조회. (위치 고정) 좌측 : 주최자가 전송한 메세지 / 우측 : 참여자가 전송한 메세지")
+    @Operation(summary = "채팅방 채팅 내역 조회", description = "채팅방 입장 후, 채팅방 메시지 조회")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "OK", description = "채팅방 채팅 내역 조회 성공"),
             @ApiResponse(responseCode = "NOT_FOUND", description = "채팅방 정보를 찾을 수 없습니다"),
@@ -68,17 +68,6 @@ public ResponseEntity<ResponseData<ChatMessagePageResponse>> getChatMessage(
             @PathVariable("chatRoomId") Long chatRoomId,
             @RequestBody @Valid PageGetRequest pageGetRequest
             ) {
-        return ResponseData.toResponseEntity(CHAT_MESSAGE_GET_SUCCESS, chatRoomQueryService.getChatMessage(chatRoomId, pageGetRequest));
-    }
-
-    @GetMapping("/chat/{chatRoomId}/detail")
-    @Operation(summary = "채팅방 상단", description = "채팅방 상단 위치. 채팅방 정보")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "OK", description = "채팅방 상단 조회 성공"),
-            @ApiResponse(responseCode = "NOT_FOUND", description = "채팅방 정보를 찾을 수 없습니다"),
-            @ApiResponse(responseCode = "BAD_REQUEST", description = "채팅방 상단 조회 실패")
-    })
-    public ResponseEntity<ResponseData<ChatRoomDetailGetResponse>> getChatRoomDetail(@PathVariable("chatRoomId") Long chatRoomId) {
-        return ResponseData.toResponseEntity(CHAT_DETAIL_GET_SUCCESS, chatRoomQueryService.getRoomDetail(chatRoomId));
+        return ResponseData.toResponseEntity(CHAT_MESSAGE_GET_SUCCESS, chatRoomQueryService.getChatMessages(chatRoomId, pageGetRequest));
     }
 }

src/main/java/meltingpot/server/chat/dto/ChatMessageGetResponse.java

@@ -1,19 +1,30 @@
 package meltingpot.server.chat.dto;
 
+import meltingpot.server.domain.entity.AccountProfileImage;
 import meltingpot.server.domain.entity.chat.ChatMessage;
 import meltingpot.server.domain.entity.chat.enums.Role;
 import org.springframework.data.domain.Slice;
 
 public record ChatMessageGetResponse(
         Long chatMessageId,
         String content,
-        Role role
+        Role memberRole,
+        String memberName,
+        String imageKey
 ) {
     public static ChatMessageGetResponse from(ChatMessage chatMessage) {
+        String thumbnailImageKey = chatMessage.getChatRoom().getParty().getAccount().getProfileImages().stream()
+                .filter(AccountProfileImage::isThumbnail)
+                .map(AccountProfileImage::getImageKey)
+                .findFirst()
+                .orElse(null);
+
         return new ChatMessageGetResponse(
                 chatMessage.getId(),
                 chatMessage.getContent(),
-                chatMessage.getRole()
+                chatMessage.getRole(),
+                chatMessage.getAccount().getUsername(),
+                thumbnailImageKey
         );
     }
 }

src/main/java/meltingpot/server/chat/dto/ChatMessagePageResponse.java

@@ -1,18 +1,34 @@
 package meltingpot.server.chat.dto;
 
+import meltingpot.server.domain.entity.AccountProfileImage;
 import meltingpot.server.domain.entity.chat.ChatMessage;
+import meltingpot.server.domain.entity.chat.ChatRoom;
 import org.springframework.data.domain.Slice;
 
 import java.util.List;
 
 public record ChatMessagePageResponse(
         List<ChatMessageGetResponse> chatMessageGetResponseList,
+        Long chatRoomId,
+        String hostImageKey,
+        String title,
+        int memberCnt,
         Boolean isFirst,
         Boolean hasNext
 ) {
-    public static ChatMessagePageResponse from(Slice<ChatMessage> chatMessagesSlice) {
+    public static ChatMessagePageResponse from(Slice<ChatMessage> chatMessagesSlice, ChatRoom chatRoom) {
+        String thumbnailImageKey = chatRoom.getParty().getAccount().getProfileImages().stream()
+                .filter(AccountProfileImage::isThumbnail)
+                .map(AccountProfileImage::getImageKey)
+                .findFirst()
+                .orElse(null);
+
         return new ChatMessagePageResponse(
                 chatMessagesSlice.stream().map(ChatMessageGetResponse::from).toList(),
+                chatRoom.getId(),
+                thumbnailImageKey,
+                chatRoom.getParty().getPartySubject(),
+                chatRoom.getParty().getPartyParticipants().size(),
                 chatMessagesSlice.isFirst(),
                 chatMessagesSlice.hasNext()
         );

src/main/java/meltingpot/server/chat/service/ChatRoomQueryService.java

@@ -18,6 +18,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import static meltingpot.server.util.ResponseCode.CHAT_ROOM_NOT_FOUND;
 import static meltingpot.server.util.ResponseCode.PARTY_NOT_FOUND;
 
 @Slf4j
@@ -30,22 +31,16 @@ public class ChatRoomQueryService {
     private final ChatMessageRepository chatMessageRepository;
     private final PartyRepository partyRepository;
 
-    public ChatRoomDetailGetResponse getRoomDetail(Long chatRoomId) {
-        Party party = partyRepository.findByChatRoomId(chatRoomId)
-                .orElseThrow(() -> new ResourceNotFoundException(PARTY_NOT_FOUND));
-        return ChatRoomDetailGetResponse.from(party);
-    }
-
     // [CHECK] 1. slice or page or list 2. PageResponse api
-    public ChatMessagePageResponse getChatMessage(Long chatRoomId, PageGetRequest pageGetRequest) {
+    public ChatMessagePageResponse getChatMessages(Long chatRoomId, PageGetRequest pageGetRequest) {
         ChatRoom chatRoom = chatRoomRepository.findById(chatRoomId)
-                .orElseThrow(() -> new IllegalArgumentException("ChatRoom not found"));
+                .orElseThrow(() -> new ResourceNotFoundException(CHAT_ROOM_NOT_FOUND));
 
         PageRequest pageRequest = PageRequest.of(pageGetRequest.page(), pageGetRequest.size(), Sort.by(Sort.Direction.DESC, "id"));
 
         Slice<ChatMessage> chatMessagesSlice = chatMessageRepository.findAllByChatRoomId(chatRoom.getId(), pageRequest);
 
-        return ChatMessagePageResponse.from(chatMessagesSlice);
+        return ChatMessagePageResponse.from(chatMessagesSlice, chatRoom);
     }
 
     public ChatRoomsPageResponse getChatRooms(Long userId, PageGetRequest pageGetRequest) {

src/main/java/meltingpot/server/chat/service/WebSocketService.java

@@ -56,7 +56,7 @@ public ChatMessage createChatMessage(String sessionId, ChatMessageSendRequest ch
         ChatMessage newChatMessage = ChatMessage.builder()
                 .chatRoom(chatRoom)
                 .content(chatMessageSendRequest.content())
-                .userId(account.getId())
+                .account(account)
                 .role(role)
                 .build();
 
@@ -90,7 +90,7 @@ private Account getAccount(ChatRoomUser chatRoomUser) {
     }
 
     private boolean isSender(Account account, ChatMessage chatMessage) {
-        return account.getId().equals(chatMessage.getUserId());
+        return account.getId().equals(chatMessage.getAccount().getId());
     }
 
     private void sendNotificationOrMessage(Account account, ChatMessage chatMessage) {

src/main/java/meltingpot/server/domain/entity/Account.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 import jakarta.validation.constraints.NotNull;
+import meltingpot.server.domain.entity.chat.ChatMessage;
 import meltingpot.server.domain.entity.comment.Comment;
 import meltingpot.server.domain.entity.comment.CommentImage;
 import meltingpot.server.domain.entity.common.BaseEntity;
@@ -72,6 +73,9 @@ public class Account extends BaseEntity {
     @OneToMany(mappedBy = "account")
     private List<Post> posts = new ArrayList<>();
 
+    @OneToMany(mappedBy = "account")
+    private List<ChatMessage> chatMessages = new ArrayList<>();
+
     @Builder.Default
     @OneToMany(mappedBy = "account")
     private List<AccountRole> accountRoles = new ArrayList<>();

src/main/java/meltingpot/server/domain/entity/chat/ChatMessage.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
+import meltingpot.server.domain.entity.Account;
 import meltingpot.server.domain.entity.chat.enums.Role;
 import meltingpot.server.domain.entity.common.BaseEntity;
 
@@ -26,11 +27,17 @@ public class ChatMessage extends BaseEntity {
     private String content;
 
     @NotNull
-    @Column(name = "user_id")
-    private Long userId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private Account account;
 
     @NotNull
     @Column(name = "is_leader")
     @Enumerated(EnumType.STRING)
     private Role role;
+
+    public void setAccount(Account account) {
+        this.account = account;
+        account.getChatMessages().add(this);
+    }
 }