Skip to content

Commit 07ffd39

Browse files
authored
feat: S3 파일 삭제 API, 게시글 목록 조회 API, 내가 쓴 게시글 목록 조회 API, 기존 카테고리 API 코드 삭제, 게시판 테이블에 thumbnail 컬럼 추가 (#110)
1 parent a565bd7 commit 07ffd39

31 files changed

+533
-786
lines changed

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

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
import jakarta.validation.Valid;
77
import lombok.RequiredArgsConstructor;
88
import lombok.extern.slf4j.Slf4j;
9-
import org.myteam.server.board.controller.reponse.BoardResponse;
10-
import org.myteam.server.board.dto.BoardSaveRequest;
9+
import org.myteam.server.board.dto.reponse.BoardListResponse;
10+
import org.myteam.server.board.dto.reponse.BoardResponse;
11+
import org.myteam.server.board.dto.request.BoardRequest;
12+
import org.myteam.server.board.dto.request.BoardSaveRequest;
13+
import org.myteam.server.board.service.BoardReadService;
1114
import org.myteam.server.board.service.BoardService;
1215
import org.myteam.server.global.security.dto.CustomUserDetails;
1316
import org.myteam.server.global.web.response.ResponseDto;
@@ -16,6 +19,7 @@
1619
import org.springframework.security.core.annotation.AuthenticationPrincipal;
1720
import org.springframework.web.bind.annotation.DeleteMapping;
1821
import org.springframework.web.bind.annotation.GetMapping;
22+
import org.springframework.web.bind.annotation.ModelAttribute;
1923
import org.springframework.web.bind.annotation.PathVariable;
2024
import org.springframework.web.bind.annotation.PostMapping;
2125
import org.springframework.web.bind.annotation.PutMapping;
@@ -30,6 +34,7 @@
3034
public class BoardController {
3135

3236
private final BoardService boardService;
37+
private final BoardReadService boardReadService;
3338

3439
/**
3540
* 게시글 생성
@@ -74,24 +79,24 @@ public ResponseEntity<ResponseDto<BoardResponse>> getBoard(@PathVariable final L
7479
return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "게시글 조회 성공", response));
7580
}
7681

77-
// /**
78-
// * 게시글 목록 조회
79-
// */
80-
// @GetMapping
81-
// public ResponseEntity<ResponseDto<BoardListResponse>> getBoardList(@ModelAttribute @Valid BoardRequest request) {
82-
// return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "게시글 목록 조회",
83-
// boardReadService.getBoardList(request.toServiceRequest())));
84-
// }
85-
//
86-
// /**
87-
// * 내가 쓴 게시글 목록 조회 (테스트용입니다)
88-
// */
89-
// @GetMapping("/my")
90-
// public ResponseEntity<ResponseDto<BoardListResponse>> getMyBoardList(
91-
// @ModelAttribute @Valid BoardRequest request,
92-
// @AuthenticationPrincipal final CustomUserDetails userDetails) {
93-
//
94-
// return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "내가 쓴 게시글 목록 조회",
95-
// boardReadService.getMyBoardList(request.toServiceRequest(), userDetails.getPublicId())));
96-
// }
97-
}
82+
/**
83+
* 게시글 목록 조회
84+
*/
85+
@GetMapping
86+
public ResponseEntity<ResponseDto<BoardListResponse>> getBoardList(@ModelAttribute @Valid BoardRequest request) {
87+
return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "게시글 목록 조회",
88+
boardReadService.getBoardList(request.toServiceRequest())));
89+
}
90+
91+
/**
92+
* 내가 쓴 게시글 목록 조회 (테스트용)
93+
*/
94+
@GetMapping("/my")
95+
public ResponseEntity<ResponseDto<BoardListResponse>> getMyBoardList(
96+
@ModelAttribute @Valid BoardRequest request,
97+
@AuthenticationPrincipal final CustomUserDetails userDetails) {
98+
99+
return ResponseEntity.ok(new ResponseDto<>(SUCCESS.name(), "내가 쓴 게시글 목록 조회",
100+
boardReadService.getMyBoardList(request.toServiceRequest(), userDetails.getPublicId())));
101+
}
102+
}

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

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/main/java/org/myteam/server/board/controller/reponse/CategoryResponse.java

Lines changed: 0 additions & 54 deletions
This file was deleted.

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import lombok.Builder;
1818
import lombok.Getter;
1919
import lombok.NoArgsConstructor;
20-
import org.myteam.server.board.dto.BoardSaveRequest;
20+
import org.myteam.server.board.dto.request.BoardSaveRequest;
2121
import org.myteam.server.member.entity.Member;
2222

2323
@Getter
@@ -31,7 +31,7 @@ public class Board {
3131
private Long id;
3232

3333
@ManyToOne(fetch = FetchType.LAZY)
34-
@JoinColumn(name = "member_id")
34+
@JoinColumn(name = "public_id")
3535
private Member member;
3636

3737
@Enumerated(EnumType.STRING)
@@ -48,6 +48,8 @@ public class Board {
4848

4949
private String createdIp;
5050

51+
private String thumbnail;
52+
5153
private LocalDateTime createdAt;
5254

5355
private LocalDateTime updatedAt;
@@ -57,7 +59,7 @@ public class Board {
5759

5860
@Builder
5961
public Board(Member member, BoardType boardType, CategoryType categoryType, String title, String content,
60-
String link, String createdIp,
62+
String link, String createdIp, String thumbnail,
6163
BoardCount boardCount) {
6264
this.member = member;
6365
this.boardType = boardType;
@@ -66,6 +68,7 @@ public Board(Member member, BoardType boardType, CategoryType categoryType, Stri
6668
this.content = content;
6769
this.link = link;
6870
this.createdIp = createdIp;
71+
this.thumbnail = thumbnail;
6972
this.createdAt = LocalDateTime.now();
7073
this.updatedAt = LocalDateTime.now();
7174
this.boardCount = boardCount;
@@ -77,6 +80,7 @@ public void updateBoard(BoardSaveRequest request) {
7780
this.title = request.getTitle();
7881
this.content = request.getContent();
7982
this.link = request.getLink();
83+
this.thumbnail = request.getThumbnail();
8084
this.updatedAt = LocalDateTime.now();
8185
}
8286

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.myteam.server.board.domain;
2+
3+
public enum BoardOrderType {
4+
CREATE,
5+
LIKE,
6+
COMMENT
7+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package org.myteam.server.board.domain;
2+
3+
public enum BoardSearchType {
4+
/**
5+
* 제목
6+
*/
7+
TITLE,
8+
/**
9+
* 내용
10+
*/
11+
CONTENT,
12+
/**
13+
* 제목 + 내용
14+
*/
15+
TITLE_CONTENT,
16+
/**
17+
* 작성자
18+
*/
19+
NICKNAME,
20+
/**
21+
* 댓글
22+
*/
23+
COMMENT
24+
}

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

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)