Merge branch 'epic/board' into dev

Author: Zy0ung

src/main/java/org/myteam/server/board/controller/BoardController.java

@@ -6,8 +6,11 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.myteam.server.board.controller.reponse.BoardResponse;
-import org.myteam.server.board.dto.BoardSaveRequest;
+import org.myteam.server.board.dto.reponse.BoardListResponse;
+import org.myteam.server.board.dto.reponse.BoardResponse;
+import org.myteam.server.board.dto.request.BoardRequest;
+import org.myteam.server.board.dto.request.BoardSaveRequest;
+import org.myteam.server.board.service.BoardReadService;
 import org.myteam.server.board.service.BoardService;
 import org.myteam.server.global.security.dto.CustomUserDetails;
 import org.myteam.server.global.web.response.ResponseDto;
@@ -16,6 +19,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -30,6 +34,7 @@
 public class BoardController {
 
     private final BoardService boardService;
+    private final BoardReadService boardReadService;
 
     /**
      * 게시글 생성
@@ -73,4 +78,25 @@ public ResponseEntity<ResponseDto<BoardResponse>> getBoard(@PathVariable final L
         final BoardResponse response = boardService.getBoard(boardId);
         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())));
+    }
+
+    /**
+     * 내가 쓴 게시글 목록 조회 TODO :: 테스트용입니다. 코드 삭제 예정
+     */
+    @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())));
+    }
 }

src/main/java/org/myteam/server/board/controller/CategoryController.java

@@ -17,7 +17,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.myteam.server.board.dto.BoardSaveRequest;
+import org.myteam.server.board.dto.request.BoardSaveRequest;
 import org.myteam.server.member.entity.Member;
 
 @Getter
@@ -48,6 +48,8 @@ public class Board {
 
     private String createdIp;
 
+    private String thumbnail;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;
@@ -57,7 +59,7 @@ public class Board {
 
     @Builder
     public Board(Member member, BoardType boardType, CategoryType categoryType, String title, String content,
-                 String link, String createdIp,
+                 String link, String createdIp, String thumbnail,
                  BoardCount boardCount) {
         this.member = member;
         this.boardType = boardType;
@@ -66,6 +68,7 @@ public Board(Member member, BoardType boardType, CategoryType categoryType, Stri
         this.content = content;
         this.link = link;
         this.createdIp = createdIp;
+        this.thumbnail = thumbnail;
         this.createdAt = LocalDateTime.now();
         this.updatedAt = LocalDateTime.now();
         this.boardCount = boardCount;
@@ -77,6 +80,7 @@ public void updateBoard(BoardSaveRequest request) {
         this.title = request.getTitle();
         this.content = request.getContent();
         this.link = request.getLink();
+        this.thumbnail = request.getThumbnail();
         this.updatedAt = LocalDateTime.now();
     }
 

src/main/java/org/myteam/server/board/domain/Board.java

@@ -0,0 +1,7 @@
+package org.myteam.server.board.domain;
+
+public enum BoardOrderType {
+    CREATE,
+    LIKE,
+    COMMENT
+}

src/main/java/org/myteam/server/board/domain/BoardOrderType.java

@@ -0,0 +1,24 @@
+package org.myteam.server.board.domain;
+
+public enum BoardSearchType {
+    /**
+     * 제목
+     */
+    TITLE,
+    /**
+     * 내용
+     */
+    CONTENT,
+    /**
+     * 제목 + 내용
+     */
+    TITLE_CONTENT,
+    /**
+     * 작성자
+     */
+    NICKNAME,
+    /**
+     * 댓글
+     */
+    COMMENT
+}

src/main/java/org/myteam/server/board/domain/BoardSearchType.java

@@ -16,10 +16,6 @@ public enum CategoryType {
      * 이슈
      */
     ISSUE,
-    /**
-     * 개선 요청
-     */
-    SUGGESTION,
     /**
      * 전적 인증 (e-sports)
      */