Skip to content

Commit c6c0025

Browse files
committed
테스트 및 blog api 수정
1 parent ffba4cf commit c6c0025

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

src/main/java/com/hihat/blog/controller/BlogApiController.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import com.hihat.blog.dto.GetArticleRequest;
77
import com.hihat.blog.dto.UpdateArticleRequest;
88
import com.hihat.blog.service.BlogService;
9+
import com.hihat.blog.util.PageableImpl;
910
import lombok.RequiredArgsConstructor;
11+
import org.springframework.data.domain.Pageable;
1012
import org.springframework.http.HttpStatus;
1113
import org.springframework.http.ResponseEntity;
1214
import org.springframework.web.bind.annotation.*;
@@ -28,14 +30,15 @@ public ResponseEntity<Article> addArticle(@RequestBody AddArticleRequest request
2830
.body(savedArticle); // 자원의 생성이 성공했다면 글 정보를 응답 객체에 담아 전송
2931
}
3032

31-
// @GetMapping("/articles")
32-
// public ResponseEntity<List<ArticleResponse>> findAllArticle(@RequestBody GetArticleRequest request) {
33-
// List<ArticleResponse> articles = blogService.findAllByType(request.getType())
34-
// .stream()
35-
// .map(ArticleResponse::new)
36-
// .toList();
37-
// return ResponseEntity.ok().body(articles);
38-
// }
33+
@GetMapping("/articles")
34+
public ResponseEntity<List<ArticleResponse>> findAllArticle(@RequestBody GetArticleRequest request) {
35+
Pageable pageable = new PageableImpl(request.getPage(), request.getSize());
36+
List<ArticleResponse> articles = blogService.findAllByType(request.getType(), pageable)
37+
.stream()
38+
.map(ArticleResponse::new)
39+
.toList();
40+
return ResponseEntity.ok().body(articles);
41+
}
3942

4043
@GetMapping("/articles/{id}")
4144
public ResponseEntity<ArticleResponse> findArticle(@PathVariable long id) {

src/main/java/com/hihat/blog/dto/GetArticleRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@
99
@Getter
1010
public class GetArticleRequest {
1111
private String type;
12+
private Integer page;
13+
private Integer size;
1214
}

src/main/java/com/hihat/blog/service/BlogService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public Article save(AddArticleRequest request, String userName) {
3232
* 블로그 글 전체 목록 조회
3333
* @return : List<Article>
3434
*/
35-
// public List<Article> findAllByType(String type) {
36-
// return blogRepository.findAllByType(type);
37-
// }
35+
public Page<Article> findAllByType(String type, Pageable pageable) {
36+
return blogRepository.findAllByType(type, pageable);
37+
}
3838

3939
/**
4040
* 블로그 글 전체 목록 조회 (페이징)

src/test/java/com/hihat/blog/controller/BlogApiControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void findAllArticles() throws Exception {
132132
final String url = "/api/articles";
133133
Article savedArticle = createDefaultArticle();
134134
final String type = "type";
135-
final GetArticleRequest userRequest = new GetArticleRequest(type);
135+
final GetArticleRequest userRequest = new GetArticleRequest(type, 0, 2);
136136
final String requestBody = objectMapper.writeValueAsString(userRequest);
137137

138138
// when

0 commit comments

Comments
 (0)