Skip to content

[fix] #207 - 메모 존재 여부 반영하도록 dto 및 로직 수정 #208

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
laura-jung merged 1 commit into from
Sep 26, 2026
Merged

[fix] #207 - 메모 존재 여부 반영하도록 dto 및 로직 수정 #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/com/Timo/Timo/domain/home/dto/response/HomeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public record TodoResponse(
String priority,
TagResponse tag,
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
boolean hasSubtask,
boolean hasMemo,
@JsonProperty("isRepeated")
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
boolean isRepeated,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/Timo/Timo/domain/home/dto/response/TodayResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public record TodayTodoResponse(
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
boolean isRepeated,
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
boolean hasSubtask,
boolean hasMemo,
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
TodoTimerStatus timerStatus,
Integer sortOrder,
Expand All @@ -78,7 +78,7 @@ public static TodayTodoResponse from(LocalDate date, TodoResponse todo) {
todo.priority(),
todo.tag(),
todo.isRepeated(),
todo.hasSubtask(),
todo.hasMemo(),
todo.timerStatus(),
todo.sortOrder(),
todo.subtasks()
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/Timo/Timo/domain/home/mapper/HomeTodoMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@ public TodoResponse toResponse(TodoContext context) {
todo.getDurationSeconds(),
todo.getPriority() != null ? todo.getPriority().name() : null,
mapTag(context.tag()),
!todo.getSubtasks().isEmpty(),
hasMemo(todo, instance),
todo.getRepeatType() != RepeatType.NONE,
resolveTimerStatus(instance),
instance != null ? instance.getSortOrder() : context.defaultSortOrder(),
mapSubtasks(todo.getSubtasks(), context.completedSubtaskIds())
);
}

private boolean hasMemo(Todo todo, TodoInstance instance) {
String memo = instance != null ? instance.resolveMemo() : todo.getMemo();
return memo != null && !memo.isBlank();
}

private TagResponse mapTag(Tag tag) {
return tag != null ? TagResponse.from(tag) : null;
}
Expand Down
Loading