diff --git a/src/main/java/com/Timo/Timo/domain/home/dto/response/HomeResponse.java b/src/main/java/com/Timo/Timo/domain/home/dto/response/HomeResponse.java index 8db3d142..773b726f 100644 --- a/src/main/java/com/Timo/Timo/domain/home/dto/response/HomeResponse.java +++ b/src/main/java/com/Timo/Timo/domain/home/dto/response/HomeResponse.java @@ -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, diff --git a/src/main/java/com/Timo/Timo/domain/home/dto/response/TodayResponse.java b/src/main/java/com/Timo/Timo/domain/home/dto/response/TodayResponse.java index 6668220d..32a95529 100644 --- a/src/main/java/com/Timo/Timo/domain/home/dto/response/TodayResponse.java +++ b/src/main/java/com/Timo/Timo/domain/home/dto/response/TodayResponse.java @@ -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, @@ -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() diff --git a/src/main/java/com/Timo/Timo/domain/home/mapper/HomeTodoMapper.java b/src/main/java/com/Timo/Timo/domain/home/mapper/HomeTodoMapper.java index 2260b82c..a647a0d1 100644 --- a/src/main/java/com/Timo/Timo/domain/home/mapper/HomeTodoMapper.java +++ b/src/main/java/com/Timo/Timo/domain/home/mapper/HomeTodoMapper.java @@ -30,7 +30,7 @@ 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(), @@ -38,6 +38,11 @@ public TodoResponse toResponse(TodoContext context) { ); } + 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; }