Skip to content

Commit 3f4cd9f

Browse files
authored
Merge pull request #101 from kookmin-sw/backend
[Backend] merge: fix get requestBody error
2 parents 33d819c + ecd771a commit 3f4cd9f

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

backend/gradlew

100644100755
File mode changed.

backend/src/main/java/com/example/backend/search/controller/SearchController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ public class SearchController {
1919

2020
// 로그 검색 API
2121
@GetMapping("/log")
22-
public ResponseEntity<?> getCheckLog(@RequestBody SearchRequest request, HttpSession session) {
22+
public ResponseEntity<?> getCheckLog(@ModelAttribute SearchRequest request, HttpSession session) {
2323
// 세션에서 사용자 정보 가져오기
2424
UserResponseDto user = (UserResponseDto) session.getAttribute("user");
2525
if (user == null) {
26-
// 전역 예외 핸들러에서 처리할 수 있도록 예외를 던짐
2726
throw new IllegalStateException("로그인이 필요합니다.");
2827
}
2928
int officeId = user.getOfficeId();

backend/src/main/java/com/example/backend/search/dto/SearchResult.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
public class SearchResult {
1010
private final List<SearchResponse> results; // 검색 결과 리스트
1111
private final int totalPages; // 전체 페이지 수
12+
private final long totalElements; // 전체 데이터 개수
1213

1314
@Builder
14-
public SearchResult(List<SearchResponse> results, int totalPages) {
15+
public SearchResult(List<SearchResponse> results, int totalPages, long totalElements) {
1516
this.results = results;
1617
this.totalPages = totalPages;
18+
this.totalElements = totalElements;
1719
}
1820
}

backend/src/main/java/com/example/backend/search/service/SearchService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,13 @@ public SearchResult getCheckLog(String category, LocalDateTime startDate, LocalD
5555

5656
// 전체 페이지 수 가져오기
5757
int totalPages = casePage.getTotalPages();
58+
long totalElements = casePage.getTotalElements();
5859

5960
// 결과 반환
6061
return SearchResult.builder()
6162
.results(results)
6263
.totalPages(totalPages)
64+
.totalElements(totalElements)
6365
.build();
6466
}
6567

0 commit comments

Comments
 (0)