Feat: msg 채팅방 조회 (user 들어온 시점)

Author: skyeong42

src/main/java/cmf/commitField/domain/chat/chatMessage/dto/ChatMsgDto.java

@@ -1,16 +1,14 @@
 package cmf.commitField.domain.chat.chatMessage.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class ChatMsgDto {
     private Long chatMsgId;
     private Long userId;

src/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

@@ -8,6 +8,8 @@
 import cmf.commitField.domain.chat.chatMessage.repository.ChatMessageRepository;
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import cmf.commitField.domain.chat.chatRoom.repository.ChatRoomRepository;
+import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
+import cmf.commitField.domain.chat.userChatRoom.repository.UserChatRoomRepository;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import cmf.commitField.global.error.ErrorCode;
@@ -17,8 +19,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -28,6 +31,7 @@ public class ChatMessageServiceImpl implements ChatMessageService {
     private final UserRepository userRepository;
     private final ChatRoomRepository chatRoomRepository;
     private final ChatMessageCustomRepository chatMessageCustomRepository;
+    private final UserChatRoomRepository userChatRoomRepository;
 
     @Override
     public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roomId) {
@@ -61,13 +65,24 @@ public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
 
         List<ChatMsg> chatMsgsList = chatMessageCustomRepository.findChatRoomIdByChatMsg(roomId, lastId);
-        return chatMsgsList.stream().map(chatMsg -> new ChatMsgDto(
-                chatMsg.getId(),
-                chatMsg.getUser().getId(),
-                chatMsg.getUser().getNickname(),
-                chatMsg.getMessage(),
-                chatMsg.getCreatedAt()
-                ))
-                .collect(Collectors.toList());
+        Optional<UserChatRoom> joinUser = userChatRoomRepository.findByUserIdAndChatRoomId(userId,roomId);
+        if (joinUser.isEmpty()) {
+            throw new CustomException(ErrorCode.NOT_FOUND_USER);
+        }
+        LocalDateTime joinDt = joinUser.get().getJoinDt();
+        List<ChatMsgDto> chatMsgDtos = new ArrayList<>();
+        for (ChatMsg chatMsg : chatMsgsList) {
+            ChatMsgDto build = ChatMsgDto.builder()
+                    .chatMsgId(chatMsg.getId())
+                    .nickname(chatMsg.getUser().getNickname())
+                    .sendAt(chatMsg.getCreatedAt())
+                    .message(chatMsg.getMessage())
+                    .userId(chatMsg.getUser().getId())
+                    .build();
+            if (build.getSendAt().isAfter(joinDt)) {
+                chatMsgDtos.add(build);
+            }
+        }
+        return chatMsgDtos;
     }
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java

@@ -23,13 +23,14 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static java.time.LocalDateTime.now;
+
 @Service
 @RequiredArgsConstructor
 public class ChatRoomServiceImpl implements ChatRoomService {
@@ -64,8 +65,8 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
                 .roomCreator(findUser.getId())
                 .title(chatRoomRequest.getTitle())
                 .userCountMax(chatRoomRequest.getUserCountMax())
-                .createdAt(LocalDateTime.now())
-                .modifiedAt(LocalDateTime.now())
+                .createdAt(now())
+                .modifiedAt(now())
                 .isPrivate(false)
                 .build();
         if (password != null) {
@@ -78,6 +79,7 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
         UserChatRoom userChatRoom = UserChatRoom.builder()
                 .user(findUser)
                 .chatRoom(savedChatRoom)
+                .joinDt(now())
                 .build();
         userChatRoomRepository.save(userChatRoom);
     }
@@ -87,6 +89,7 @@ public void joinRoom(Long roomId, Long userId) {
 
     }
 
+
     // 방 조회 DTO 변환 메서드 추출
     private static List<ChatRoomDto> getChatRoomDtos(Page<ChatRoom> all) {
         return all.stream()
@@ -164,6 +167,7 @@ public void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest)
             UserChatRoom userChatRoom = UserChatRoom.builder()
                     .user(findUser)
                     .chatRoom(chatRoom)
+                    .joinDt(now())
                     .build();
             userChatRoomRepository.save(userChatRoom);
             // 비즈니스 로직 끝
@@ -228,7 +232,7 @@ public void updateRoom(Long roomId, ChatRoomUpdateRequest chatRoomUpdateRequest,
         if (currentRoomTitle.equals(chatRoomUpdateRequest.getTitle())) {
             throw new CustomException(ErrorCode.REQUEST_SAME_AS_CURRENT_TITLE);
         }
-        room.update(chatRoomUpdateRequest.getTitle(), LocalDateTime.now());
+        room.update(chatRoomUpdateRequest.getTitle(), now());
         chatRoomRepository.save(room);
     }
 

src/main/java/cmf/commitField/domain/chat/userChatRoom/entity/UserChatRoom.java

@@ -10,6 +10,8 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+import java.time.LocalDateTime;
+
 @Entity
 @Getter
 @Setter
@@ -25,4 +27,7 @@ public class UserChatRoom extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "chat_room_id",nullable = false)
     private ChatRoom chatRoom;
+
+
+    private LocalDateTime joinDt;
 }

src/main/java/cmf/commitField/domain/chat/userChatRoom/repository/UserChatRoomRepository.java

@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long> {
@@ -35,4 +36,8 @@ public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long
     //out room 조회
     List<UserChatRoom> findUserByChatRoomId(Long roomId);
 
+    Optional<UserChatRoom> findByUserId(Long userId);
+    //채팅방 join한 user
+    Optional<UserChatRoom> findByUserIdAndChatRoomId(Long userId, Long chatRoomId);
+
 }