[FEAT] 메인 다가올 일정(1개) 조회 API - #58 #59
Merged
Conversation
This file contains 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
rlarlgnszx
approved these changes
Jul 11, 2024
| @@ -10,7 +10,7 @@ public record DateCreateReq( | |||
| String title, | |||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul") | |||
| LocalDate date, | |||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm", timezone = "Asia/Seoul") | |||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul") | |||
There was a problem hiding this comment.
date에서 a값도 불필요하게 받아야 하는것 같습니다!
a를 빼주셔도 좋을 것 같아요!
| String dateName, | ||
| int month, | ||
| int day, | ||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul") |
There was a problem hiding this comment.
여기도 a를 안받아주셔도 12:00 이렇게 매핑될 것 같습니다!
| @@ -10,7 +10,7 @@ public record DateCreateReq( | |||
| String title, | |||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul") | |||
| LocalDate date, | |||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul") | |||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm", timezone = "Asia/Seoul") | |||
There was a problem hiding this comment.
엇 빼셨군요? 순서대로 읽다보니 못봤습니다 ㅎㅅㅎ..!
굿! 👍
Comment on lines
11
to
13
| Optional<Date> findFirstByUserIdAndDateAfterOrDateAndStartAtAfterOrderByDateAscStartAtAsc( | ||
| Long userId, LocalDate currentDate, LocalDate sameDay, LocalTime currentTime); | ||
| } |
Comment on lines
105
to
114
| private int calculateDDay(LocalDate eventDate, LocalDate currentDate) { | ||
| if (eventDate.isEqual(currentDate)) { | ||
| return 0; | ||
| } else { | ||
| return (int) ChronoUnit.DAYS.between(currentDate, eventDate); | ||
| } | ||
| } | ||
|
|
||
| //가장 가까운 데이트 가져오기 | ||
| private Date findNearestDate(final Long userId, final LocalDate now) { | ||
| return dateRepository.findTopByUserIdAndDateAfterOrderByDateAscStartAtAsc(userId, now) | ||
| .orElseThrow(() -> new EntityNotFoundException(FailureCode.NEAREST_DATE_NOT_FOUND)); | ||
| private Date findNearestDate(Long userId, LocalDate currentDate, LocalTime currentTime) { |
# Conflicts: # dateroad-api/src/main/java/org/dateroad/date/api/DateController.java # dateroad-api/src/main/java/org/dateroad/date/service/DateRepository.java # dateroad-api/src/main/java/org/dateroad/date/service/DateService.java # dateroad-common/src/main/java/org/dateroad/code/FailureCode.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🔥Pull requests
⛳️ 작업한 브랜치
👷 작업한 내용
📟 관련 이슈