fix(board): fix command url and dto and test code

silberbullet · silberbullet · commit 5ade3f869b29 · 2025-01-29T17:54:05.000+09:00
diff --git a/src/main/java/me/nettee/board/adapter/driving/web/BoardCommandApi.java b/src/main/java/me/nettee/board/adapter/driving/web/BoardCommandApi.java
@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/v1/board")
+@RequestMapping("/api/v1/boards")
 @RequiredArgsConstructor
 public class BoardCommandApi {
 
diff --git a/src/main/java/me/nettee/board/adapter/driving/web/mapper/BoardDtoMapper.java b/src/main/java/me/nettee/board/adapter/driving/web/mapper/BoardDtoMapper.java
@@ -5,22 +5,13 @@
 import me.nettee.board.adapter.driving.web.dto.BoardQueryDto.BoardDetailResponse;
 import me.nettee.board.application.domain.Board;
 import me.nettee.board.application.model.BoardReadDetailModel;
-import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 @Mapper(componentModel = "spring")
 public interface BoardDtoMapper {
 
-//    @BeanMapping(ignoreByDefault = true)
-//    @Mapping(target = "title", source = "title")
-//    @Mapping(target = "content", source = "content")
     Board toDomain(BoardCreateCommand command);
 
-//    @BeanMapping(ignoreByDefault = true)
-//    @Mapping(target = "id", source = "id")
-//    @Mapping(target = "title", source = "command.title")
-//    @Mapping(target = "content", source = "command.content")
     Board toDomain(Long id, BoardUpdateCommand command);
 
     BoardDetailResponse toDtoDetail(BoardReadDetailModel board);
diff --git a/src/test/kotlin/me/nettee/board/adapter/driving/web/BoardCommandApiTest.kt b/src/test/kotlin/me/nettee/board/adapter/driving/web/BoardCommandApiTest.kt
@@ -24,16 +24,16 @@ import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.web.servlet.*
 
 @ExtendWith(SpringExtension::class)
-@WebMvcTest(BoardCommandController::class)
+@WebMvcTest(BoardCommandApi::class)
 @AutoConfigureMockMvc
-class BoardCommandControllerTest(
+class BoardCommandApiTest(
     @Autowired private val mvc: MockMvc,
     @Autowired private val objectMapper: ObjectMapper,
-    @MockitoBean private val boardCreateUseCase : BoardCreateUseCase,
-    @MockitoBean private val boardUpdateUseCase : BoardUpdateUseCase,
-    @MockitoBean private val boardDeleteUseCase : BoardDeleteUseCase,
-    @MockitoBean private val boardDtoMapper : BoardDtoMapper
-): FreeSpec({
+    @MockitoBean private val boardCreateUseCase: BoardCreateUseCase,
+    @MockitoBean private val boardUpdateUseCase: BoardUpdateUseCase,
+    @MockitoBean private val boardDeleteUseCase: BoardDeleteUseCase,
+    @MockitoBean private val boardDtoMapper: BoardDtoMapper
+) : FreeSpec({
 
     // given
     val boardDomain = Board.builder().id(1L).title("테스트게시판").content("테스트게시판내용").status(BoardStatus.ACTIVE).build()
@@ -57,7 +57,7 @@ class BoardCommandControllerTest(
 
             "2xx 응답 상태 반환" {
                 // then
-                mvcRequest(HttpMethod.POST, "/api/v1/board", emptyMap(), createCommand)
+                mvcRequest(HttpMethod.POST, "/api/v1/boards", emptyMap(), createCommand)
                     .andExpect {
                         status { is2xxSuccessful() }
                         jsonPath("board.id") { value(boardCreateResponse.id) }
@@ -75,7 +75,7 @@ class BoardCommandControllerTest(
 
             // then
             "4xx 응답 상태 반환" {
-                mvcRequest(HttpMethod.POST, "/api/v1/board", emptyMap(), failCreateCommand)
+                mvcRequest(HttpMethod.POST, "/api/v1/boards", emptyMap(), failCreateCommand)
                     .andExpect {
                         status { is4xxClientError() }
                     }
@@ -90,7 +90,7 @@ class BoardCommandControllerTest(
 
             // then
             "4xx 응답 상태 반환" {
-                mvcRequest(HttpMethod.POST, "/api/v1/board", emptyMap(), failCreateCommand)
+                mvcRequest(HttpMethod.POST, "/api/v1/boards", emptyMap(), failCreateCommand)
                     .andExpect {
                         status { is4xxClientError() }
                     }
@@ -111,7 +111,7 @@ class BoardCommandControllerTest(
 
             "2xx 정상 상태 반환" {
                 // then
-                mvcRequest(HttpMethod.PATCH, "/api/v1/board/{id}", mapOf("id" to boardUpdateResponse.id), updateCommand)
+                mvcRequest(HttpMethod.PATCH, "/api/v1/boards/{id}", mapOf("id" to boardUpdateResponse.id), updateCommand)
                     .andExpect {
                         status { is2xxSuccessful() }
                         jsonPath("board.id") { value(boardUpdateResponse.id) }
@@ -129,7 +129,12 @@ class BoardCommandControllerTest(
 
             "4xx 응답 상태 반환" {
                 // then
-                mvcRequest(HttpMethod.PATCH, "/api/v1/board/{id}", mapOf("id" to boardUpdateResponse.id), failUpdateCommand)
+                mvcRequest(
+                    HttpMethod.PATCH,
+                    "/api/v1/boards/{id}",
+                    mapOf("id" to boardUpdateResponse.id),
+                    failUpdateCommand
+                )
                     .andExpect {
                         status { is4xxClientError() }
                     }
@@ -144,7 +149,12 @@ class BoardCommandControllerTest(
 
             "4xx 응답 상태 반환" {
                 // then
-                mvcRequest(HttpMethod.PATCH, "/api/v1/board/{id}", mapOf("id" to boardUpdateResponse.id), failUpdateCommand)
+                mvcRequest(
+                    HttpMethod.PATCH,
+                    "/api/v1/boards/{id}",
+                    mapOf("id" to boardUpdateResponse.id),
+                    failUpdateCommand
+                )
                     .andExpect {
                         status { is4xxClientError() }
                     }
@@ -157,22 +167,18 @@ class BoardCommandControllerTest(
     "[DELETE] 게시판 삭제 요청" - {
         "[정상 요청] 해당 커뮤니티 게시판 ID가 존재 할 때" - {
             "2xx 응답 상태 반환" {
-                mvcRequest(HttpMethod.DELETE, "/api/v1/board/{id}", mapOf("id" to boardDomain.id), null)
-                .andExpect {
-                    status { is2xxSuccessful() }
-                }
+                mvcRequest(HttpMethod.DELETE, "/api/v1/boards/{id}", mapOf("id" to boardDomain.id), null)
+                    .andExpect {
+                        status { is2xxSuccessful() }
+                    }
             }
         }
-
-        "[실패 요청] 해당 커뮤니티 게시판 ID 미존재 할 때" - {
-
-        }
     }
 
     beforeSpec {
-        `when` (boardDtoMapper.toDomain(any())).thenReturn(boardDomain)
-        `when` (boardCreateUseCase.createBoard(any())).thenReturn(boardDomain)
-        `when` (boardUpdateUseCase.updateBoard(any())).thenReturn(boardDomain)
+        `when`(boardDtoMapper.toDomain(any())).thenReturn(boardDomain)
+        `when`(boardCreateUseCase.createBoard(any())).thenReturn(boardDomain)
+        `when`(boardUpdateUseCase.updateBoard(any())).thenReturn(boardDomain)
         doNothing().`when`(boardDeleteUseCase).deleteBoard(any())
     }
 })
diff --git a/src/test/kotlin/me/nettee/board/adapter/driving/web/BoardQueryApiTest.kt b/src/test/kotlin/me/nettee/board/adapter/driving/web/BoardQueryApiTest.kt
@@ -1,4 +1,5 @@
 package me.nettee.board.adapter.driving.web
+
 import io.kotest.core.spec.style.FreeSpec
 import me.nettee.board.adapter.driving.web.dto.BoardQueryDto.BoardDetailResponse
 import me.nettee.board.adapter.driving.web.mapper.BoardDtoMapper
@@ -32,16 +33,16 @@ import java.time.Instant
 @WebMvcTest(BoardQueryApi::class)
 @AutoConfigureMockMvc
 class BoardQueryApiTest(
-    @MockitoBean  private val boardReadUseCase : BoardReadUseCase,
-    @MockitoBean private val boardReadByStatusesUseCase : BoardReadByStatusesUseCase,
-    @MockitoBean private val boardDtoMapper : BoardDtoMapper,
+    @MockitoBean private val boardReadUseCase: BoardReadUseCase,
+    @MockitoBean private val boardReadByStatusesUseCase: BoardReadByStatusesUseCase,
+    @MockitoBean private val boardDtoMapper: BoardDtoMapper,
     @Autowired private val mvc: MockMvc
 ) : FreeSpec({
 
     lateinit var boardList: List<BoardReadSummaryModel>
 
-   "[GET]게시판 상세 조회" - {
-        val mvcGet = fun(boardId: Long): ResultActionsDsl{
+    "[GET]게시판 상세 조회" - {
+        val mvcGet = fun(boardId: Long): ResultActionsDsl {
             return mvc.get("/api/v1/boards/$boardId") {
                 contentType = MediaType.APPLICATION_JSON
             }
@@ -56,15 +57,15 @@ class BoardQueryApiTest(
 
         "[4xx] 비정상 요청 상태 반환" {
             mvcGet(200L)
-                .andExpect { status{is4xxClientError()}}
+                .andExpect { status { is4xxClientError() } }
                 .andDo { print() }
                 .andReturn()
         }
 
     }
 
     "[GET] statuses 사용 게시판 목록 조회" - {
-        val mvcGet = fun(statuses: Set<BoardStatus>, page: Int): ResultActionsDsl{
+        val mvcGet = fun(statuses: Set<BoardStatus>, page: Int): ResultActionsDsl {
             return mvc.get("/api/v1/boards") {
                 queryParam("statuses", statuses.joinToString(",") { it.name })
                 queryParam("page", page.toString())
@@ -82,30 +83,52 @@ class BoardQueryApiTest(
         }
 
         "[4xx] 비정상 요청 상태 반환" {
-            val statuses = setOf( BoardStatus.REMOVED, BoardStatus.ACTIVE)
-             mvcGet(statuses, 100)
+            val statuses = setOf(BoardStatus.REMOVED, BoardStatus.ACTIVE)
+            mvcGet(statuses, 100)
                 .andExpect { status { is4xxClientError() } }
                 .andDo { print() }
                 .andReturn()
         }
     }
 
+    var boardReadSummaryModelPage: (
+        List<BoardReadSummaryModel>,
+        Pageable,
+        Set<BoardStatus>
+    ) -> Page<BoardReadSummaryModel>
+
     beforeSpec {
-        val boardDetail = BoardReadDetailModel(1L,"title1", "content1", BoardStatus.ACTIVE, Instant.now(), null);
+        boardReadSummaryModelPage = { boardList, pageable, boardStatus ->
+//            val filteredBoards = boardList.filter { it.status in boardStatus }
+            val filteredBoards = boardList
+                .takeIf { it.isNotEmpty() }
+                ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST)
+
+            val pageContent = filteredBoards.drop(pageable.pageNumber * pageable.pageSize)
+                .take(pageable.pageSize)
+                .takeIf { it.isNotEmpty() }
+                ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST)
+
+            PageImpl(pageContent, pageable, filteredBoards.size.toLong())
+        }
+
+        val boardDetail = BoardReadDetailModel(1L, "title1", "content1", BoardStatus.ACTIVE, Instant.now(), Instant.now(), null)
         // list 반복문 완성 코드 ***
         boardList = (1..14).flatMap {
             listOf(
-                BoardReadSummaryModel(it.toLong(), "title$it", "content$it", BoardStatus.ACTIVE, Instant.now(), null),
-                BoardReadSummaryModel(it.toLong(), "title$it", "content$it", BoardStatus.SUSPENDED, Instant.now(), null)
+                BoardReadSummaryModel(it.toLong(), "title$it", "content$it",  Instant.now(), Instant.now()),
+                BoardReadSummaryModel(it.toLong(), "title$it", "content$it",  Instant.now(), Instant.now())
             )
         }
 
-        `when` (boardReadUseCase.getBoard(1L)).thenAnswer { boardDetail }
+        `when`(boardReadUseCase.getBoard(1L)).thenAnswer { boardDetail }
         `when`(boardReadUseCase.getBoard(argThat { it != 1L })).thenThrow(ResponseStatusException(HttpStatus.NOT_FOUND))
-        `when`(boardReadByStatusesUseCase.findByStatuses(
-            any<Set<BoardStatus>>(),
-            any<Pageable>()
-        )).thenAnswer { invocation ->
+        `when`(
+            boardReadByStatusesUseCase.findByStatuses(
+                any<Set<BoardStatus>>(),
+                any<Pageable>()
+            )
+        ).thenAnswer { invocation ->
             val statuses = invocation.getArgument<Set<BoardStatus>>(0)
             val pageable = invocation.getArgument<Pageable>(1)
             boardReadSummaryModelPage(boardList, pageable, statuses)
@@ -114,23 +137,4 @@ class BoardQueryApiTest(
     }
 })
 
-fun boardReadSummaryModelPage(
-    boardList: List<BoardReadSummaryModel>,
-    pageable: Pageable,
-    boardStatus: Set<BoardStatus>
-): Page<BoardReadSummaryModel> {
-    println("Board Statuses: $boardStatus")
-    println("Board List: ${boardList.map { it.status }}")
-
-   val filteredBoards = boardList.filter { it.status in boardStatus }
-       .takeIf { it.isNotEmpty() }
-        ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST)
-
-    val pageContent = filteredBoards.drop(pageable.pageNumber * pageable.pageSize)
-        .take(pageable.pageSize)
-        .takeIf { it.isNotEmpty() }
-        ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST)
-
-    return PageImpl(pageContent, pageable, filteredBoards.size.toLong())
-}
 
