merge(board): merge board-service branch

Author: silberbullet

src/main/java/me/nettee/board/adapter/driving/web/mapper/BoardDtoMapper.java

@@ -12,15 +12,15 @@
 @Mapper(componentModel = "spring")
 public interface BoardDtoMapper {
 
-    @BeanMapping(ignoreByDefault = true)
-    @Mapping(target = "title", source = "title")
-    @Mapping(target = "content", source = "content")
+//    @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")
+//    @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);

src/main/java/me/nettee/board/application/model/BoardReadDetailModel.java

@@ -1,15 +1,14 @@
 package me.nettee.board.application.model;
 
-import me.nettee.board.application.domain.type.BoardStatus;
-
 import java.time.Instant;
+import me.nettee.board.application.domain.type.BoardStatus;
 
 public record BoardReadDetailModel(
-        Long id,
-        String title,
-        String content,
-        BoardStatus status,
-        Instant createdAt,
-        Instant updatedAt
-) {
-}
+    Long id,
+    String title,
+    String content,
+    BoardStatus status,
+    Instant createdAt,
+    Instant updatedAt,
+    Instant deletedAt
+) {}

src/main/java/me/nettee/board/application/model/BoardReadSummaryModel.java

@@ -1,15 +1,11 @@
 package me.nettee.board.application.model;
 
-import me.nettee.board.application.domain.type.BoardStatus;
-
 import java.time.Instant;
 
 public record BoardReadSummaryModel(
-        Long id,
-        String title,
-        String content,
-        BoardStatus status,
-        Instant createdAt,
-        Instant updatedAt
-) {
-}
+    Long id,
+    String title,
+    String content,
+    Instant createdAt,
+    Instant updatedAt
+){}

src/main/java/me/nettee/board/application/port/BoardCommandPort.java

@@ -1,13 +1,15 @@
 package me.nettee.board.application.port;
 
+import java.util.Optional;
 import me.nettee.board.application.domain.Board;
 
 public interface BoardCommandPort {
 
+    Optional<Board> findById(Long id);
+
     Board create(Board board);
 
     Board update(Board board);
 
-    void delete(Long id);
-
+    void delete(Board id);
 }

src/main/java/me/nettee/board/application/port/BoardQueryPort.java

@@ -1,16 +1,17 @@
 package me.nettee.board.application.port;
 
-import java.util.List;
-import me.nettee.board.application.domain.Board;
+import java.util.Optional;
+import java.util.Set;
 import me.nettee.board.application.domain.type.BoardStatus;
+import me.nettee.board.application.model.BoardReadDetailModel;
+import me.nettee.board.application.model.BoardReadSummaryModel;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import java.util.Optional;
-
 public interface BoardQueryPort {
 
-    Optional<Board> findById(Long id);
+    Optional<BoardReadDetailModel> findById(Long id);
+
+    Page<BoardReadSummaryModel> findByStatusesList(Pageable pageable, Set<BoardStatus> statuses);
 
-    Page<Board> findByStatusesList(Pageable pageable, List<BoardStatus> statuses);
 }

src/main/java/me/nettee/board/application/service/BoardCommandService.java

@@ -2,7 +2,9 @@
 
 import lombok.RequiredArgsConstructor;
 import me.nettee.board.application.domain.Board;
+import me.nettee.board.application.model.BoardReadDetailModel;
 import me.nettee.board.application.port.BoardCommandPort;
+import me.nettee.board.application.port.BoardQueryPort;
 import me.nettee.board.application.usecase.BoardCreateUseCase;
 import me.nettee.board.application.usecase.BoardDeleteUseCase;
 import me.nettee.board.application.usecase.BoardUpdateUseCase;
@@ -23,6 +25,11 @@ public Board updateBoard(Board board) {
     }
 
     public void deleteBoard(Long id) {
-        boardCommandPort.delete(id);
+        Board board = boardCommandPort.findById(id).orElseThrow(
+                () -> new IllegalArgumentException("게시글을 찾을 수 없습니다."));
+
+        board.softDelete();
+
+        boardCommandPort.delete(board);
     }
 }

src/main/java/me/nettee/board/application/service/BoardQueryService.java

@@ -1,9 +1,10 @@
 package me.nettee.board.application.service;
 
-import java.util.List;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
-import me.nettee.board.application.domain.Board;
 import me.nettee.board.application.domain.type.BoardStatus;
+import me.nettee.board.application.model.BoardReadDetailModel;
+import me.nettee.board.application.model.BoardReadSummaryModel;
 import me.nettee.board.application.port.BoardQueryPort;
 import me.nettee.board.application.usecase.BoardReadByStatusesUseCase;
 import me.nettee.board.application.usecase.BoardReadUseCase;
@@ -18,13 +19,13 @@ public class BoardQueryService implements BoardReadUseCase, BoardReadByStatusesU
     private final BoardQueryPort boardQueryPort;
 
     @Override
-    public Board getBoard(Long id) {
+    public BoardReadDetailModel getBoard(Long id) {
         return boardQueryPort.findById(id).orElseThrow(
                 () -> new IllegalArgumentException("게시글을 찾을 수 없습니다."));
     }
 
     @Override
-    public Page<Board> findByStatuses(Pageable pageable, List<BoardStatus> statuses) {
+    public Page<BoardReadSummaryModel> findByStatuses(Set<BoardStatus> statuses, Pageable pageable) {
         return boardQueryPort.findByStatusesList(pageable, statuses);
     }
 }

src/main/java/me/nettee/board/application/usecase/BoardCreateUseCase.java

@@ -5,4 +5,5 @@
 public interface BoardCreateUseCase {
 
     Board createBoard(Board board);
+
 }

src/main/java/me/nettee/board/application/usecase/BoardDeleteUseCase.java

@@ -3,4 +3,5 @@
 public interface BoardDeleteUseCase {
 
     void deleteBoard(Long id);
+
 }

src/main/java/me/nettee/board/application/usecase/BoardReadByStatusesUseCase.java

@@ -1,12 +1,14 @@
 package me.nettee.board.application.usecase;
 
+import java.util.Set;
 import me.nettee.board.application.domain.type.BoardStatus;
 import me.nettee.board.application.model.BoardReadSummaryModel;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import java.util.Set;
 
 public interface BoardReadByStatusesUseCase {
 
     Page<BoardReadSummaryModel> findByStatuses(Set<BoardStatus> statuses, Pageable pageable);
+
 }
+

src/main/java/me/nettee/board/application/usecase/BoardReadUseCase.java

@@ -1,11 +1,9 @@
 package me.nettee.board.application.usecase;
 
-import me.nettee.board.application.domain.Board;
 import me.nettee.board.application.model.BoardReadDetailModel;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 
 public interface BoardReadUseCase {
 
-    BoardReadDetailModel getBoard(Long id);
+   BoardReadDetailModel getBoard(Long id);
+
 }

src/main/java/me/nettee/board/application/usecase/BoardUpdateUseCase.java

@@ -4,4 +4,5 @@
 public interface BoardUpdateUseCase {
 
     Board updateBoard(Board board);
+
 }