Repository navigation
[feat] #222 - 구글 캘린더 일정을 투두로 저장 #228
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package com.Timo.Timo.domain.calendar.dto.request; | ||
|
|
||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
|
|
||
| public record CalendarSyncRequest( | ||
| @Schema(description = "동기화 범위 필터 (DEFAULT: 기준일 ±7일, WEEK: 기준일부터 7일), 미입력 시 DEFAULT", example = "DEFAULT") | ||
| String filter, | ||
|
|
||
| @Schema(description = "기준 날짜 (yyyy-MM-dd), 미입력 시 오늘", example = "2026-10-09") | ||
| String baseDate | ||
| ) {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package com.Timo.Timo.domain.calendar.service; | ||
|
|
||
| import com.Timo.Timo.domain.calendar.client.GoogleOAuthClient; | ||
| import com.Timo.Timo.domain.calendar.dto.client.CalendarEventItem; | ||
| import com.Timo.Timo.domain.calendar.exception.CalendarErrorCode; | ||
| import com.Timo.Timo.domain.home.enums.HomeFilter; | ||
| import com.Timo.Timo.domain.user.entity.User; | ||
| import com.Timo.Timo.domain.user.exception.UserErrorCode; | ||
| import com.Timo.Timo.domain.user.repository.UserRepository; | ||
| import com.Timo.Timo.global.exception.CustomException; | ||
| import java.time.Instant; | ||
| import java.time.LocalDate; | ||
| import java.time.ZoneId; | ||
| import java.time.format.DateTimeParseException; | ||
| import java.util.List; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class CalendarEventSyncService { | ||
|
|
||
| private final UserRepository userRepository; | ||
| private final CalendarTokenService calendarTokenService; | ||
| private final GoogleOAuthClient googleOAuthClient; | ||
| private final CalendarTodoSynchronizer calendarTodoSynchronizer; | ||
|
|
||
| public void syncEvents(Long userId, String filterValue, String baseDateValue) { | ||
| User user = userRepository.findById(userId) | ||
| .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND)); | ||
| ZoneId userZone = ZoneId.of(user.getZoneId()); | ||
|
|
||
| HomeFilter filter = parseFilter(filterValue); | ||
| LocalDate baseDate = parseBaseDate(baseDateValue, userZone); | ||
| LocalDate from = filter.rangeStart(baseDate); | ||
| LocalDate to = filter.rangeEnd(baseDate); | ||
|
|
||
| String accessToken = calendarTokenService.ensureValidAccessToken(userId); | ||
|
|
||
| Instant timeMin = from.atStartOfDay(userZone).toInstant(); | ||
| Instant timeMax = to.plusDays(1).atStartOfDay(userZone).toInstant(); | ||
| List<CalendarEventItem> items = googleOAuthClient.fetchEvents(accessToken, timeMin, timeMax); | ||
|
Collaborator
There was a problem hiding this comment. 구글 API 호출은 트랜잭션 밖에서 하고 저장만 |
||
|
|
||
| calendarTodoSynchronizer.synchronize(userId, items, from, to, userZone); | ||
| } | ||
|
|
||
| private HomeFilter parseFilter(String filterValue) { | ||
|
Collaborator
There was a problem hiding this comment. p4) HomeFilter.from과 같은 로직이 한 번 더 구현되어 있는 것 같습니다. 차이는 에러 코드뿐인 것 같아보이네요. parseBaseDate와 구글 호출 범위를 계산하는 부분도 CalendarEventQueryService와 같아서, 기존 GET /events를 지울 때 함께 정리하면 좋을 것 같습니다.
Member
Author
There was a problem hiding this comment. 맞습니다. 말씀 주신대로 이번 PR에서는 그대로 두고, 기존 조회 API |
||
| if (filterValue == null || filterValue.isBlank()) { | ||
| return HomeFilter.DEFAULT; | ||
| } | ||
| try { | ||
| return HomeFilter.valueOf(filterValue); | ||
| } catch (IllegalArgumentException exception) { | ||
| throw new CustomException(CalendarErrorCode.INVALID_FILTER_OR_DATE); | ||
| } | ||
| } | ||
|
|
||
| private LocalDate parseBaseDate(String baseDateValue, ZoneId userZone) { | ||
| if (baseDateValue == null || baseDateValue.isBlank()) { | ||
| return LocalDate.now(userZone); | ||
| } | ||
| try { | ||
| return LocalDate.parse(baseDateValue); | ||
| } catch (DateTimeParseException exception) { | ||
| throw new CustomException(CalendarErrorCode.INVALID_FILTER_OR_DATE); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이제 투두 정리, revoke 기록, 연결 삭제가 같이 커밋되고 같이 롤백되네용 굿입니당!