Refactor/#634: Bookmark 동시성 이슈 해결 및 이벤트 발행

backend/src/main/java/com/mapbefine/mapbefine/bookmark/application/BookmarkCommandService.java

@@ -7,8 +7,11 @@
 import com.mapbefine.mapbefine.bookmark.exception.BookmarkException.BookmarkBadRequestException;
 import com.mapbefine.mapbefine.bookmark.exception.BookmarkException.BookmarkConflictException;
 import com.mapbefine.mapbefine.bookmark.exception.BookmarkException.BookmarkForbiddenException;
+import com.mapbefine.mapbefine.topic.domain.BookmarkAdditionEvent;
+import com.mapbefine.mapbefine.topic.domain.BookmarkDeleteEvent;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,12 +25,16 @@ public class BookmarkCommandService {
 
     private final TopicRepository topicRepository;
 
+    private final ApplicationEventPublisher eventPublisher;
+
     public BookmarkCommandService(
             BookmarkRepository bookmarkRepository,
-            TopicRepository topicRepository
+            TopicRepository topicRepository,
+            ApplicationEventPublisher eventPublisher
     ) {
         this.bookmarkRepository = bookmarkRepository;
         this.topicRepository = topicRepository;
+        this.eventPublisher = eventPublisher;
     }
 
     public void addTopicInBookmark(AuthMember authMember, Long topicId) {
@@ -37,7 +44,7 @@ public void addTopicInBookmark(AuthMember authMember, Long topicId) {
 
         Bookmark bookmark = Bookmark.of(topic, authMember.getMemberId());
         bookmarkRepository.save(bookmark);
-        topic.increaseBookmarkCount();
+        eventPublisher.publishEvent(new BookmarkAdditionEvent(topicId));
     }
 
     private void validateBookmarkDuplication(AuthMember authMember, Long topicId) {
@@ -63,14 +70,12 @@ private void validateBookmarkingPermission(AuthMember authMember, Topic topic) {
         throw new BookmarkForbiddenException(FORBIDDEN_TOPIC_ADD);
     }
 
-    // TODO: 2023/12/03 BookmarkCount의 정합성을 어떻게 맞출 것인가 ? 매번 topic 조회하는 것은 불필요한 행위같아보임
     public void deleteTopicInBookmark(AuthMember authMember, Long topicId) {
         validateBookmarkDeletingPermission(authMember, topicId);
         BookmarkId bookmarkId = BookmarkId.of(topicId, authMember.getMemberId());
 
         bookmarkRepository.deleteById(bookmarkId);
-        Topic topic = getTopicById(topicId);
-        topic.decreaseBookmarkCount();
+        eventPublisher.publishEvent(new BookmarkDeleteEvent(topicId));
     }
 
     private void validateBookmarkDeletingPermission(AuthMember authMember, Long topicId) {

backend/src/main/java/com/mapbefine/mapbefine/topic/application/TopicCommandService.java

@@ -8,13 +8,16 @@
 import com.mapbefine.mapbefine.pin.domain.PinRepository;
 import com.mapbefine.mapbefine.pin.exception.PinException.PinBadRequestException;
 import com.mapbefine.mapbefine.pin.exception.PinException.PinForbiddenException;
+import com.mapbefine.mapbefine.topic.domain.BookmarkAdditionEvent;
+import com.mapbefine.mapbefine.topic.domain.BookmarkDeleteEvent;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
 import com.mapbefine.mapbefine.topic.dto.request.TopicCreateRequest;
 import com.mapbefine.mapbefine.topic.dto.request.TopicMergeRequest;
 import com.mapbefine.mapbefine.topic.dto.request.TopicUpdateRequest;
 import com.mapbefine.mapbefine.topic.exception.TopicException.TopicBadRequestException;
 import com.mapbefine.mapbefine.topic.exception.TopicException.TopicForbiddenException;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;

backend/src/main/java/com/mapbefine/mapbefine/topic/domain/BookmarkAdditionEvent.java

@@ -0,0 +1,4 @@
+package com.mapbefine.mapbefine.topic.domain;
+
+public record BookmarkAdditionEvent(Long topicId) {
+}

backend/src/main/java/com/mapbefine/mapbefine/topic/domain/BookmarkDeleteEvent.java

@@ -0,0 +1,4 @@
+package com.mapbefine.mapbefine.topic.domain;
+
+public record BookmarkDeleteEvent(Long topicId) {
+}

backend/src/main/java/com/mapbefine/mapbefine/topic/domain/Topic.java

@@ -53,7 +53,6 @@ public class Topic extends BaseTimeEntity {
     @ColumnDefault(value = "0")
     private int pinCount = 0;
 
-    // TODO: 2023/12/03 간접 참조에 따른 bookmark Count 정합성을 어떻게 맞출 것인가 ?
     @Column(nullable = false)
     @ColumnDefault(value = "0")
     private int bookmarkCount = 0;
@@ -145,12 +144,4 @@ public void decreasePinCount() {
         pinCount--;
     }
 
-    public void increaseBookmarkCount() {
-        bookmarkCount++;
-    }
-
-    public void decreaseBookmarkCount() {
-        bookmarkCount--;
-    }
-
 }

backend/src/main/java/com/mapbefine/mapbefine/topic/domain/TopicRepository.java

@@ -28,6 +28,15 @@ public interface TopicRepository extends JpaRepository<Topic, Long> {
     @EntityGraph(attributePaths = {"creator"})
     List<Topic> findAllByCreatorId(Long creatorId);
 
+    @Modifying(clearAutomatically = true)
+    @Query("update Topic t set t.bookmarkCount = t.bookmarkCount - 1 where t.id = :topicId")
+    void decreaseBookmarkCountById(@Param("topicId") Long topicId);
+
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("update Topic t set t.bookmarkCount = t.bookmarkCount + 1 where t.id = :topicId")
+    void increaseBookmarkCountById(@Param("topicId") Long topicId);
+
     @Modifying(clearAutomatically = true)
     @Query("update Topic t set t.isDeleted = true where t.id = :topicId")
     void deleteById(@Param("topicId") Long topicId);

backend/src/main/java/com/mapbefine/mapbefine/topic/listener/TopicEventListener.java

@@ -0,0 +1,28 @@
+package com.mapbefine.mapbefine.topic.listener;
+
+import com.mapbefine.mapbefine.topic.domain.BookmarkAdditionEvent;
+import com.mapbefine.mapbefine.topic.domain.BookmarkDeleteEvent;
+import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TopicEventListener {
+
+    private final TopicRepository topicRepository;
+
+    public TopicEventListener(TopicRepository topicRepository) {
+        this.topicRepository = topicRepository;
+    }
+
+    @EventListener
+    public void removeBookmark(BookmarkDeleteEvent event) {
+        topicRepository.decreaseBookmarkCountById(event.topicId());
+    }
+
+    @EventListener
+    public void addBookmark(BookmarkAdditionEvent event) {
+        topicRepository.increaseBookmarkCountById(event.topicId());
+    }
+
+}

backend/src/test/java/com/mapbefine/mapbefine/topic/application/TopicQueryServiceTest.java

@@ -541,8 +541,6 @@ void findAllBestTopics_Success1() {
         Topic topicWithNoBookmark = TopicFixture.createPublicAndAllMembersTopic(member);
         Topic topicWithOneBookmark = TopicFixture.createPublicAndAllMembersTopic(member);
         Topic topicWithTwoBookmark = TopicFixture.createPublicAndAllMembersTopic(member);
-        increaseBookmarkCount(topicWithOneBookmark, 1);
-        increaseBookmarkCount(topicWithTwoBookmark, 2);
 
         topicRepository.save(topicWithNoBookmark);
         topicRepository.save(topicWithOneBookmark);
@@ -654,13 +652,10 @@ void findClusteringPinsByIds_fail() {
     }
 
     private Bookmark saveBookmark(Topic topic, Member member) {
-        return bookmarkRepository.save(Bookmark.of(topic, member.getId()));
-    }
+        Bookmark bookmark = bookmarkRepository.save(Bookmark.of(topic, member.getId()));
+        topicRepository.increaseBookmarkCountById(topic.getId());
 
-    private void increaseBookmarkCount(Topic topic, int count) {
-        for (int i = 0; i < count; i++) {
-            topic.increaseBookmarkCount();
-        }
+        return bookmark;
     }
 
 }