From 23e74e05420e2a01019fdec9c44c90291429b2af Mon Sep 17 00:00:00 2001 From: HyemIin Date: Fri, 2 Feb 2024 20:20:00 +0900 Subject: [PATCH] =?UTF-8?q?Refactor=20:=20ChatRoom=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - chatRoomService 몽고DB 메세지 저장 메서드 수정 - CorsConfig 이름 수정 --- .../chat/chatroom/service/ChatRoomService.java | 18 ++++++++---------- .../config/{WebConfig.java => CorsConfig.java} | 2 +- .../chat/global/config/RedisConfig.java | 1 + 3 files changed, 10 insertions(+), 11 deletions(-) rename src/main/java/com/catchroom/chat/global/config/{WebConfig.java => CorsConfig.java} (94%) diff --git a/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java b/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java index 233194c..749f2c2 100644 --- a/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java +++ b/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java @@ -80,21 +80,19 @@ private void setListChatLastMessage(ChatRoomListGetResponse chatRoomListGetRespo // 몽고 디비에서 마지막 메시지 가져와서 저장. String chatRoomNumber = chatRoomListGetResponse.getChatRoomNumber(); - + //TODO 레디스에 마지막 메세지가 없으면?? if (chatRoomRedisRepository.getLastMessage(chatRoomNumber) != null) { chatRoomListGetResponse.updateChatMessageDto( - chatRoomRedisRepository.getLastMessage(chatRoomNumber) + chatRoomRedisRepository.getLastMessage(chatRoomNumber) ); - return; - } - - ChatMessage chatMessage = chatMongoService.findLatestMessageByRoomId(chatRoomNumber); - if (chatMessage != null) { - chatRoomListGetResponse.updateChatMessageDto( + } else { + ChatMessage chatMessage = chatMongoService.findLatestMessageByRoomId(chatRoomNumber); + if (chatMessage != null) { + chatRoomListGetResponse.updateChatMessageDto( ChatMessageDto.fromEntity(chatMessage) - ); + ); + } } - } /** diff --git a/src/main/java/com/catchroom/chat/global/config/WebConfig.java b/src/main/java/com/catchroom/chat/global/config/CorsConfig.java similarity index 94% rename from src/main/java/com/catchroom/chat/global/config/WebConfig.java rename to src/main/java/com/catchroom/chat/global/config/CorsConfig.java index 4bddbbb..6b66627 100644 --- a/src/main/java/com/catchroom/chat/global/config/WebConfig.java +++ b/src/main/java/com/catchroom/chat/global/config/CorsConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class WebConfig implements WebMvcConfigurer { +public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { diff --git a/src/main/java/com/catchroom/chat/global/config/RedisConfig.java b/src/main/java/com/catchroom/chat/global/config/RedisConfig.java index 23e254b..74a5f23 100644 --- a/src/main/java/com/catchroom/chat/global/config/RedisConfig.java +++ b/src/main/java/com/catchroom/chat/global/config/RedisConfig.java @@ -20,6 +20,7 @@ @Configuration public class RedisConfig { + // yml 파일 redis 설정 불러오기 private final RedisProperties redisProperties; /** * 단일 Topic 사용을 위한 Bean 설정