Skip to content

[Fix] Calendar, Goal 도메인 API 응답 필드 변경 #343

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
soun997 merged 3 commits into from
Oct 15, 2025
Merged

[Fix] Calendar, Goal 도메인 API 응답 필드 변경 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d6785c
fix[#342]: weekly goal 상세 조회 시 누락된 fetch join 구문 추가
soun997 Oct 15, 2025
1726241
fix[#342]: goal 조회 api 응답 필드 변경
soun997 Oct 15, 2025
fd01d2c
fix[#342]: 누락된 calendar response 필드 추가
soun997 Oct 15, 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
8 changes: 6 additions & 2 deletions src/main/java/com/sillim/recordit/calendar/dto/response/CalendarResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

import com.sillim.recordit.calendar.domain.Calendar;

public record CalendarResponse(Long id, String title, String colorHex) {
public record CalendarResponse(Long id, String title, String colorHex, Long categoryId) {

public static CalendarResponse from(Calendar calendar) {
return new CalendarResponse(calendar.getId(), calendar.getTitle(), calendar.getColorHex());
return new CalendarResponse(
calendar.getId(),
calendar.getTitle(),
calendar.getColorHex(),
calendar.getCategory().getId());
}
}
12 changes: 2 additions & 10 deletions src/main/java/com/sillim/recordit/goal/dto/response/MonthlyGoalListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@

import com.sillim.recordit.goal.domain.MonthlyGoal;

public record MonthlyGoalListResponse(
Long id,
String title,
Long categoryId,
String colorHex,
Boolean achieved,
Long calendarId) {
public record MonthlyGoalListResponse(Long id, String title, String colorHex, Boolean achieved) {

public static MonthlyGoalListResponse from(final MonthlyGoal monthlyGoal) {

return new MonthlyGoalListResponse(
monthlyGoal.getId(),
monthlyGoal.getTitle(),
monthlyGoal.getCategory().getId(),
monthlyGoal.getColorHex(),
monthlyGoal.isAchieved(),
monthlyGoal.getCalendar().getId());
monthlyGoal.isAchieved());
}
}
2 changes: 2 additions & 0 deletions src/main/java/com/sillim/recordit/goal/dto/response/WeeklyGoalDetailsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public static WeeklyGoalDetailsResponse from(final WeeklyGoal weeklyGoal) {
.week(weeklyGoal.getWeek())
.startDate(weeklyGoal.getStartDate())
.endDate(weeklyGoal.getEndDate())
.calendarId(weeklyGoal.getCalendar().getId())
.categoryId(weeklyGoal.getCategory().getId())
.colorHex(weeklyGoal.getColorHex())
.build();
Expand All @@ -38,6 +39,7 @@ public static WeeklyGoalDetailsResponse from(final WeeklyGoal weeklyGoal) {
.week(weeklyGoal.getWeek())
.startDate(weeklyGoal.getStartDate())
.endDate(weeklyGoal.getEndDate())
.calendarId(weeklyGoal.getCalendar().getId())
.categoryId(weeklyGoal.getCategory().getId())
.colorHex(weeklyGoal.getColorHex())
.relatedMonthlyGoal(
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/com/sillim/recordit/goal/dto/response/WeeklyGoalResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
public record WeeklyGoalResponse(
Long id,
String title,
Long categoryId,
Integer week,
String colorHex,
Boolean achieved,
Long calendarId,
RelatedMonthlyGoalResponse relatedMonthlyGoal) {

public static WeeklyGoalResponse from(final WeeklyGoal weeklyGoal) {
Expand All @@ -19,19 +18,17 @@ public static WeeklyGoalResponse from(final WeeklyGoal weeklyGoal) {
return WeeklyGoalResponse.builder()
.id(weeklyGoal.getId())
.title(weeklyGoal.getTitle())
.categoryId(weeklyGoal.getCategory().getId())
.week(weeklyGoal.getWeek())
.colorHex(weeklyGoal.getColorHex())
.achieved(weeklyGoal.isAchieved())
.calendarId(weeklyGoal.getCalendar().getId())
.build();
}
return WeeklyGoalResponse.builder()
.id(weeklyGoal.getId())
.title(weeklyGoal.getTitle())
.categoryId(weeklyGoal.getCategory().getId())
.week(weeklyGoal.getWeek())
.colorHex(weeklyGoal.getColorHex())
.achieved(weeklyGoal.isAchieved())
.calendarId(weeklyGoal.getCalendar().getId())
.relatedMonthlyGoal(
RelatedMonthlyGoalResponse.from(weeklyGoal.getRelatedMonthlyGoal().get()))
.build();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/sillim/recordit/goal/repository/CustomWeeklyGoalRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public interface CustomWeeklyGoalRepository {

List<WeeklyGoal> findWeeklyGoalInMonth(Integer year, Integer month, Long calendarId);

@Query("select wg from WeeklyGoal wg left join fetch wg.calendar where wg.id = :id")
@Query(
"select wg from WeeklyGoal wg left join fetch wg.calendar left join fetch wg.category left join fetch wg.relatedMonthlyGoal where wg.id = :id")
Optional<WeeklyGoal> findWeeklyGoalById(@Param("id") Long id);
}
Loading