From 7ee962f43aec9e4387bcd187e5cc758496613405 Mon Sep 17 00:00:00 2001 From: luke Date: Fri, 24 May 2024 17:20:14 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=98=A4=ED=83=80=20=EB=B0=8F=20?= =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95(#87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../be/chatting/dto/response/ChatMessageResponse.java | 10 ++-------- .../java/yeonba/be/chatting/service/ChatService.java | 7 ++++--- be/src/main/java/yeonba/be/config/RedisConfig.java | 2 +- be/src/main/java/yeonba/be/config/WebSocketConfig.java | 2 -- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/be/src/main/java/yeonba/be/chatting/dto/response/ChatMessageResponse.java b/be/src/main/java/yeonba/be/chatting/dto/response/ChatMessageResponse.java index 4ba865a..10a7b0d 100644 --- a/be/src/main/java/yeonba/be/chatting/dto/response/ChatMessageResponse.java +++ b/be/src/main/java/yeonba/be/chatting/dto/response/ChatMessageResponse.java @@ -1,21 +1,15 @@ package yeonba.be.chatting.dto.response; import java.time.LocalDateTime; +import lombok.AllArgsConstructor; import lombok.Getter; @Getter +@AllArgsConstructor public class ChatMessageResponse { private long userId; private String userName; private String content; private LocalDateTime sentAt; - - public ChatMessageResponse(long userId, String userName, String content, LocalDateTime sentAt) { - - this.userId = userId; - this.userName = userName; - this.content = content; - this.sentAt = sentAt; - } } diff --git a/be/src/main/java/yeonba/be/chatting/service/ChatService.java b/be/src/main/java/yeonba/be/chatting/service/ChatService.java index 514d928..f56ad3f 100644 --- a/be/src/main/java/yeonba/be/chatting/service/ChatService.java +++ b/be/src/main/java/yeonba/be/chatting/service/ChatService.java @@ -44,13 +44,12 @@ public class ChatService { private final ChatMessageQuery chatMessageQuery; private final UserQuery userQuery; private final BlockQuery blockQuery; - private final NotificationQuery notificationQuey; + private final NotificationQuery notificationQuery; private final ApplicationEventPublisher eventPublisher; private final RedisChattingPublisher redisChattingPublisher; private final RedisChattingSubscriber adapter; private final RedisMessageListenerContainer container; - private final ChatRoomRepository chatRoomRepository; @Transactional public void publish(ChatPublishRequest request) { @@ -67,6 +66,7 @@ public void publish(ChatPublishRequest request) { new ChatMessage(chatRoom, sender, receiver, request.getContent(), request.getSentAt())); } + @Transactional(readOnly = true) public List getChatMessages(long userId, long roomId) { User user = userQuery.findById(userId); @@ -135,9 +135,10 @@ public void requestChat(long senderId, long receiverId) { eventPublisher.publishEvent(notificationSendEvent); } + @Transactional public void acceptRequestedChat(long userId, long notificationId) { - Notification notification = notificationQuey.findById(notificationId); + Notification notification = notificationQuery.findById(notificationId); // 채팅 요청 알림인지 검증 if (!notification.getType().isChattingRequest()) { diff --git a/be/src/main/java/yeonba/be/config/RedisConfig.java b/be/src/main/java/yeonba/be/config/RedisConfig.java index 0d1d250..e71f770 100644 --- a/be/src/main/java/yeonba/be/config/RedisConfig.java +++ b/be/src/main/java/yeonba/be/config/RedisConfig.java @@ -20,7 +20,7 @@ public class RedisConfig { private final ObjectMapper objectMapper; /** - * redis pub/sub 메시지 처리 listender 설정 + * redis pub/sub 메시지 처리 listener 설정 */ @Bean public RedisMessageListenerContainer redisMessageListenerContainer( diff --git a/be/src/main/java/yeonba/be/config/WebSocketConfig.java b/be/src/main/java/yeonba/be/config/WebSocketConfig.java index 3c07824..334d91b 100644 --- a/be/src/main/java/yeonba/be/config/WebSocketConfig.java +++ b/be/src/main/java/yeonba/be/config/WebSocketConfig.java @@ -1,6 +1,5 @@ package yeonba.be.config; -import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocket; @@ -10,7 +9,6 @@ @Configuration @EnableWebSocket -@RequiredArgsConstructor @EnableWebSocketMessageBroker public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {