Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified backend/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ public class SearchController {

// 로그 검색 API
@GetMapping("/log")
public ResponseEntity<?> getCheckLog(@RequestBody SearchRequest request, HttpSession session) {
public ResponseEntity<?> getCheckLog(@ModelAttribute SearchRequest request, HttpSession session) {
// 세션에서 사용자 정보 가져오기
UserResponseDto user = (UserResponseDto) session.getAttribute("user");
if (user == null) {
// 전역 예외 핸들러에서 처리할 수 있도록 예외를 던짐
throw new IllegalStateException("로그인이 필요합니다.");
}
int officeId = user.getOfficeId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
public class SearchResult {
private final List<SearchResponse> results; // 검색 결과 리스트
private final int totalPages; // 전체 페이지 수
private final long totalElements; // 전체 데이터 개수

@Builder
public SearchResult(List<SearchResponse> results, int totalPages) {
public SearchResult(List<SearchResponse> results, int totalPages, long totalElements) {
this.results = results;
this.totalPages = totalPages;
this.totalElements = totalElements;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ public SearchResult getCheckLog(String category, LocalDateTime startDate, LocalD

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

// 결과 반환
return SearchResult.builder()
.results(results)
.totalPages(totalPages)
.totalElements(totalElements)
.build();
}

Expand Down
Loading