refactor: 채팅보내기 api 리팩토링

ConnectCo · Feb 1, 2025 · f9cba1f · f9cba1f
1 parent 7d0a8c5
commit f9cba1f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/main/java/com/connectCo/domain/chat/entity/ChatRoom.java b/src/main/java/com/connectCo/domain/chat/entity/ChatRoom.java
@@ -35,4 +35,10 @@ public class ChatRoom extends BaseEntity {
 
     @OneToMany(mappedBy = "chatRoom", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Chat> chats = new ArrayList<>();
+
+    public void updateRecentMessage(String recentMessage, LocalDateTime recentMessageTime) {
+        this.recentMessage = recentMessage;
+        this.recentMessageTime = recentMessageTime;
+    }
+
 }
diff --git a/src/main/java/com/connectCo/domain/chat/service/ChatServiceImpl.java b/src/main/java/com/connectCo/domain/chat/service/ChatServiceImpl.java
@@ -30,16 +30,31 @@ public class ChatServiceImpl implements ChatService {
     @Override
     @Transactional
     public ChatResponse createChat(CreateChatRequest request) {
-        ChatRoom chatRoom = chatRoomRepository.findById(request.getChatRoomId())
-                .orElseGet(()->chatRoomService.createChatRoom(request.getSenderId(), request.getReceiverId()));
+        ChatRoom chatRoom = findOrCreateChatRoom(request);
+        Chat chat = saveChat(request, chatRoom);
+        updateChatRoomRecentMessage(chatRoom, chat);
+        sendPushNotificationToReceiver(request);
 
+        return chatMapper.toChatResponse(chat);
+    }
+
+    private ChatRoom findOrCreateChatRoom(CreateChatRequest request) {
+        return chatRoomRepository.findById(request.getChatRoomId())
+                .orElseGet(() -> chatRoomService.createChatRoom(request.getSenderId(), request.getReceiverId()));
+    }
+
+    private Chat saveChat(CreateChatRequest request, ChatRoom chatRoom) {
         Chat chat = chatMapper.toChat(request, chatRoom);
-        chatRepository.save(chat);
+        return chatRepository.save(chat);
+    }
 
-        Member member = memberRepository.findById(request.getReceiverId()).orElseThrow(()->new CustomApiException(ErrorCode.USER_NOT_FOUND));
+    private void updateChatRoomRecentMessage(ChatRoom chatRoom, Chat chat) {
+        chatRoom.updateRecentMessage(chat.getMessage(), chat.getCreatedAt());
+        chatRoomRepository.save(chatRoom);
+    }
 
+    private void sendPushNotificationToReceiver(CreateChatRequest request) {
+        Member member = memberRepository.findById(request.getReceiverId()).orElseThrow(()->new CustomApiException(ErrorCode.USER_NOT_FOUND));
         fcmService.sendPushNotification(member.getFcmToken(), "새로운 메시지", request.getMessage());
-
-        return chatMapper.toChatResponse(chat);
     }
 }