test: 뉴스 Controller 테스트코드 수정 (#112)

SangkiHan · web-flow · commit c67d8a947e77 · 2025-02-07T21:23:46.000+09:00
diff --git a/src/main/java/org/myteam/server/board/controller/BoardController.java b/src/main/java/org/myteam/server/board/controller/BoardController.java
@@ -74,24 +74,24 @@ public ResponseEntity<ResponseDto<BoardResponse>> getBoard(@PathVariable final L
         return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "게시글 조회 성공", response));
     }
 
-    /**
-     * 게시글 목록 조회
-     */
-    @GetMapping
-    public ResponseEntity<ResponseDto<BoardListResponse>> getBoardList(@ModelAttribute @Valid BoardRequest request) {
-        return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "게시글 목록 조회",
-                boardReadService.getBoardList(request.toServiceRequest())));
-    }
-
-    /**
-     * 내가 쓴 게시글 목록 조회 (테스트용입니다)
-     */
-    @GetMapping("/my")
-    public ResponseEntity<ResponseDto<BoardListResponse>> getMyBoardList(
-            @ModelAttribute @Valid BoardRequest request,
-            @AuthenticationPrincipal final CustomUserDetails userDetails) {
-
-        return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "내가 쓴 게시글 목록 조회",
-                boardReadService.getMyBoardList(request.toServiceRequest(), userDetails.getPublicId())));
-    }
-}
+    // /**
+    //  * 게시글 목록 조회
+    //  */
+    // @GetMapping
+    // public ResponseEntity<ResponseDto<BoardListResponse>> getBoardList(@ModelAttribute @Valid BoardRequest request) {
+    //     return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "게시글 목록 조회",
+    //             boardReadService.getBoardList(request.toServiceRequest())));
+    // }
+    //
+    // /**
+    //  * 내가 쓴 게시글 목록 조회 (테스트용입니다)
+    //  */
+    // @GetMapping("/my")
+    // public ResponseEntity<ResponseDto<BoardListResponse>> getMyBoardList(
+    //         @ModelAttribute @Valid BoardRequest request,
+    //         @AuthenticationPrincipal final CustomUserDetails userDetails) {
+    //
+    //     return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "내가 쓴 게시글 목록 조회",
+    //             boardReadService.getMyBoardList(request.toServiceRequest(), userDetails.getPublicId())));
+    // }
+}
diff --git a/src/main/java/org/myteam/server/news/news/dto/controller/request/NewsRequest.java b/src/main/java/org/myteam/server/news/news/dto/controller/request/NewsRequest.java
@@ -9,8 +9,10 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Getter
+@Setter
 @NoArgsConstructor
 public class NewsRequest extends PageInfoRequest {
 
diff --git a/src/main/java/org/myteam/server/news/newsComment/dto/controller/request/NewsCommentRequest.java b/src/main/java/org/myteam/server/news/newsComment/dto/controller/request/NewsCommentRequest.java
@@ -7,8 +7,10 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Getter
+@Setter
 @NoArgsConstructor
 public class NewsCommentRequest extends PageInfoRequest {
 
diff --git a/src/main/java/org/myteam/server/news/newsReply/dto/controller/request/NewsReplyRequest.java b/src/main/java/org/myteam/server/news/newsReply/dto/controller/request/NewsReplyRequest.java
@@ -7,8 +7,10 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Getter
+@Setter
 @NoArgsConstructor
 public class NewsReplyRequest extends PageInfoRequest {
 
diff --git a/src/test/java/org/myteam/server/news/news/controller/NewsControllerTest.java b/src/test/java/org/myteam/server/news/news/controller/NewsControllerTest.java
@@ -33,9 +33,11 @@ void findAllTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news")
-					.content(objectMapper.writeValueAsString(newsRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("content", "테스트")
+					.param("orderType", newsRequest.getOrderType().name())
+					.param("category", newsRequest.getCategory().name())
+					.param("page", String.valueOf(newsRequest.getPage()))
+					.param("size", String.valueOf(newsRequest.getSize()))
 					.with(csrf())
 			)
 			.andDo(print())
@@ -59,9 +61,10 @@ void findAllWithoutOrderTypeTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news")
-					.content(objectMapper.writeValueAsString(newsRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("page", String.valueOf(newsRequest.getPage()))
+					.param("size", String.valueOf(newsRequest.getSize()))
+					.param("content", newsRequest.getContent())
+					.param("category", newsRequest.getCategory().name())
 					.with(csrf())
 			)
 			.andDo(print())
@@ -85,9 +88,10 @@ void findAllWithoutCategoryTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news")
-					.content(objectMapper.writeValueAsString(newsRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("page", String.valueOf(newsRequest.getPage()))
+					.param("size", String.valueOf(newsRequest.getSize()))
+					.param("content", newsRequest.getContent())
+					.param("orderType", newsRequest.getOrderType().name())
 					.with(csrf())
 			)
 			.andDo(print())
diff --git a/src/test/java/org/myteam/server/news/newsComment/controller/NewsCommentControllerTest.java b/src/test/java/org/myteam/server/news/newsComment/controller/NewsCommentControllerTest.java
@@ -101,9 +101,9 @@ void findAllTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news/comment")
-					.content(objectMapper.writeValueAsString(newsCommentRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("page", String.valueOf(newsCommentRequest.getPage()))
+					.param("size", String.valueOf(newsCommentRequest.getSize()))
+					.param("newsId", String.valueOf(newsCommentRequest.getNewsId()))
 					.with(csrf())
 			)
 			.andDo(print())
@@ -125,9 +125,8 @@ void findAllWithoutOrderTypeTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news/comment")
-					.content(objectMapper.writeValueAsString(newsRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("page", String.valueOf(newsRequest.getPage()))
+					.param("size", String.valueOf(newsRequest.getSize()))
 					.with(csrf())
 			)
 			.andDo(print())
diff --git a/src/test/java/org/myteam/server/news/newsReply/controller/NewsReplyControllerTest.java b/src/test/java/org/myteam/server/news/newsReply/controller/NewsReplyControllerTest.java
@@ -22,15 +22,15 @@ class NewsReplyControllerTest extends ControllerTestSupport {
 	@WithMockUser
 	void saveTest() throws Exception {
 		// given
-		NewsReplySaveRequest newsCommentSaveRequest = NewsReplySaveRequest.builder()
+		NewsReplySaveRequest newsReplySaveRequest = NewsReplySaveRequest.builder()
 			.newsCommentId(1L)
 			.comment("대댓글 테스트")
 			.build();
 
 		// when // then
 		mockMvc.perform(
 				post("/api/news/reply")
-					.content(objectMapper.writeValueAsString(newsCommentSaveRequest))
+					.content(objectMapper.writeValueAsString(newsReplySaveRequest))
 					.contentType(APPLICATION_JSON)
 					.accept(APPLICATION_JSON)
 					.with(csrf())
@@ -46,14 +46,14 @@ void saveTest() throws Exception {
 	@WithMockUser
 	void saveWithoutNewsIdTest() throws Exception {
 		// given
-		NewsReplySaveRequest newsCommentSaveRequest = NewsReplySaveRequest.builder()
+		NewsReplySaveRequest newsReplySaveRequest = NewsReplySaveRequest.builder()
 			.comment("대댓글 테스트")
 			.build();
 
 		// when // then
 		mockMvc.perform(
 				post("/api/news/reply")
-					.content(objectMapper.writeValueAsString(newsCommentSaveRequest))
+					.content(objectMapper.writeValueAsString(newsReplySaveRequest))
 					.contentType(APPLICATION_JSON)
 					.accept(APPLICATION_JSON)
 					.with(csrf())
@@ -69,14 +69,14 @@ void saveWithoutNewsIdTest() throws Exception {
 	@WithMockUser
 	void saveWithoutCommentTest() throws Exception {
 		// given
-		NewsReplySaveRequest newsCommentSaveRequest = NewsReplySaveRequest.builder()
+		NewsReplySaveRequest newsReplySaveRequest = NewsReplySaveRequest.builder()
 			.newsCommentId(1L)
 			.build();
 
 		// when // then
 		mockMvc.perform(
 				post("/api/news/reply")
-					.content(objectMapper.writeValueAsString(newsCommentSaveRequest))
+					.content(objectMapper.writeValueAsString(newsReplySaveRequest))
 					.contentType(APPLICATION_JSON)
 					.accept(APPLICATION_JSON)
 					.with(csrf())
@@ -92,7 +92,7 @@ void saveWithoutCommentTest() throws Exception {
 	@WithMockUser
 	void findAllTest() throws Exception {
 		// given
-		NewsReplyRequest newsCommentRequest = NewsReplyRequest.builder()
+		NewsReplyRequest newsReplyRequest = NewsReplyRequest.builder()
 			.page(1)
 			.size(10)
 			.newsCommentId(1L)
@@ -101,9 +101,9 @@ void findAllTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news/reply")
-					.content(objectMapper.writeValueAsString(newsCommentRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("page", String.valueOf(newsReplyRequest.getPage()))
+					.param("size", String.valueOf(newsReplyRequest.getSize()))
+					.param("newsCommentId", String.valueOf(newsReplyRequest.getNewsCommentId()))
 					.with(csrf())
 			)
 			.andDo(print())
@@ -112,7 +112,7 @@ void findAllTest() throws Exception {
 			.andExpect(jsonPath("$.msg").value("뉴스 대댓글 조회 성공"));
 	}
 
-	@DisplayName("뉴스목록을 조회시 뉴스ID는 필수이다.")
+	@DisplayName("대댓글 조회시 뉴스 대댓글 ID는 필수이다.")
 	@Test
 	@WithMockUser
 	void findAllWithoutOrderTypeTest() throws Exception {
@@ -125,9 +125,8 @@ void findAllWithoutOrderTypeTest() throws Exception {
 		// when // then
 		mockMvc.perform(
 				get("/api/news/reply")
-					.content(objectMapper.writeValueAsString(newsRequest))
-					.contentType(APPLICATION_JSON)
-					.accept(APPLICATION_JSON)
+					.param("page", String.valueOf(newsRequest.getPage()))
+					.param("size", String.valueOf(newsRequest.getSize()))
 					.with(csrf())
 			)
 			.andDo(print())
