Skip to content

Fix: TotalCommit 연도 수정 #107

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
skyeong42 merged 1 commit into from
Mar 7, 2025
Merged

Fix: TotalCommit 연도 수정 #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 8 deletions ...main/java/cmf/commitField/domain/commit/totalCommit/controller/TotalCommitController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public TotalCommitResponseDto getTotalCommits(@AuthenticationPrincipal CustomOAu
public TotalCommitResponseDto getSpringSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
String username = oAuth2User.getName();
int currentYear = LocalDateTime.now().getYear(); // 올해 대입
LocalDateTime since = LocalDateTime.of(2025, 3, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(2025, 5, 31, 23, 59, 59);
LocalDateTime since = LocalDateTime.of(currentYear, 3, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(currentYear, 5, 31, 23, 59, 59);
return totalCommitService.getSeasonCommits(username, since, until);
}

Expand All @@ -54,8 +54,8 @@ public TotalCommitResponseDto getSpringSeasonCommits(@AuthenticationPrincipal Cu
public TotalCommitResponseDto getSummerSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
String username = oAuth2User.getName();
int currentYear = LocalDateTime.now().getYear(); // 현재는 테스트용으로 2024 대입
LocalDateTime since = LocalDateTime.of(2024, 6, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(2024, 8, 31, 23, 59, 59);
LocalDateTime since = LocalDateTime.of(currentYear, 6, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(currentYear, 8, 31, 23, 59, 59);
return totalCommitService.getSeasonCommits(username, since, until);
}

Expand All @@ -64,8 +64,8 @@ public TotalCommitResponseDto getSummerSeasonCommits(@AuthenticationPrincipal Cu
public TotalCommitResponseDto getFallSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
String username = oAuth2User.getName();
int currentYear = LocalDateTime.now().getYear(); // 현재는 테스트용으로 2024 대입
LocalDateTime since = LocalDateTime.of(2024, 9, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(2024, 11, 30, 23, 59, 59);
LocalDateTime since = LocalDateTime.of(currentYear, 9, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(currentYear, 11, 30, 23, 59, 59);
return totalCommitService.getSeasonCommits(username, since, until);
}

Expand All @@ -74,8 +74,8 @@ public TotalCommitResponseDto getFallSeasonCommits(@AuthenticationPrincipal Cust
public TotalCommitResponseDto getWinterSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
String username = oAuth2User.getName();
int currentYear = LocalDateTime.now().getYear(); // 2024.12 ~ 2025.2 대입
LocalDateTime since = LocalDateTime.of(2025 - 1, 12, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(2025, 2, 1, 23, 59, 59)
LocalDateTime since = LocalDateTime.of(currentYear - 1, 12, 1, 0, 0);
LocalDateTime until = LocalDateTime.of(currentYear, 2, 1, 23, 59, 59)
.with(TemporalAdjusters.lastDayOfMonth());
return totalCommitService.getSeasonCommits(username, since, until);
}
Expand Down