fix: test 내에서 Transactional로 롤백하던 것 DataInitializer로 대체

#1397
woowacourse · Aug 10, 2023 · 0c80f77 · 0c80f77
1 parent a8fd1e2
commit 0c80f77
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/backend/src/main/java/wooteco/prolog/roadmap/application/RecommendedPostService.java b/backend/src/main/java/wooteco/prolog/roadmap/application/RecommendedPostService.java
@@ -56,6 +56,5 @@ private RecommendedPost findPostOrThrow(final Long recommendedId) {
     public void delete(final Long recommendedId) {
         final RecommendedPost recommendedPost = findPostOrThrow(recommendedId);
         recommendedPost.remove();
-        recommendedPostRepository.delete(recommendedPost);
     }
 }
diff --git a/backend/src/main/java/wooteco/prolog/roadmap/domain/RecommendedPost.java b/backend/src/main/java/wooteco/prolog/roadmap/domain/RecommendedPost.java
@@ -5,7 +5,13 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.util.Objects;
 
 @Entity
@@ -34,12 +40,7 @@ public void updateUrl(final String url) {
     }
 
     public void remove() {
-        if (this.keyword == null) {
-            return;
-        }
-
         keyword.getRecommendedPosts().remove(this);
-        this.keyword = null;
     }
 
     public void addKeyword(final Keyword keyword) {

diff --git a/backend/src/test/java/wooteco/prolog/roadmap/application/RecommendedPostServiceTest.java b/backend/src/test/java/wooteco/prolog/roadmap/application/RecommendedPostServiceTest.java
@@ -1,11 +1,12 @@
 package wooteco.prolog.roadmap.application;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
+import wooteco.prolog.common.DataInitializer;
 import wooteco.prolog.roadmap.application.dto.RecommendedRequest;
 import wooteco.prolog.roadmap.application.dto.RecommendedUpdateRequest;
 import wooteco.prolog.roadmap.domain.Keyword;
@@ -21,7 +22,6 @@
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 @SpringBootTest
-@Transactional
 class RecommendedPostServiceTest {
 
     @Autowired
@@ -33,6 +33,10 @@ class RecommendedPostServiceTest {
     @Autowired
     private SessionRepository sessionRepository;
 
+    @Autowired
+    private DataInitializer dataInitializer;
+
+
     private Keyword keyword;
 
     @BeforeEach
@@ -41,6 +45,11 @@ public void init() {
         this.keyword = keywordRepository.save(Keyword.createKeyword("이름", "설명", 1, 1, session.getId(), null));
     }
 
+    @AfterEach
+    public void removeAll() {
+        dataInitializer.execute();
+    }
+
     @Test
     @DisplayName("추천 포스트 생성 테스트")
     void create() {
@@ -81,7 +90,7 @@ void update() {
     @DisplayName("추천 포스트 삭제 테스트")
     void delete() {
         //given
-        final RecommendedRequest request = new RecommendedRequest("https//:example.com");
+        final RecommendedRequest request = new RecommendedRequest("https://example.com");
         Long recommendedPostId = recommendedPostService.create(keyword.getId(), request);
 
         //when

diff --git a/backend/src/test/java/wooteco/prolog/roadmap/domain/RecommendedPostTest.java b/backend/src/test/java/wooteco/prolog/roadmap/domain/RecommendedPostTest.java
@@ -1,6 +1,5 @@
 package wooteco.prolog.roadmap.domain;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -13,21 +12,15 @@ class RecommendedPostTest {
     @DisplayName("삭제 기능 테스트")
     void remove() {
         //given
-        final RecommendedPost recommendedPost = new RecommendedPost(1L, "https://example.com", null);
         final Keyword keyword = Keyword.createKeyword("이름", "설명", 1, 1, 1L, null);
+        final RecommendedPost recommendedPost = new RecommendedPost(1L, "https://example.com", null);
         recommendedPost.addKeyword(keyword);
 
         //when
-        final Keyword before = recommendedPost.getKeyword();
         recommendedPost.remove();
-        final Keyword after = recommendedPost.getKeyword();
 
         //then
-        Assertions.assertAll(
-            () -> assertThat(before).isNotNull(),
-            () -> assertThat(after).isNull()
-        );
-
+        assertThat(keyword.getRecommendedPosts()).isEmpty();
     }
 
     @Test