fix: 채팅방 수정

geneaky · Oct 8, 2024 · cdf64ec · cdf64ec
1 parent 10fe133
commit cdf64ec
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/...n/java/toy/bookchat/bookchat/db_module/chatroom/repository/ChatRoomHashTagRepository.java b/...n/java/toy/bookchat/bookchat/db_module/chatroom/repository/ChatRoomHashTagRepository.java
@@ -1,9 +1,14 @@
 package toy.bookchat.bookchat.db_module.chatroom.repository;
 
 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 toy.bookchat.bookchat.db_module.chatroom.ChatRoomHashTagEntity;
 
 public interface ChatRoomHashTagRepository extends JpaRepository<ChatRoomHashTagEntity, Long> {
 
-  void deleteAllByChatRoomId(Long chatRoomId);
+  @Modifying
+  @Query("delete from ChatRoomHashTagEntity c where c.chatRoomId = :chatRoomId")
+  void deleteByChatRoomId(@Param("chatRoomId") Long chatRoomId);
 }
diff --git a/src/main/java/toy/bookchat/bookchat/domain/chatroom/api/v1/request/ChatRoomRequest.java b/src/main/java/toy/bookchat/bookchat/domain/chatroom/api/v1/request/ChatRoomRequest.java
@@ -48,7 +48,7 @@ public void validate() {
       return;
     }
 
-    if (!tags.isEmpty()) {
+    if (tags != null && !tags.isEmpty()) {
       this.roomName = null;
       this.title = null;
       this.isbn = null;

diff --git a/src/main/java/toy/bookchat/bookchat/domain/chatroom/service/ChatRoomHashTagCleaner.java b/src/main/java/toy/bookchat/bookchat/domain/chatroom/service/ChatRoomHashTagCleaner.java
@@ -13,6 +13,6 @@ public ChatRoomHashTagCleaner(ChatRoomHashTagRepository chatRoomHashTagRepositor
   }
 
   public void cleanAll(Long chatRoomId) {
-    chatRoomHashTagRepository.deleteAllByChatRoomId(chatRoomId);
+    chatRoomHashTagRepository.deleteByChatRoomId(chatRoomId);
   }
 }
diff --git a/src/main/java/toy/bookchat/bookchat/domain/chatroom/service/ChatRoomService.java b/src/main/java/toy/bookchat/bookchat/domain/chatroom/service/ChatRoomService.java
@@ -5,7 +5,6 @@
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 import java.util.UUID;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Pageable;
@@ -32,11 +31,11 @@
 import toy.bookchat.bookchat.domain.participant.service.ParticipantCleaner;
 import toy.bookchat.bookchat.domain.participant.service.ParticipantReader;
 import toy.bookchat.bookchat.domain.participant.service.ParticipantValidator;
-import toy.bookchat.bookchat.infrastructure.s3.StorageService;
 import toy.bookchat.bookchat.domain.user.User;
 import toy.bookchat.bookchat.domain.user.service.UserReader;
 import toy.bookchat.bookchat.infrastructure.rabbitmq.MessagePublisher;
 import toy.bookchat.bookchat.infrastructure.rabbitmq.message.NotificationMessage;
+import toy.bookchat.bookchat.infrastructure.s3.StorageService;
 
 @Service
 public class ChatRoomService {
@@ -151,8 +150,7 @@ public void reviseChatRoom(ReviseChatRoomRequest request, MultipartFile chatRoom
     if (request.tagExistent()) {
       chatRoomHashTagCleaner.cleanAll(chatRoom.getId());
 
-      List<HashTag> hashTags = request.createHashTags();
-      for (HashTag hashTag : hashTags) {
+      for (HashTag hashTag : request.createHashTags()) {
         HashTag storedHashTag = hashTagAppender.append(hashTag);
         chatRoomHashTagAppender.append(chatRoom.getId(), storedHashTag);
       }