Skip to content

[Backend] merge: API 수정사항 develop에 머지 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyni03 merged 3 commits into from
Mar 31, 2025
Merged

[Backend] merge: API 수정사항 develop에 머지 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5e06ec
fix: change map stats api period to fixed as monthly #110
hyni03 Mar 31, 2025
5832c81
Merge pull request #113 from kookmin-sw/fix/110
hyni03 Mar 31, 2025
b0d6f1a
Merge branch 'develop' into backend
hyni03 Mar 31, 2025
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
16 changes: 3 additions & 13 deletions backend/src/main/java/com/example/backend/analysis/controller/CaseStatsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,8 @@ public ResponseEntity<?> getLocationCaseStats(@RequestParam("period") String per

// 지도용 장소별 사건 수 조회
@GetMapping("/map")
public ResponseEntity<?> getMapCaseStats(@RequestParam("period") String period, HttpSession session) {
try {
List<MapCaseStatsResponse> stats = caseStatsService.getMapCaseStats(period, session);
return ResponseEntity.ok(stats);
} catch (IllegalStateException e) {
return ResponseEntity.status(401).body(Collections.singletonMap("message", e.getMessage()));
} catch (IllegalArgumentException e) {
return ResponseEntity.status(400).body(Collections.singletonMap("message", e.getMessage()));
} catch (NoSuchElementException e) {
return ResponseEntity.status(404).body(Collections.singletonMap("message", e.getMessage()));
} catch (Exception e) {
return ResponseEntity.status(500).body(Collections.singletonMap("message", "내부 서버 오류가 발생했습니다."));
}
public ResponseEntity<?> getMapCaseStats(HttpSession session) {
List<MapCaseStatsResponse> stats = caseStatsService.getMapCaseStats(session);
return ResponseEntity.ok(stats);
}
}
4 changes: 2 additions & 2 deletions backend/src/main/java/com/example/backend/analysis/service/CaseStatsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@ public List<LocationCaseStatsResponse> getLocationCaseStats(String period, HttpS
}

// 지도용 장소별 사건 수 조회 (startDate를 계산해 전달)
public List<MapCaseStatsResponse> getMapCaseStats(String period, HttpSession session) {
public List<MapCaseStatsResponse> getMapCaseStats(HttpSession session) {
int officeId = getOfficeId(session);

LocalDateTime startDate = getStartDateFromPeriod(period);
LocalDateTime startDate = getStartDateFromPeriod("monthly");
List<Object[]> results = statsCategoryRepository.findMapCaseStats(startDate);

if (results.isEmpty()) {
Expand Down
Loading