Skip to content

캘린더 로직 일요일 관련 삭제 #53

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
merged 2 commits into from
Mar 22, 2025
Merged

캘린더 로직 일요일 관련 삭제 #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
215e2ff
날짜값 로작 일요일 관련 삭제
HAJIHYUK Mar 22, 2025
c3c2ee9
전체목표조회 인증값 날짜 로직 변경
HAJIHYUK Mar 22, 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
7 changes: 1 addition & 6 deletions Location-based-target-authentication/src/main/java/com/swyp/goal/service/GoalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,9 @@ public List<LocalDate> DateRangeCalculator(Long goalId) {
LocalDate thisWeekStart = today.minusDays(today.getDayOfWeek().getValue());

// startDate가 오늘 이후라면, startDate가 속한 주의 시작일을 기준으로 설정
// 단, startDate가 일요일인 경우는 startDate 그대로 사용
LocalDate baseWeekStart;
if (startDate.isAfter(today)) {
if (startDate.getDayOfWeek() == java.time.DayOfWeek.SUNDAY) {
baseWeekStart = startDate; // startDate가 일요일인 경우, 그대로 사용
} else {
baseWeekStart = startDate.minusDays(startDate.getDayOfWeek().getValue());
}
baseWeekStart = startDate.minusDays(startDate.getDayOfWeek().getValue());
} else {
baseWeekStart = thisWeekStart; // startDate가 오늘 이전이거나 오늘 포함인 경우
}
Expand Down