Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.transaction.annotation.EnableTransactionManagement;

@Configuration
@EnableJpaAuditing
@EnableTransactionManagement
public class JpaConfig {
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
import com.goorm.team9.icontact.domain.chat.entity.ChatRoom;
import com.goorm.team9.icontact.domain.client.entity.ClientEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

Expand All @@ -31,4 +33,14 @@ List<ChatMessage> findUnreadMessages(@Param("chatRoom") ChatRoom chatRoom,
@Query("SELECT m FROM ChatMessage m WHERE m.chatRoom = :chatRoom ORDER BY m.created_at ASC")
List<ChatMessage> findByChatRoomOrderByCreatedAtAsc(@Param("chatRoom") ChatRoom chatRoom);

@Modifying
@Query("UPDATE ChatMessage m " +
"SET m.isRead = true " +
"WHERE m.chatRoom = :chatRoom " +
"AND m.isRead = false " +
"AND m.senderNickname <> :readerNickname")
int markMessagesAsRead(@Param("chatRoom") ChatRoom chatRoom,
@Param("readerNickname") String readerNickname);


}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.goorm.team9.icontact.domain.client.entity.ClientEntity;
import com.goorm.team9.icontact.domain.client.repository.ClientRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.stereotype.Service;
Expand All @@ -21,6 +22,7 @@
import java.util.List;
import java.util.stream.Collectors;

@Slf4j
@Service
@RequiredArgsConstructor
public class ChatMessageService {
Expand Down Expand Up @@ -144,13 +146,11 @@ public void markMessagesAsRead(Long roomId, Long clientId) {
ClientEntity reader = clientRepository.findById(clientId)
.orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));

List<ChatMessage> unreadMessages = chatMessageRepository.findUnreadMessages(chatRoom, reader);
int updatedCount = chatMessageRepository.markMessagesAsRead(chatRoom, reader.getNickName());

for (ChatMessage chatMessage : unreadMessages) {
chatMessage.markAsRead();
if (updatedCount > 0) {
log.info("✅ {}개의 메시지를 읽음 처리했습니다. [roomId={}, reader={}]", updatedCount, roomId, reader.getNickName());
}

chatMessageRepository.saveAll(unreadMessages);
}

}