refactor: Choice에서 ChoiceContent를 지연 로딩한다

src/main/java/life/offonoff/ab/application/service/CommentService.java

@@ -24,8 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 import static life.offonoff.ab.application.service.common.LengthInfo.COMMENT_CONTENT;
 
 @RequiredArgsConstructor
@@ -127,8 +125,8 @@ private void validateContent(String content) {
 
     //== like ==//
     @Transactional
-    public CommentReactionResponse likeCommentForMember(final Long memberId, final Long commentId, final Boolean enable) {
-        Member liker = findMember(memberId);
+    public CommentReactionResponse likeCommentByMember(final Long likerId, final Long commentId, final Boolean enable) {
+        Member liker = findMember(likerId);
         Comment comment = findById(commentId);
 
         if (enable) {
@@ -138,21 +136,15 @@ public CommentReactionResponse likeCommentForMember(final Long memberId, final L
     }
 
     private CommentReactionResponse doLike(Member liker, Comment comment) {
-
         liker.cancelHateIfExists(comment);
-        Optional<LikedComment> optionalLikedComment = liker.likeCommentIfNew(comment);
-
-        publishCommentLikedEventIfPresent(optionalLikedComment);
-
-        return new CommentReactionResponse(comment.getLikeCount(), comment.getHateCount(), true, false);
+        liker.likeCommentIfNew(comment)
+                .ifPresent(this::afterLike);
+        return new CommentReactionResponse(
+                comment.getLikeCount(), comment.getHateCount(), true, false);
     }
 
-    private void publishCommentLikedEventIfPresent(Optional<LikedComment> optional) {
-        if (optional.isPresent()) {
-            LikedComment likedComment = optional.get();
-
-            eventPublisher.publishEvent(new CommentLikedEvent(likedComment));
-        }
+    private void afterLike(LikedComment likedComment) {
+        eventPublisher.publishEvent(new CommentLikedEvent(likedComment));
     }
 
     private CommentReactionResponse cancelLike(Member liker, Comment comment) {

src/main/java/life/offonoff/ab/domain/keyword/Keyword.java

@@ -4,13 +4,15 @@
 import life.offonoff.ab.domain.topic.Topic;
 import life.offonoff.ab.domain.topic.TopicSide;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Getter
+@EqualsAndHashCode(of = {"name", "side"})
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Table(uniqueConstraints = {
@@ -37,9 +39,4 @@ public Keyword(String name, TopicSide side) {
     public void addTopic(Topic topic) {
         this.topics.add(topic);
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        return id.equals(((Keyword) obj).getId());
-    }
 }

src/main/java/life/offonoff/ab/domain/topic/Topic.java

@@ -37,7 +37,7 @@ public class Topic extends BaseEntity {
     @JoinColumn(name = "topic_content_id")
     private TopicContent content;
 
-    @OneToMany(mappedBy = "topic", cascade = CascadeType.REMOVE)
+    @OneToMany(mappedBy = "topic", cascade = CascadeType.ALL)
     private List<Choice> choices = new ArrayList<>();
 
     @Enumerated(EnumType.STRING)

src/main/java/life/offonoff/ab/domain/topic/choice/Choice.java

@@ -4,6 +4,7 @@
 import life.offonoff.ab.domain.BaseEntity;
 import life.offonoff.ab.domain.topic.Topic;
 import life.offonoff.ab.domain.topic.choice.content.ChoiceContent;
+import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponse;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -23,7 +24,7 @@ public class Choice extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private ChoiceOption choiceOption;
 
-    @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name = "choice_content_id")
     private ChoiceContent content;
 
@@ -50,4 +51,11 @@ public void increaseVoteCount() {
     public void decreaseVoteCount() {
         this.voteCount--;
     }
+
+    public ChoiceContentResponse generateContentResponse() {
+        if (content == null) {
+            return null;
+        }
+        return content.toResponse();
+    }
 }

src/main/java/life/offonoff/ab/domain/topic/choice/content/ChoiceContent.java

@@ -2,6 +2,7 @@
 
 import jakarta.persistence.*;
 import life.offonoff.ab.domain.BaseEntity;
+import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponse;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -15,4 +16,6 @@ public abstract class ChoiceContent extends BaseEntity {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
+    public abstract ChoiceContentResponse toResponse();
 }

src/main/java/life/offonoff/ab/domain/topic/choice/content/ImageTextChoiceContent.java

@@ -1,6 +1,10 @@
 package life.offonoff.ab.domain.topic.choice.content;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponse;
+import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponse.ImageTextChoiceContentResponse;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -18,4 +22,9 @@ public ImageTextChoiceContent(String imageUrl, String text) {
         this.imageUrl = imageUrl;
         this.text = text;
     }
+
+    @Override
+    public ChoiceContentResponse toResponse() {
+        return new ImageTextChoiceContentResponse(imageUrl, text);
+    }
 }

src/main/java/life/offonoff/ab/web/CommentController.java

@@ -45,7 +45,7 @@ public ResponseEntity<CommentReactionResponse> likeComment(
             @PathVariable Long commentId,
             @RequestParam Boolean enable
     ) {
-        return ResponseEntity.ok(commentService.likeCommentForMember(memberId, commentId, enable));
+        return ResponseEntity.ok(commentService.likeCommentByMember(memberId, commentId, enable));
     }
 
     @PostMapping("/{commentId}/hate")

src/main/java/life/offonoff/ab/web/response/topic/choice/ChoiceResponse.java

@@ -2,16 +2,15 @@
 
 import life.offonoff.ab.domain.topic.choice.Choice;
 import life.offonoff.ab.domain.topic.choice.ChoiceOption;
-import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponseFactory;
-import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponseFactory.ChoiceContentResponse;
+import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponse;
 import lombok.Getter;
 
 @Getter
 public class ChoiceResponse {
 
-    private Long choiceId;
-    private ChoiceContentResponse content;
-    private ChoiceOption choiceOption;
+    private final Long choiceId;
+    private final ChoiceContentResponse content;
+    private final ChoiceOption choiceOption;
 
     public ChoiceResponse(Long choiceId, ChoiceContentResponse content, ChoiceOption choiceOption) {
         this.choiceId = choiceId;
@@ -22,7 +21,7 @@ public ChoiceResponse(Long choiceId, ChoiceContentResponse content, ChoiceOption
     public static ChoiceResponse from(Choice choice) {
         return new ChoiceResponse(
                 choice.getId(),
-                ChoiceContentResponseFactory.create(choice.getContent()),
+                choice.generateContentResponse(),
                 choice.getChoiceOption());
     }
 }

src/main/java/life/offonoff/ab/web/response/topic/choice/ChoiceResponseWithCount.java

@@ -1,17 +1,16 @@
 package life.offonoff.ab.web.response.topic.choice;
 
 import life.offonoff.ab.domain.topic.choice.Choice;
-import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponseFactory;
 import lombok.Getter;
 
 @Getter
 public class ChoiceResponseWithCount extends ChoiceResponse {
 
-    private int voteCount;
+    private final int voteCount;
 
     public ChoiceResponseWithCount(Choice choice) {
         super(choice.getId(),
-              ChoiceContentResponseFactory.create(choice.getContent()),
+              choice.generateContentResponse(),
               choice.getChoiceOption());
 
         this.voteCount = choice.getVoteCount();

src/main/java/life/offonoff/ab/web/response/topic/choice/content/ChoiceContentResponse.java

@@ -0,0 +1,15 @@
+package life.offonoff.ab.web.response.topic.choice.content;
+
+import life.offonoff.ab.domain.topic.choice.content.ChoiceContentType;
+
+public interface ChoiceContentResponse {
+    record ImageTextChoiceContentResponse(
+            String imageUrl,
+            String text,
+            String type
+    ) implements ChoiceContentResponse {
+        public ImageTextChoiceContentResponse(String imageUrl, String text) {
+            this(imageUrl, text, ChoiceContentType.IMAGE_WITH_TEXT_CHOICE_CONTENT);
+        }
+    }
+}

src/test/java/life/offonoff/ab/application/service/CommentServiceTest.java

@@ -289,7 +289,7 @@ void like_with_cancel_hate() {
         liker.hateCommentIfNew(comment);
 
         // when
-        commentService.likeCommentForMember(liker.getId(), comment.getId(), true);
+        commentService.likeCommentByMember(liker.getId(), comment.getId(), true);
 
         // then
         assertAll(
@@ -382,7 +382,7 @@ private Long createRandomMember() {
     }
 
     private Long createRandomTopic() {
-        Topic topic = createTopic(0, TopicSide.TOPIC_B);
+        Topic topic = createRandomTopicByRandomMember(TopicSide.TOPIC_B);
         em.persist(topic);
         return topic.getId();
     }

src/test/java/life/offonoff/ab/application/service/TopicServiceTest.java

@@ -14,15 +14,15 @@
 import life.offonoff.ab.exception.DuplicateVoteOptionException;
 import life.offonoff.ab.exception.LengthInvalidException;
 import life.offonoff.ab.repository.ChoiceRepository;
-import life.offonoff.ab.repository.keyword.KeywordRepository;
 import life.offonoff.ab.repository.VoteRepository;
 import life.offonoff.ab.repository.comment.CommentRepository;
+import life.offonoff.ab.repository.keyword.KeywordRepository;
 import life.offonoff.ab.repository.member.MemberRepository;
 import life.offonoff.ab.repository.topic.TopicRepository;
-import life.offonoff.ab.web.response.topic.choice.ChoiceResponse;
-import life.offonoff.ab.web.response.topic.choice.content.ImageTextChoiceContentResponse;
 import life.offonoff.ab.web.response.KeywordResponse;
 import life.offonoff.ab.web.response.topic.TopicResponse;
+import life.offonoff.ab.web.response.topic.choice.ChoiceResponse;
+import life.offonoff.ab.web.response.topic.choice.content.ChoiceContentResponse.ImageTextChoiceContentResponse;
 import lombok.Builder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -42,8 +42,6 @@
 import java.util.Optional;
 
 import static life.offonoff.ab.domain.TestEntityUtil.*;
-import static life.offonoff.ab.domain.TestEntityUtil.TestKeyword;
-import static life.offonoff.ab.domain.TestEntityUtil.TestMember;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
@@ -457,8 +455,8 @@ public TopicResponse createResponse() {
                 choiceResponses.add(new ChoiceResponse(
                         (long) i,
                         new ImageTextChoiceContentResponse(
-                                ((ImageTextChoiceContentCreateRequest) choice.choiceContentRequest()).text(),
-                                ((ImageTextChoiceContentCreateRequest) choice.choiceContentRequest()).imageUrl()),
+                                ((ImageTextChoiceContentCreateRequest) choice.choiceContentRequest()).imageUrl(),
+                                ((ImageTextChoiceContentCreateRequest) choice.choiceContentRequest()).text()),
                         choice.choiceOption()));
             }
 

src/test/java/life/offonoff/ab/application/service/event/topic/TopicEventHandlerTest.java

@@ -8,10 +8,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.transaction.annotation.Transactional;
 
 import static life.offonoff.ab.domain.TestEntityUtil.*;
 import static org.mockito.Mockito.*;
 
+@Transactional
 @SpringBootTest
 class TopicEventHandlerTest {
 

src/test/java/life/offonoff/ab/application/service/vote/VotingTopicContainerServiceIntegrationTest.java

@@ -14,17 +14,23 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
-import static life.offonoff.ab.domain.TestEntityUtil.*;
-import static life.offonoff.ab.domain.topic.TopicStatus.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.*;
+import static life.offonoff.ab.domain.TestEntityUtil.TestMember;
+import static life.offonoff.ab.domain.TestEntityUtil.TestTopic;
+import static life.offonoff.ab.domain.topic.TopicStatus.CLOSED;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mockito.Mockito.*;
 
+@Transactional
 @SpringBootTest
 @Import(TestVoteConfig.TestContainerVotingTopicConfig.class)
 public class VotingTopicContainerServiceIntegrationTest {
@@ -45,7 +51,7 @@ public class VotingTopicContainerServiceIntegrationTest {
 
     @Test
     @DisplayName("투표가 끝난 토픽은 status 수정 & Voting Result 매핑")
-    void endVote_then_status_voting_result() {
+    void endVote_then_status_voting_result() throws InterruptedException {
         // given
         LocalDateTime deadline = LocalDateTime.now();
         Topic topic = TestTopic.builder()
@@ -59,7 +65,19 @@ void endVote_then_status_voting_result() {
         when(container.getVotingEnded(criteria)).thenReturn(votingTopics);
 
         // when
-        votingTopicContainerService.endVote(criteria);
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        CountDownLatch latch = new CountDownLatch(2);
+
+        executorService.execute(() -> {
+            votingTopicContainerService.endVote(criteria);
+            latch.countDown();
+        });
+
+        executorService.execute(() -> {
+            votingTopicContainerService.endVote(criteria);
+            latch.countDown();
+        });
+        latch.await();
 
         // then
         assertThat(topic.getStatus()).isEqualTo(CLOSED);