Skip to content
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

[✨feat] 캘린더 정보 보기 - 응답에 category 필드 추가 #118

Merged
merged 2 commits into from
Feb 28, 2025
Merged

[✨feat] 캘린더 정보 보기 - 응답에 category 필드 추가 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df6ffda
fix(KakaoAccessTokenResponse) : TODO 주석 삭제
0-tae Feb 28, 2025
1c03bc0
feat(MonthAppointment) : DTO에 카테고리 항목 추가
0-tae Feb 28, 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
5 changes: 4 additions & 1 deletion src/main/java/org/noostak/appointment/dto/calendar/MonthAppointment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class MonthAppointment implements Comparable<MonthAppointment>{
LocalDateTime startTime;
LocalDateTime endTime;
long duration;
String category;


public static MonthAppointment from(Appointment appointment, AppointmentOption appointmentOption){
Expand All @@ -32,7 +33,9 @@ public static MonthAppointment from(Appointment appointment, AppointmentOption a
appointmentOption.getDate(),
appointmentOption.getStartTime(),
appointmentOption.getEndTime(),
appointment.getDuration().value());
appointment.getDuration().value(),
appointment.getCategory().getMessage()
);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/noostak/auth/dto/KakaoAccessTokenResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class KakaoAccessTokenResponse {
private String accessToken;
private String idToken;
private int expiresIn;
private String refreshToken; // TODO: 만약 갱신이 필요할 경우 포함되어 전달됨
private String refreshToken; // 만약 갱신이 필요할 경우 포함되어 전달됨
private String refreshTokenExpiresIn;

private String error;
Expand Down