Merge pull request #130 from MADA-UMC/server-heerang

Feat: 투두 조회 시 반복투두 이름 반환
MADA-UMC · Mar 7, 2024 · 2b37683 · 2b37683
2 parents f59a320 + ebc62f6
commit 2b37683
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/com/umc/mada/todo/dto/RepeatTodoResponseDto.java b/src/main/java/com/umc/mada/todo/dto/RepeatTodoResponseDto.java
@@ -13,14 +13,16 @@ public class RepeatTodoResponseDto {
     private int id;
     private int todoId;
     private int categoryId;
+    private String repeatTodoName;
     private LocalDate date;
     private Boolean complete;
 
     @Builder
-    public RepeatTodoResponseDto(int id, int todoId, int categoryId, LocalDate date, Boolean complete){
+    public RepeatTodoResponseDto(int id, int todoId, int categoryId, String repeatTodoName, LocalDate date, Boolean complete){
         this.id = id;
         this.todoId = todoId;
         this.categoryId = categoryId;
+        this.repeatTodoName = repeatTodoName;
         this.date = date;
         this.complete = complete;
     }
@@ -30,6 +32,7 @@ public static RepeatTodoResponseDto of(RepeatTodo repeatTodo) {
                 .id(repeatTodo.getId())
                 .todoId(repeatTodo.getTodoId().getId())
                 .categoryId(repeatTodo.getTodoId().getCategory().getId())
+                .repeatTodoName(repeatTodo.getTodoId().getTodoName())
                 .date(repeatTodo.getDate())
                 .complete(repeatTodo.getComplete())
                 .build();

diff --git a/src/main/java/com/umc/mada/todo/service/TodoService.java b/src/main/java/com/umc/mada/todo/service/TodoService.java
@@ -297,13 +297,6 @@ public Map<String, Object> getUserTodo(User userId, LocalDate date) {
         Map<String, Object> map = new LinkedHashMap<>();
         Map<String, Object> data = new LinkedHashMap<>();
         for (Todo todo : userTodos){
-//            if (todo.getStartRepeatDate() != null && todo.getEndRepeatDate() != null) {
-//                if (!date.isBefore(todo.getStartRepeatDate()) && !date.isAfter(todo.getEndRepeatDate())) {
-//                    filteredTodos.add(TodoResponseDto.of(todo));
-//                }
-//            } else if(todo.getDate().equals(date)) {
-//                filteredTodos.add(TodoResponseDto.of(todo));
-//            }
             if(todo.getDate()!= null && todo.getDate().equals(date) && todo.getRepeat().equals(Repeat.N)){
                 filteredTodos.add(TodoResponseDto.of(todo));
             }