diff --git a/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java b/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java index 30d0f45..969d774 100644 --- a/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java +++ b/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java @@ -5,7 +5,7 @@ import org.cmh.backend.NewsManagement.model.News; import org.cmh.backend.NewsManagement.service.NewsService; import org.cmh.backend.Utils.JwtVerify; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; +import org.springframework.hateoas.PagedModel; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +21,7 @@ public class NewsController { @GetMapping("/getNewsPage") @JwtVerify - public ResponseEntity> getNewsPage(@RequestBody GetNewsByPageRequest request) { + public ResponseEntity> getNewsPage(@RequestBody GetNewsByPageRequest request) { return new ResponseEntity<>(newsService.getNewsByPage(request), HttpStatus.OK); } diff --git a/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java b/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java index 3f42e2c..2b7aa03 100644 --- a/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java +++ b/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.hateoas.PagedModel; import org.springframework.stereotype.Service; @Service @@ -14,7 +15,7 @@ public class NewsService { @Autowired private NewsRepository newsRepository; - public Page getNewsByPage(GetNewsByPageRequest request) { + public PagedModel getNewsByPage(GetNewsByPageRequest request) { int pageNo = request.getPageNo(); int pageSize = request.getPageSize(); if (pageNo < 1) { @@ -24,6 +25,17 @@ public class NewsService { pageSize = 10; } Pageable pageable = PageRequest.of(pageNo - 1, pageSize); - return newsRepository.findAllByOrderByIdDesc(pageable); + Page newsPage = newsRepository.findAllByOrderByIdDesc(pageable); + return toPagedModel(newsPage); + } + + private PagedModel toPagedModel(Page page) { + PagedModel.PageMetadata pageMetadata = new PagedModel.PageMetadata( + page.getSize(), + page.getNumber(), + page.getTotalElements(), + page.getTotalPages() + ); + return PagedModel.of(page.getContent(), pageMetadata); } }