refactor: 테스트 코드 내 로그인 중복 제거

backend/src/main/java/com/digginroom/digginroom/feedback/controller/FeedbackController.java

@@ -1,32 +1,36 @@
 package com.digginroom.digginroom.feedback.controller;
 
 import com.digginroom.digginroom.controller.Auth;
-import com.digginroom.digginroom.domain.member.Member;
 import com.digginroom.digginroom.feedback.FeedbackService;
 import com.digginroom.digginroom.feedback.dto.FeedbackRequest;
 import com.digginroom.digginroom.feedback.dto.FeedbackResponse;
+import jakarta.validation.Valid;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequiredArgsConstructor
+@RequestMapping("/feedbacks")
 public class FeedbackController {
 
     private final FeedbackService feedbackService;
 
-    @PostMapping("/feedbacks")
-    public ResponseEntity<Void> takeFeedbackFrom(final @Auth Long memberId, final @RequestBody FeedbackRequest feedback) {
+    @PostMapping
+    public ResponseEntity<Void> takeFeedbackFrom(
+            @Auth final Long memberId,
+            @Valid @RequestBody final FeedbackRequest feedback
+    ) {
         feedbackService.accept(memberId, feedback);
         return ResponseEntity.ok().build();
     }
 
-    @GetMapping("/feedbacks")
+    @GetMapping
     public ResponseEntity<List<FeedbackResponse>> showFeedbacks() {
         return ResponseEntity.ok().body(feedbackService.getAll());
     }

backend/src/main/java/com/digginroom/digginroom/feedback/domain/Feedback.java

@@ -14,7 +14,7 @@ public class Feedback extends BaseEntity {
     private Long writerId;
     private String content;
 
-    public Feedback(Long writerId, String content) {
+    public Feedback(final Long writerId, final String content) {
         this.writerId = writerId;
         this.content = content;
     }

backend/src/test/java/com/digginroom/digginroom/config/ControllerTestConfig.java

@@ -0,0 +1,34 @@
+package com.digginroom.digginroom.config;
+
+import static com.digginroom.digginroom.config.DatabaseTableName.MEMBER;
+import static com.digginroom.digginroom.config.DatabaseTableName.MEMBER_GENRE;
+import static com.digginroom.digginroom.config.DatabaseTableName.SPRING_SESSION;
+import static com.digginroom.digginroom.config.DatabaseTableName.SPRING_SESSION_ATTRIBUTES;
+
+import java.util.Set;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@TestConfiguration
+public class ControllerTestConfig {
+
+    @Bean
+    @Profile("default")
+    public DatabaseCleaner getDatabaseCleanerBean() {
+        return new DatabaseCleaner(Set.of());
+    }
+
+    @Bean
+    @Profile("auth")
+    public DatabaseCleaner getAuthDatabaseCleanerBean() {
+        return new DatabaseCleaner(Set.of(MEMBER, MEMBER_GENRE, SPRING_SESSION, SPRING_SESSION_ATTRIBUTES));
+    }
+
+    @Bean
+    @Profile("auth")
+    public WebClient.Builder getWebClientBuilder() {
+        return WebClient.builder();
+    }
+}

backend/src/test/java/com/digginroom/digginroom/util/DatabaseCleaner.java → backend/src/test/java/com/digginroom/digginroom/config/DatabaseCleaner.java

@@ -1,26 +1,33 @@
-package com.digginroom.digginroom.util;
+package com.digginroom.digginroom.config;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import java.util.List;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-@Component
 public class DatabaseCleaner {
 
     @Autowired
     private EntityManager entityManager;
     private List<String> tableNames;
+    private final Set<DatabaseTableName> filterDatabaseTableNames;
+
+    public DatabaseCleaner(final Set<DatabaseTableName> filterDatabaseTableNames) {
+        this.filterDatabaseTableNames = filterDatabaseTableNames;
+    }
 
     @PostConstruct
-    private void setUpDatabaseTableNames() {
+    public void setUpDatabaseTableNames() {
         this.tableNames = getTableNames();
     }
 
     private List<String> getTableNames() {
-        return getTableMetaData().stream().map(this::getTableName).toList();
+        return getTableMetaData().stream()
+                .map(this::getTableName)
+                .filter(tableName -> !filterDatabaseTableNames.contains(DatabaseTableName.of(tableName)))
+                .toList();
     }
 
     @SuppressWarnings("unchecked")

backend/src/test/java/com/digginroom/digginroom/util/DatabaseCleanerExtension.java → backend/src/test/java/com/digginroom/digginroom/config/DatabaseCleanerExtension.java

@@ -1,4 +1,4 @@
-package com.digginroom.digginroom.util;
+package com.digginroom.digginroom.config;
 
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;

backend/src/test/java/com/digginroom/digginroom/config/DatabaseTableName.java

@@ -0,0 +1,29 @@
+package com.digginroom.digginroom.config;
+
+import java.util.Arrays;
+
+public enum DatabaseTableName {
+
+    MEMBER("member"),
+    MEMBER_GENRE("member_genre"),
+    SPRING_SESSION("spring_session"),
+    SPRING_SESSION_ATTRIBUTES("spring_session_attributes"),
+    EMPTY("");
+
+    private final String name;
+
+    DatabaseTableName(final String name) {
+        this.name = name;
+    }
+
+    public static DatabaseTableName of(final String name) {
+        return Arrays.stream(values())
+                .filter(databaseTableName -> databaseTableName.getName().equalsIgnoreCase(name))
+                .findFirst()
+                .orElse(EMPTY);
+    }
+
+    public String getName() {
+        return name;
+    }
+}

backend/src/test/java/com/digginroom/digginroom/controller/CommentControllerTest.java

@@ -1,15 +1,12 @@
 package com.digginroom.digginroom.controller;
 
 import static com.digginroom.digginroom.TestFixture.COMMENT_UPDATE_REQUEST;
-import static com.digginroom.digginroom.TestFixture.MEMBER2_LOGIN_REQUEST;
-import static com.digginroom.digginroom.TestFixture.MEMBER_LOGIN_REQUEST;
 import static com.digginroom.digginroom.TestFixture.나무;
-import static com.digginroom.digginroom.TestFixture.블랙캣;
-import static com.digginroom.digginroom.TestFixture.차이;
 import static com.digginroom.digginroom.TestFixture.파워;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.digginroom.digginroom.TestFixture;
+import com.digginroom.digginroom.controller.mock.MockLoginServer;
 import com.digginroom.digginroom.domain.comment.Comment;
 import com.digginroom.digginroom.domain.member.Member;
 import com.digginroom.digginroom.domain.room.Room;
@@ -19,45 +16,50 @@
 import com.digginroom.digginroom.service.dto.CommentRequest;
 import com.digginroom.digginroom.service.dto.CommentResponse;
 import com.digginroom.digginroom.service.dto.CommentsResponse;
-import com.digginroom.digginroom.service.dto.MemberLoginRequest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import io.restassured.response.Response;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("auth")
 @SuppressWarnings("NonAsciiCharacters")
 class CommentControllerTest extends ControllerTest {
 
-    @Autowired
     private MemberRepository memberRepository;
-    @Autowired
     private RoomRepository roomRepository;
-    @Autowired
     private CommentRepository commentRepository;
-
+    private MockLoginServer mockLoginServer;
     private Room 나무;
-    private Room 차이;
-    private Member 파워;
+
+    @Autowired
+    public CommentControllerTest(MemberRepository memberRepository,
+                                 RoomRepository roomRepository,
+                                 CommentRepository commentRepository,
+                                 ObjectProvider<MockLoginServer> mockLoginServerObjectProvider
+    ) {
+        this.memberRepository = memberRepository;
+        this.roomRepository = roomRepository;
+        this.commentRepository = commentRepository;
+        this.mockLoginServer = mockLoginServerObjectProvider.getObject();
+    }
 
     @Override
     @BeforeEach
     void setUp() {
         super.setUp();
-        파워 = memberRepository.save(파워());
-        memberRepository.save(블랙캣());
         나무 = roomRepository.save(나무());
-        차이 = roomRepository.save(차이());
     }
 
     @Test
     void 댓글을_작성_할_수_있다() {
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         RestAssured.given().log().all()
                 .cookie(cookie)
@@ -75,7 +77,7 @@ void setUp() {
 
     @Test
     void 댓글은_500자_이하여야한다() {
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         RestAssured.given().log().all()
                 .cookie(cookie)
@@ -88,7 +90,7 @@ void setUp() {
 
     @Test
     void 댓글은_1자_이상이여야한다() {
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         RestAssured.given().log().all()
                 .cookie(cookie)
@@ -101,7 +103,7 @@ void setUp() {
 
     @Test
     void 유저는_자신의_댓글을_삭제할_수_있다() {
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         CommentResponse commentResponse = commentRequest(cookie, "댓글");
 
@@ -115,13 +117,12 @@ void setUp() {
 
     @Test
     void 유저는_다른_유저의_댓글을_삭제할_수_없다() {
-        String powerCookie = login(MEMBER_LOGIN_REQUEST);
-        String blackcatCookie = login(MEMBER2_LOGIN_REQUEST);
+        List<String> cookies = mockLoginServer.getCachedLoginValues(port, 2);
 
-        CommentResponse commentResponse = commentRequest(blackcatCookie, "댓글");
+        CommentResponse commentResponse = commentRequest(cookies.get(0), "댓글");
 
         RestAssured.given().log().all()
-                .cookie(powerCookie)
+                .cookie(cookies.get(1))
                 .contentType(ContentType.JSON)
                 .when().delete("/rooms/" + 나무.getId() + "/comments/" + commentResponse.id())
                 .then().log().all()
@@ -130,10 +131,10 @@ void setUp() {
 
     @Test
     void 유저는_존재하지_않은_댓글을_삭제할_수_없다() {
-        String powerCookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         RestAssured.given().log().all()
-                .cookie(powerCookie)
+                .cookie(cookie)
                 .contentType(ContentType.JSON)
                 .when().delete("/rooms/" + 나무.getId() + "/comments/" + Long.MAX_VALUE)
                 .then().log().all()
@@ -142,11 +143,13 @@ void setUp() {
 
     @Test
     void 유저가_마지막으로_본_댓글과_볼_댓글_개수를_전달하지_않으면_최신_댓글_10개의_댓글들을_볼_수_있다() {
+        Member 파워 = memberRepository.save(파워());
+
         for (int i = 1; i <= 15; i++) {
             commentRepository.save(new Comment(나무.getId(), "댓글" + i, 파워));
         }
 
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         List<String> comments = RestAssured.given().log().all()
                 .cookie(cookie)
@@ -167,11 +170,13 @@ void setUp() {
 
     @Test
     void 유저가_마지막으로_본_댓글을_전달하면_더_이전에_작성한_룸의_댓글들을_볼_수_있다() {
+        Member 파워 = memberRepository.save(파워());
+
         for (int i = 1; i <= 15; i++) {
             commentRepository.save(new Comment(나무.getId(), "댓글" + i, 파워));
         }
 
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         List<String> comments = RestAssured.given().log().all()
                 .cookie(cookie)
@@ -190,11 +195,13 @@ void setUp() {
 
     @Test
     void 유저가_볼_댓글_개수를_전달하면_최대_전달한_개수만큼의_룸의_댓글들을_볼_수_있다() {
+        Member 파워 = memberRepository.save(파워());
+
         for (int i = 1; i <= 15; i++) {
             commentRepository.save(new Comment(나무.getId(), "댓글" + i, 파워));
         }
 
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         List<String> comments = RestAssured.given().log().all()
                 .cookie(cookie)
@@ -213,11 +220,13 @@ void setUp() {
 
     @Test
     void 유저가_마지막으로_본_댓글과_볼_댓글_개수를_전달하면_더_이전에_작성한_댓글들을_최대_전달한_개수만큼_볼_수_있다() {
+        Member 파워 = memberRepository.save(파워());
+
         for (int i = 1; i <= 15; i++) {
             commentRepository.save(new Comment(나무.getId(), "댓글" + i, 파워));
         }
 
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
 
         List<String> comments = RestAssured.given().log().all()
                 .cookie(cookie)
@@ -234,14 +243,8 @@ void setUp() {
         assertThat(comments).containsExactly("댓글6", "댓글5");
     }
 
-    private static String login(final MemberLoginRequest loginRequest) {
-        Response response = RestAssured.given().log().all()
-                .body(loginRequest)
-                .contentType(ContentType.JSON)
-                .when()
-                .post("/login");
-
-        return response.header("Set-Cookie");
+    private String login(final int port) {
+        return mockLoginServer.getCachedLoginValue(port);
     }
 
     private CommentResponse commentRequest(final String cookie, final String comment) {
@@ -256,19 +259,19 @@ private CommentResponse commentRequest(final String cookie, final String comment
 
     @Test
     void 유저는_자신의_댓글을_수정할_수_있다() {
-        Comment comment = commentRepository.save(new Comment(나무.getId(), "댓글1", 파워));
-        String cookie = login(MEMBER_LOGIN_REQUEST);
+        String cookie = login(port);
+        CommentResponse comment = commentRequest(cookie, "안녕");
 
         RestAssured.given().log().all()
                 .cookie(cookie)
                 .contentType(ContentType.JSON)
                 .body(COMMENT_UPDATE_REQUEST)
-                .when().patch("/rooms/" + 나무.getId() + "/comments/" + comment.getId())
+                .when().patch("/rooms/" + 나무.getId() + "/comments/" + comment.id())
                 .then().log().all()
                 .statusCode(HttpStatus.OK.value())
                 .extract().as(CommentResponse.class);
 
-        Comment updatedComment = commentRepository.getCommentById(comment.getId());
+        Comment updatedComment = commentRepository.getCommentById(comment.id());
         assertThat(updatedComment.getComment()).isEqualTo(COMMENT_UPDATE_REQUEST.comment());
     }
 }