Style: createChatRoom() 수정

f-lab-edu · Feb 17, 2024 · 45e60d7 · 45e60d7
1 parent dbc5b46
commit 45e60d7
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 40 deletions.
diff --git a/src/main/java/com/stoury/config/sse/SseEmitters.java b/src/main/java/com/stoury/config/sse/SseEmitters.java
@@ -1,6 +1,7 @@
 package com.stoury.config.sse;
 
 import com.stoury.dto.chat.ChatMessageResponse;
+import com.stoury.exception.chat.ChatMessageSendException;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
@@ -15,17 +16,18 @@
 @Slf4j
 public class SseEmitters {
     public static final long TIMEOUT = 60 * 1000L;
+    public static final String ROOM_ID_NULL_MESSAGE = "Room id cannot be null";
     private static final Map<Long, SseEmitter> chatRoomEmitters = new ConcurrentHashMap<>();
 
-    public SseEmitter get(Long roomId){
-        Long roomIdNotNull = Objects.requireNonNull(roomId, "Room id cannot be null");
+    public SseEmitter get(Long roomId) {
+        Long roomIdNotNull = Objects.requireNonNull(roomId, ROOM_ID_NULL_MESSAGE);
 
         return chatRoomEmitters.computeIfAbsent(roomIdNotNull, key -> chatRoomEmitter(roomIdNotNull));
     }
 
     @NotNull
     private SseEmitter chatRoomEmitter(Long roomId) {
-        Long roomIdNotNull = Objects.requireNonNull(roomId, "Room id cannot be null");
+        Long roomIdNotNull = Objects.requireNonNull(roomId, ROOM_ID_NULL_MESSAGE);
 
         SseEmitter emitter = new SseEmitter(TIMEOUT);
         emitter.onCompletion(() -> chatRoomEmitters.remove(roomIdNotNull, emitter));
@@ -34,7 +36,7 @@ private SseEmitter chatRoomEmitter(Long roomId) {
     }
 
     public void broadCast(Long roomId, ChatMessageResponse chatMessage) {
-        Long roomIdNotNull = Objects.requireNonNull(roomId, "Room id cannot be null");
+        Long roomIdNotNull = Objects.requireNonNull(roomId, ROOM_ID_NULL_MESSAGE);
 
         log.info("Trying to connect to {}", roomId);
         SseEmitter emitter = get(roomIdNotNull);
@@ -43,7 +45,7 @@ public void broadCast(Long roomId, ChatMessageResponse chatMessage) {
                     .name("ChatMessage")
                     .data(chatMessage));
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ChatMessageSendException(e);
         }
         log.info("Established");
     }

diff --git a/src/main/java/com/stoury/event/EventHandlers.java b/src/main/java/com/stoury/event/EventHandlers.java
@@ -3,7 +3,7 @@
 import com.stoury.domain.ChatMessage;
 import com.stoury.domain.ChatRoom;
 import com.stoury.domain.Member;
-import com.stoury.exception.ChatRoomSearchException;
+import com.stoury.exception.chat.ChatRoomSearchException;
 import com.stoury.exception.member.MemberSearchException;
 import com.stoury.repository.ChatMessageRepository;
 import com.stoury.repository.ChatRoomRepository;

diff --git a/src/main/java/com/stoury/exception/chat/ChatMessageSendException.java b/src/main/java/com/stoury/exception/chat/ChatMessageSendException.java
@@ -0,0 +1,7 @@
+package com.stoury.exception.chat;
+
+public class ChatMessageSendException extends RuntimeException {
+    public ChatMessageSendException(Throwable cause) {
+        super("Failed to send chatting message.", cause);
+    }
+}
diff --git a/...ry/exception/ChatRoomSearchException.java → ...ception/chat/ChatRoomSearchException.java b/...ry/exception/ChatRoomSearchException.java → ...ception/chat/ChatRoomSearchException.java
@@ -1,4 +1,4 @@
-package com.stoury.exception;
+package com.stoury.exception.chat;
 
 public class ChatRoomSearchException extends RuntimeException{
 }
diff --git a/...ury/exception/CommentCreateException.java → ...ption/comment/CommentCreateException.java b/...ury/exception/CommentCreateException.java → ...ption/comment/CommentCreateException.java
@@ -1,4 +1,4 @@
-package com.stoury.exception;
+package com.stoury.exception.comment;
 
 public class CommentCreateException extends RuntimeException {
     public CommentCreateException(String message) {

diff --git a/...ury/exception/CommentSearchException.java → ...ption/comment/CommentSearchException.java b/...ury/exception/CommentSearchException.java → ...ption/comment/CommentSearchException.java
@@ -1,4 +1,4 @@
-package com.stoury.exception;
+package com.stoury.exception.comment;
 
 public class CommentSearchException extends RuntimeException {
     public CommentSearchException() {

diff --git a/src/main/java/com/stoury/service/ChatService.java b/src/main/java/com/stoury/service/ChatService.java
@@ -7,7 +7,7 @@
 import com.stoury.dto.chat.ChatMessageResponse;
 import com.stoury.dto.chat.ChatRoomResponse;
 import com.stoury.event.ChatMessageSaveEvent;
-import com.stoury.exception.ChatRoomSearchException;
+import com.stoury.exception.chat.ChatRoomSearchException;
 import com.stoury.exception.authentication.NotAuthorizedException;
 import com.stoury.exception.member.MemberSearchException;
 import com.stoury.repository.ChatMessageRepository;
@@ -46,20 +46,14 @@ public ChatRoomResponse createChatRoom(Long senderId, Long receiverId) {
         return ChatRoomResponse.from(savedChatRoom);
     }
 
-    @Transactional
-    protected ChatMessageResponse createChatMessage(Long senderId, Long chatRoomId, String textContent) {
-        Long senderIdNotNull = Objects.requireNonNull(senderId);
-        Long chatRoomIdNotNull = Objects.requireNonNull(chatRoomId);
-        if (!StringUtils.hasText(textContent)) {
-            throw new IllegalArgumentException("Message content cannot be empty.");
-        }
+    protected ChatMessageResponse publishChatMessageSaveEvent(Long senderId, Long chatRoomId, String textContent) {
+        Member sender = memberRepository.findById(senderId).orElseThrow(MemberSearchException::new);
 
-        Member sender = memberRepository.findById(senderIdNotNull).orElseThrow(MemberSearchException::new);
         LocalDateTime createdAt = LocalDateTime.now();
         ChatMessageSaveEvent chatMessageSaveEvent = ChatMessageSaveEvent.builder()
                 .source(this)
-                .memberId(senderIdNotNull)
-                .chatRoomId(chatRoomIdNotNull)
+                .memberId(senderId)
+                .chatRoomId(chatRoomId)
                 .textContent(textContent)
                 .createdAt(createdAt)
                 .build();
@@ -90,7 +84,11 @@ public List<ChatMessageResponse> getPreviousChatMessages(Long memberId, Long cha
     @Transactional
     public ChatMessageResponse sendChatMessage(Long memberId, Long chatRoomId, String textContent) {
         checkIfRoomMember(memberId, chatRoomId);
-        ChatMessageResponse chatMessage = createChatMessage(memberId, chatRoomId, textContent);
+        if (!StringUtils.hasText(textContent)) {
+            throw new IllegalArgumentException("Message content cannot be empty.");
+        }
+
+        ChatMessageResponse chatMessage = publishChatMessageSaveEvent(memberId, chatRoomId, textContent);
         sseEmitters.broadCast(chatRoomId, chatMessage);
         return chatMessage;
     }

diff --git a/src/main/java/com/stoury/service/CommentService.java b/src/main/java/com/stoury/service/CommentService.java
@@ -5,8 +5,8 @@
 import com.stoury.domain.Member;
 import com.stoury.dto.comment.ChildCommentResponse;
 import com.stoury.dto.comment.CommentResponse;
-import com.stoury.exception.CommentCreateException;
-import com.stoury.exception.CommentSearchException;
+import com.stoury.exception.comment.CommentCreateException;
+import com.stoury.exception.comment.CommentSearchException;
 import com.stoury.exception.authentication.NotAuthorizedException;
 import com.stoury.exception.feed.FeedSearchException;
 import com.stoury.exception.member.MemberSearchException;

diff --git a/src/test/groovy/com/stoury/service/ChatServiceTest.groovy b/src/test/groovy/com/stoury/service/ChatServiceTest.groovy
@@ -47,25 +47,11 @@ class ChatServiceTest extends Specification {
         memerRepository.findById(sender.id) >> Optional.of(sender)
         chatRoomRepository.findById(chatRoom.id) >> Optional.of(chatRoom)
         when:
-        chatService.createChatMessage(sender.id, chatRoom.id, "Hello, World!")
+        chatService.publishChatMessageSaveEvent(sender.id, chatRoom.id, "Hello, World!")
         then:
         1 * eventPublisher.publishEvent(_ as ChatMessageSaveEvent)
     }
 
-    def "채팅메시지 생성불가, 메시지 없음"() {
-        given:
-        def sender = new Member("sender@email.com", "pwdpwd123", "sender", null)
-        def chatRoom = new ChatRoom(List.of(sender, Mock(Member)))
-        sender.id = 1
-        chatRoom.id = 1
-        memerRepository.findById(sender.id) >> Optional.of(sender)
-        chatRoomRepository.findById(chatRoom.id) >> Optional.of(chatRoom)
-        when:
-        chatService.createChatMessage(sender.id, chatRoom.id, "")
-        then:
-        thrown(IllegalArgumentException)
-    }
-
     def "이전 채팅 불러오기"() {
         given:
         def sender1 = new Member("sender1@email.com", "pwdpwd123", "sender1", null)
@@ -156,4 +142,18 @@ class ChatServiceTest extends Specification {
         then:
         thrown(NotAuthorizedException)
     }
+
+    def "채팅전송 불가, 메시지 없음"() {
+        given:
+        def sender = new Member("sender@email.com", "pwdpwd123", "sender", null)
+        def chatRoom = new ChatRoom(List.of(sender, Mock(Member)))
+        sender.id = 1
+        chatRoom.id = 1
+        memerRepository.findById(sender.id) >> Optional.of(sender)
+        chatRoomRepository.findById(chatRoom.id) >> Optional.of(chatRoom)
+        when:
+        chatService.sendChatMessage(sender.id, chatRoom.id, "")
+        then:
+        thrown(IllegalArgumentException)
+    }
 }
diff --git a/src/test/groovy/com/stoury/service/CommentServiceTest.groovy b/src/test/groovy/com/stoury/service/CommentServiceTest.groovy
@@ -4,8 +4,8 @@ import com.stoury.domain.Comment
 import com.stoury.domain.Feed
 import com.stoury.domain.Member
 import com.stoury.dto.comment.CommentResponse
-import com.stoury.exception.CommentCreateException
-import com.stoury.exception.CommentSearchException
+import com.stoury.exception.comment.CommentCreateException
+import com.stoury.exception.comment.CommentSearchException
 import com.stoury.repository.CommentRepository
 import com.stoury.repository.FeedRepository
 import com.stoury.repository.MemberRepository